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

Merge pull request #555 from docker/1.12.1 

Bump to 1.12.1
This commit is contained in:
Nathan LeClaire 2016-08-18 16:57:03 -07:00 committed by GitHub
parent c1cd1162f9 768f358596
commit db24b21660
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Dockerfile.osx
View File

@ -18,16 +18,16 @@ RUN curl -fsSL https://github.com/mackyle/xar/archive/xar-1.6.1.tar.gz | tar xvz
./autogen.sh && ./configure && \
make && make install
ENV VBOX_VERSION 5.0.24
ENV VBOX_REV 108355
ENV VBOX_VERSION 5.1.4
ENV VBOX_REV 110228
RUN curl -fsSL -o /vbox.dmg http://download.virtualbox.org/virtualbox/$VBOX_VERSION/VirtualBox-$VBOX_VERSION-$VBOX_REV-OSX.dmg \
&& echo "$(curl -fsSL 'http://download.virtualbox.org/virtualbox/'"$VBOX_VERSION"'/SHA256SUMS' | awk '$2 ~ /-OSX.dmg$/ { print $1 }') */vbox.dmg" | sha256sum -c -
# Download the Docker parts
ENV INSTALLER_VERSION 1.12.0
ENV DOCKER_VERSION 1.12.0
ENV INSTALLER_VERSION 1.12.1
ENV DOCKER_VERSION 1.12.1
# Why '--strip-components 3'? The client binary is in usr/local/bin/docker in
# the tar archive. If we extract directly, it will create a usr/local/bin
@ -40,7 +40,7 @@ RUN curl -fsSL -o dockerbins.tgz "https://get.docker.com/builds/Darwin/x86_64/do
RUN chmod +x /docker
ENV DOCKER_MACHINE_VERSION 0.8.0
ENV DOCKER_MACHINE_VERSION 0.8.1
RUN curl -fsSL -o /docker-machine https://github.com/docker/machine/releases/download/v$DOCKER_MACHINE_VERSION/docker-machine-Darwin-x86_64
RUN chmod +x /docker-machine

10
Dockerfile.windows
View File

@ -17,14 +17,14 @@ RUN cd innosetup && \
wine "./innounp.exe" -e "is-unicode.exe"
# installer components
ENV INSTALLER_VERSION 1.12.0
ENV DOCKER_VERSION 1.12.0
ENV DOCKER_MACHINE_VERSION 0.8.0
ENV INSTALLER_VERSION 1.12.1
ENV DOCKER_VERSION 1.12.1
ENV DOCKER_MACHINE_VERSION 0.8.1
ENV DOCKER_COMPOSE_VERSION 1.8.0
ENV BOOT2DOCKER_ISO_VERSION $DOCKER_VERSION
ENV KITEMATIC_VERSION 0.12.0
ENV VIRTUALBOX_VERSION 5.0.24
ENV VIRTUALBOX_REVISION 108355
ENV VIRTUALBOX_VERSION 5.1.4
ENV VIRTUALBOX_REVISION 110228
ENV GIT_VERSION 2.9.0
ENV MIXPANEL_TOKEN c306ae65c33d7d09fe3e546f36493a6e