Skip to content
This repository has been archived by the owner on Sep 26, 2021. It is now read-only.

Commit

Permalink
Merge pull request #363 from jeanlaurent/machine-0.5.5
Browse files Browse the repository at this point in the history
bump docker-machine to 0.5.5
  • Loading branch information
JeffDM committed Jan 4, 2016
2 parents 1038964 + 37a7931 commit 2e64534
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions Dockerfile.osx
Original file line number Diff line number Diff line change
Expand Up @@ -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.1f
ENV INSTALLER_VERSION 1.9.1g
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.4
ENV DOCKER_MACHINE_VERSION 0.5.5
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

Expand Down
4 changes: 2 additions & 2 deletions Dockerfile.windows
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ RUN cd innosetup && \
wine "./innounp.exe" -e "is-unicode.exe"

# installer components
ENV INSTALLER_VERSION 1.9.1f
ENV INSTALLER_VERSION 1.9.1g
ENV DOCKER_VERSION 1.9.1
ENV DOCKER_MACHINE_VERSION 0.5.4
ENV DOCKER_MACHINE_VERSION 0.5.5
ENV DOCKER_COMPOSE_VERSION 1.5.2
ENV BOOT2DOCKER_ISO_VERSION $DOCKER_VERSION
ENV KITEMATIC_VERSION 0.9.5
Expand Down

0 comments on commit 2e64534

Please sign in to comment.