docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9995 from tianon/versions 

Refactor Dockerfile version number usage
This commit is contained in:
Alexander Morozov 2015-01-09 13:06:47 -08:00
parent ef2d6dda0f 2677f1add4
commit b79c31ce97
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Dockerfile
View File

@ -62,8 +62,9 @@ RUN cd /usr/local/lvm2 \
# see https://git.fedorahosted.org/cgit/lvm2.git/tree/INSTALL # see https://git.fedorahosted.org/cgit/lvm2.git/tree/INSTALL
# Install lxc # Install lxc
ENV LXC_VERSION 1.0.7
RUN mkdir -p /usr/src/lxc \ RUN mkdir -p /usr/src/lxc \
&& curl -sSL https://linuxcontainers.org/downloads/lxc/lxc-1.0.7.tar.gz | tar -v -C /usr/src/lxc/ -xz --strip-components=1 && curl -sSL https://linuxcontainers.org/downloads/lxc/lxc-${LXC_VERSION}.tar.gz | tar -v -C /usr/src/lxc/ -xz --strip-components=1
RUN cd /usr/src/lxc \ RUN cd /usr/src/lxc \
&& ./configure \ && ./configure \
&& make \ && make \
@ -71,10 +72,11 @@ RUN cd /usr/src/lxc \
&& ldconfig && ldconfig
# Install Go # Install Go
RUN curl -sSL https://golang.org/dl/go1.4.src.tar.gz | tar -v -C /usr/local -xz ENV GO_VERSION 1.4
ENV PATH /usr/local/go/bin:$PATH RUN curl -sSL https://golang.org/dl/go${GO_VERSION}.src.tar.gz | tar -v -C /usr/local -xz \
&& mkdir -p /go/bin
ENV PATH /go/bin:/usr/local/go/bin:$PATH
ENV GOPATH /go:/go/src/github.com/docker/docker/vendor 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 # Compile Go for cross compilation
@ -94,7 +96,7 @@ RUN cd /usr/local/go/src \
./make.bash --no-clean 2>&1; \ ./make.bash --no-clean 2>&1; \
done done
# reinstall standard library with netgo # Reinstall standard library with netgo
RUN go clean -i net && go install -tags netgo std RUN go clean -i net && go install -tags netgo std
# Grab Go's cover tool for dead-simple code coverage testing # Grab Go's cover tool for dead-simple code coverage testing