Browse code
Update Dockerfile with all-caps INSTRUCTIONS (as explained in docs as being "convention": http://docs.docker.io/en/latest/use/builder/#format)
Tianon Gravi authored on 2013/12/02 13:31:28Showing 1 changed files
| ... | ... |
@@ -24,52 +24,52 @@ |
| 24 | 24 |
# |
| 25 | 25 |
|
| 26 | 26 |
docker-version 0.6.1 |
| 27 |
-from ubuntu:12.04 |
|
| 28 |
-maintainer Solomon Hykes <solomon@dotcloud.com> |
|
| 27 |
+FROM ubuntu:12.04 |
|
| 28 |
+MAINTAINER Solomon Hykes <solomon@dotcloud.com> |
|
| 29 | 29 |
|
| 30 | 30 |
# Build dependencies |
| 31 |
-run echo 'deb http://archive.ubuntu.com/ubuntu precise main universe' > /etc/apt/sources.list |
|
| 32 |
-run apt-get update |
|
| 33 |
-run apt-get install -y -q curl |
|
| 34 |
-run apt-get install -y -q git |
|
| 35 |
-run apt-get install -y -q mercurial |
|
| 36 |
-run apt-get install -y -q build-essential libsqlite3-dev |
|
| 31 |
+RUN echo 'deb http://archive.ubuntu.com/ubuntu precise main universe' > /etc/apt/sources.list |
|
| 32 |
+RUN apt-get update |
|
| 33 |
+RUN apt-get install -y -q curl |
|
| 34 |
+RUN apt-get install -y -q git |
|
| 35 |
+RUN apt-get install -y -q mercurial |
|
| 36 |
+RUN apt-get install -y -q build-essential libsqlite3-dev |
|
| 37 | 37 |
|
| 38 | 38 |
# Install Go |
| 39 |
-run curl -s https://go.googlecode.com/files/go1.2.src.tar.gz | tar -v -C /usr/local -xz |
|
| 40 |
-env PATH /usr/local/go/bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin |
|
| 41 |
-env GOPATH /go:/go/src/github.com/dotcloud/docker/vendor |
|
| 42 |
-run cd /usr/local/go/src && ./make.bash && go install -ldflags '-w -linkmode external -extldflags "-static -Wl,--unresolved-symbols=ignore-in-shared-libs"' -tags netgo -a std |
|
| 39 |
+RUN curl -s https://go.googlecode.com/files/go1.2.src.tar.gz | tar -v -C /usr/local -xz |
|
| 40 |
+ENV PATH /usr/local/go/bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin |
|
| 41 |
+ENV GOPATH /go:/go/src/github.com/dotcloud/docker/vendor |
|
| 42 |
+RUN cd /usr/local/go/src && ./make.bash && go install -ldflags '-w -linkmode external -extldflags "-static -Wl,--unresolved-symbols=ignore-in-shared-libs"' -tags netgo -a std |
|
| 43 | 43 |
|
| 44 | 44 |
# Ubuntu stuff |
| 45 |
-run apt-get install -y -q ruby1.9.3 rubygems libffi-dev |
|
| 46 |
-run gem install --no-rdoc --no-ri fpm |
|
| 47 |
-run apt-get install -y -q reprepro dpkg-sig |
|
| 45 |
+RUN apt-get install -y -q ruby1.9.3 rubygems libffi-dev |
|
| 46 |
+RUN gem install --no-rdoc --no-ri fpm |
|
| 47 |
+RUN apt-get install -y -q reprepro dpkg-sig |
|
| 48 | 48 |
|
| 49 |
-run apt-get install -y -q python-pip |
|
| 50 |
-run pip install s3cmd==1.1.0-beta3 |
|
| 51 |
-run pip install python-magic==0.4.6 |
|
| 52 |
-run /bin/echo -e '[default]\naccess_key=$AWS_ACCESS_KEY\nsecret_key=$AWS_SECRET_KEY\n' > /.s3cfg |
|
| 49 |
+RUN apt-get install -y -q python-pip |
|
| 50 |
+RUN pip install s3cmd==1.1.0-beta3 |
|
| 51 |
+RUN pip install python-magic==0.4.6 |
|
| 52 |
+RUN /bin/echo -e '[default]\naccess_key=$AWS_ACCESS_KEY\nsecret_key=$AWS_SECRET_KEY\n' > /.s3cfg |
|
| 53 | 53 |
|
| 54 | 54 |
# Runtime dependencies |
| 55 |
-run apt-get install -y -q iptables |
|
| 56 |
-run apt-get install -y -q lxc |
|
| 57 |
-run apt-get install -y -q aufs-tools |
|
| 55 |
+RUN apt-get install -y -q iptables |
|
| 56 |
+RUN apt-get install -y -q lxc |
|
| 57 |
+RUN apt-get install -y -q aufs-tools |
|
| 58 | 58 |
|
| 59 | 59 |
# Get lvm2 source for compiling statically |
| 60 |
-run git clone https://git.fedorahosted.org/git/lvm2.git /usr/local/lvm2 && cd /usr/local/lvm2 && git checkout v2_02_103 |
|
| 60 |
+RUN git clone https://git.fedorahosted.org/git/lvm2.git /usr/local/lvm2 && cd /usr/local/lvm2 && git checkout v2_02_103 |
|
| 61 | 61 |
# see https://git.fedorahosted.org/cgit/lvm2.git/refs/tags for release tags |
| 62 | 62 |
# note: we can't use "git clone -b" above because it requires at least git 1.7.10 to be able to use that on a tag instead of a branch and we only have 1.7.9.5 |
| 63 | 63 |
|
| 64 | 64 |
# Compile and install lvm2 |
| 65 |
-run cd /usr/local/lvm2 && ./configure --enable-static_link && make device-mapper && make install_device-mapper |
|
| 65 |
+RUN cd /usr/local/lvm2 && ./configure --enable-static_link && make device-mapper && make install_device-mapper |
|
| 66 | 66 |
# see https://git.fedorahosted.org/cgit/lvm2.git/tree/INSTALL |
| 67 | 67 |
|
| 68 |
-volume /var/lib/docker |
|
| 69 |
-workdir /go/src/github.com/dotcloud/docker |
|
| 68 |
+VOLUME /var/lib/docker |
|
| 69 |
+WORKDIR /go/src/github.com/dotcloud/docker |
|
| 70 | 70 |
|
| 71 | 71 |
# Wrap all commands in the "docker-in-docker" script to allow nested containers |
| 72 |
-entrypoint ["hack/dind"] |
|
| 72 |
+ENTRYPOINT ["hack/dind"] |
|
| 73 | 73 |
|
| 74 | 74 |
# Upload docker source |
| 75 |
-add . /go/src/github.com/dotcloud/docker |
|
| 75 |
+ADD . /go/src/github.com/dotcloud/docker |