Browse code

Packaging|dockerbuilder, issue #761: use docker-golang PPA. Add Dockerfile header

Daniel Mizyrycki authored on 2013/06/18 02:31:27
Showing 1 changed files
... ...
@@ -1,5 +1,13 @@
1
-# This will build a container capable of producing an official binary build of docker and
2
-# uploading it to S3
1
+# DESCRIPTION     Build a container capable of producing official binary and
2
+#                 PPA packages and uploading them to S3 and Launchpad
3
+# VERSION         1.2
4
+# DOCKER_VERSION  0.4
5
+# AUTHOR          Solomon Hykes <solomon@dotcloud.com>
6
+#                 Daniel Mizyrycki <daniel@dotcloud.net>
7
+# BUILD_CMD       docker build -t dockerbuilder .
8
+# RUN_CMD         docker run -e AWS_ID="$AWS_ID" -e AWS_KEY="$AWS_KEY" -e GPG_KEY="$GPG_KEY" dockerbuilder
9
+#
10
+#
3 11
 from	ubuntu:12.04
4 12
 maintainer	Solomon Hykes <solomon@dotcloud.com>
5 13
 # Workaround the upstart issue
... ...
@@ -8,7 +16,7 @@ run ln -s /bin/true /sbin/initctl
8 8
 # Enable universe and gophers PPA
9 9
 run	DEBIAN_FRONTEND=noninteractive apt-get install -y -q python-software-properties
10 10
 run	add-apt-repository "deb http://archive.ubuntu.com/ubuntu $(lsb_release -sc) universe"
11
-run	add-apt-repository -y ppa:gophers/go/ubuntu
11
+run	add-apt-repository -y ppa:dotcloud/docker-golang/ubuntu
12 12
 run	apt-get update
13 13
 # Packages required to checkout, build and upload docker
14 14
 run	DEBIAN_FRONTEND=noninteractive apt-get install -y -q s3cmd