docker/docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-11-05 00:14:17 +03:00
Code Activity

Merge pull request #369 from dgageot/machine-0.5.6

Browse Source 
Bump Docker Machine 0.5.6
This commit is contained in:
Jeffrey Morgan
2016-01-14 11:17:06 -08:00
parent eedcf7e365 1ff43d08b0
commit d07f0f9022
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Dockerfile.osx
View File

@@ -26,13 +26,13 @@ RUN curl -fsSL -o /vbox.dmg http://download.virtualbox.org/virtualbox/$VBOX_VERS
# Download the Docker parts
ENV INSTALLER_VERSION 1.9.1h
ENV INSTALLER_VERSION 1.9.1i
ENV DOCKER_VERSION 1.9.1
# RUN curl -fsSL -o /docker https://test.docker.com/builds/Darwin/x86_64/docker-$DOCKER_VERSION
RUN curl -fsSL -o docker https://get.docker.com/builds/Darwin/x86_64/docker-$DOCKER_VERSION
RUN chmod +x /docker
ENV DOCKER_MACHINE_VERSION 0.5.5
ENV DOCKER_MACHINE_VERSION 0.5.6
RUN curl -fsSL -o /docker-machine https://github.com/docker/machine/releases/download/v$DOCKER_MACHINE_VERSION/docker-machine_darwin-amd64
RUN chmod +x /docker-machine
@@ -44,7 +44,7 @@ ENV BOOT2DOCKER_ISO_VERSION $DOCKER_VERSION
RUN curl -fsSL -o /boot2docker.iso https://github.com/boot2docker/boot2docker/releases/download/v$DOCKER_VERSION/boot2docker.iso
# RUN curl -fsSL -o /boot2docker.iso https://github.com/tianon/boot2docker-legacy/releases/download/v$DOCKER_VERSION/boot2docker.iso
ENV KITEMATIC_VERSION 0.9.5
ENV KITEMATIC_VERSION 0.9.5.1
RUN curl -fsSL -o /kitematic.zip https://github.com/kitematic/kitematic/releases/download/v$KITEMATIC_VERSION/Kitematic-$KITEMATIC_VERSION-Mac.zip
ENV MIXPANEL_TOKEN c306ae65c33d7d09fe3e546f36493a6e

6
Dockerfile.windows
View File

@@ -17,12 +17,12 @@ RUN cd innosetup && \
wine "./innounp.exe" -e "is-unicode.exe"
# installer components
ENV INSTALLER_VERSION 1.9.1h
ENV INSTALLER_VERSION 1.9.1i
ENV DOCKER_VERSION 1.9.1
ENV DOCKER_MACHINE_VERSION 0.5.5
ENV DOCKER_MACHINE_VERSION 0.5.6
ENV DOCKER_COMPOSE_VERSION 1.5.2
ENV BOOT2DOCKER_ISO_VERSION $DOCKER_VERSION
ENV KITEMATIC_VERSION 0.9.5
ENV KITEMATIC_VERSION 0.9.5.1
ENV VIRTUALBOX_VERSION 5.0.12
ENV VIRTUALBOX_REVISION 104815
ENV GIT_VERSION 2.5.0