@@ -23,11 +23,11 @@

 # the case. Therefore, you don't have to disable it anymore.

 #

-FROM	ubuntu:14.04

-MAINTAINER	Tianon Gravi <admwiggin@gmail.com> (@tianon)

+FROM ubuntu:14.04

+MAINTAINER Tianon Gravi <admwiggin@gmail.com> (@tianon)

 # Packaged dependencies

-RUN	apt-get update && apt-get install -y \

+RUN apt-get update && apt-get install -y \

 	aufs-tools \

 	automake \

 	btrfs-tools \

@@ -52,72 +52,86 @@ RUN	apt-get update && apt-get install -y \

 	--no-install-recommends

 # Get lvm2 source for compiling statically

-RUN	git clone --no-checkout https://git.fedorahosted.org/git/lvm2.git /usr/local/lvm2 && cd /usr/local/lvm2 && git checkout -q v2_02_103

+RUN git clone -b v2_02_103 https://git.fedorahosted.org/git/lvm2.git /usr/local/lvm2

 # see https://git.fedorahosted.org/cgit/lvm2.git/refs/tags for release tags

-# note: we don't use "git clone -b" above because it then spews big nasty warnings about 'detached HEAD' state that we can't silence as easily as we can silence them using "git checkout" directly

 # Compile and install lvm2

-RUN	cd /usr/local/lvm2 && ./configure --enable-static_link && make device-mapper && make install_device-mapper

+RUN cd /usr/local/lvm2 \

+	&& ./configure --enable-static_link \

+	&& make device-mapper \

+	&& make install_device-mapper

 # see https://git.fedorahosted.org/cgit/lvm2.git/tree/INSTALL

 # Install Go

-RUN	curl -sSL https://golang.org/dl/go1.4.src.tar.gz | tar -v -C /usr/local -xz

-ENV	PATH	/usr/local/go/bin:$PATH

-ENV	GOPATH	/go:/go/src/github.com/docker/docker/vendor

+RUN curl -sSL https://golang.org/dl/go1.4.src.tar.gz | tar -v -C /usr/local -xz

+ENV PATH /usr/local/go/bin:$PATH

+ENV GOPATH /go:/go/src/github.com/docker/docker/vendor

 ENV PATH /go/bin:$PATH

-RUN	cd /usr/local/go/src && ./make.bash --no-clean 2>&1

+RUN cd /usr/local/go/src && ./make.bash --no-clean 2>&1

 # Compile Go for cross compilation

-ENV	DOCKER_CROSSPLATFORMS	\

+ENV DOCKER_CROSSPLATFORMS \

 	linux/386 linux/arm \

 	darwin/amd64 darwin/386 \

 	freebsd/amd64 freebsd/386 freebsd/arm \

 	windows/amd64 windows/386

 # (set an explicit GOARM of 5 for maximum compatibility)

-ENV	GOARM	5

-RUN	cd /usr/local/go/src && bash -xc 'for platform in $DOCKER_CROSSPLATFORMS; do GOOS=${platform%/*} GOARCH=${platform##*/} ./make.bash --no-clean 2>&1; done'

+ENV GOARM 5

+RUN cd /usr/local/go/src \

+	&& set -x \

+	&& for platform in $DOCKER_CROSSPLATFORMS; do \

+		GOOS=${platform%/*} \

+		GOARCH=${platform##*/} \

+			./make.bash --no-clean 2>&1; \

+	done

 # reinstall standard library with netgo

 RUN go clean -i net && go install -tags netgo std

 # Grab Go's cover tool for dead-simple code coverage testing

-RUN	go get golang.org/x/tools/cmd/cover

+RUN go get golang.org/x/tools/cmd/cover

 # TODO replace FPM with some very minimal debhelper stuff

-RUN	gem install --no-rdoc --no-ri fpm --version 1.3.2

-

-# Install man page generator

-RUN mkdir -p /go/src/github.com/cpuguy83 \

-    && git clone -b v1 https://github.com/cpuguy83/go-md2man.git /go/src/github.com/cpuguy83/go-md2man \

-    && cd /go/src/github.com/cpuguy83/go-md2man \

-    && go get -v ./...

+RUN gem install --no-rdoc --no-ri fpm --version 1.3.2

 # Get the "busybox" image source so we can build locally instead of pulling

-RUN	git clone -b buildroot-2014.02 https://github.com/jpetazzo/docker-busybox.git /docker-busybox

+RUN git clone -b buildroot-2014.02 https://github.com/jpetazzo/docker-busybox.git /docker-busybox

 # Get the "cirros" image source so we can import it instead of fetching it during tests

-RUN	curl -sSL -o /cirros.tar.gz https://github.com/ewindisch/docker-cirros/raw/1cded459668e8b9dbf4ef976c94c05add9bbd8e9/cirros-0.3.0-x86_64-lxc.tar.gz

+RUN curl -sSL -o /cirros.tar.gz https://github.com/ewindisch/docker-cirros/raw/1cded459668e8b9dbf4ef976c94c05add9bbd8e9/cirros-0.3.0-x86_64-lxc.tar.gz

 # Get the "docker-py" source so we can run their integration tests

-RUN	git clone -b 0.7.0 https://github.com/docker/docker-py.git /docker-py

+RUN git clone -b 0.7.0 https://github.com/docker/docker-py.git /docker-py

 # Setup s3cmd config

-RUN	/bin/echo -e '[default]\naccess_key=$AWS_ACCESS_KEY\nsecret_key=$AWS_SECRET_KEY' > $HOME/.s3cfg

+RUN { \

+		echo '[default]'; \

+		echo 'access_key=$AWS_ACCESS_KEY'; \

+		echo 'secret_key=$AWS_SECRET_KEY'; \

+	} > ~/.s3cfg

 # Set user.email so crosbymichael's in-container merge commits go smoothly

-RUN	git config --global user.email 'docker-dummy@example.com'

+RUN git config --global user.email 'docker-dummy@example.com'

 # Add an unprivileged user to be used for tests which need it

 RUN groupadd -r docker

 RUN useradd --create-home --gid docker unprivilegeduser

-VOLUME	/var/lib/docker

-WORKDIR	/go/src/github.com/docker/docker

-ENV	DOCKER_BUILDTAGS	apparmor selinux btrfs_noversion

+VOLUME /var/lib/docker

+WORKDIR /go/src/github.com/docker/docker

+ENV DOCKER_BUILDTAGS apparmor selinux btrfs_noversion

+

+# Install man page generator

+COPY vendor /go/src/github.com/docker/docker/vendor

+# (copy vendor/ because go-md2man needs golang.org/x/net)

+RUN set -x \

+	&& git clone -b v1 https://github.com/cpuguy83/go-md2man.git /go/src/github.com/cpuguy83/go-md2man \

+	&& git clone -b v1.2 https://github.com/russross/blackfriday.git /go/src/github.com/russross/blackfriday \

+	&& go install -v github.com/cpuguy83/go-md2man

 # Wrap all commands in the "docker-in-docker" script to allow nested containers

-ENTRYPOINT	["hack/dind"]

+ENTRYPOINT ["hack/dind"]

 # Upload docker source

-COPY	.	/go/src/github.com/docker/docker

+COPY . /go/src/github.com/docker/docker