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

Commit

Permalink
Bump versions
Browse files Browse the repository at this point in the history
Signed-off-by: Jeffrey Morgan <[email protected]>
  • Loading branch information
jmorganca committed Nov 3, 2015
1 parent c2f2f53 commit b6f08f4
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 16 deletions.
16 changes: 8 additions & 8 deletions Dockerfile.osx
Original file line number Diff line number Diff line change
Expand Up @@ -26,28 +26,28 @@ RUN curl -fsSL -o /vbox.dmg http://download.virtualbox.org/virtualbox/$VBOX_VERS

# Download the Docker parts

ENV DOCKER_VERSION 1.9.0-rc4
RUN curl -fsSL -o /docker https://test.docker.com/builds/Darwin/x86_64/docker-$DOCKER_VERSION
ENV INSTALLER_VERSION 1.9.0
ENV DOCKER_VERSION 1.9.0
# 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.0-rc4
ENV DOCKER_MACHINE_VERSION 0.5.0
RUN curl -fsSL -o /docker-machine.zip https://github.com/docker/machine/releases/download/v$DOCKER_MACHINE_VERSION/docker-machine_darwin-amd64.zip
RUN 7z x /docker-machine.zip && rm -f /docker-machine.zip
RUN chmod +x /docker-machine*

ENV DOCKER_COMPOSE_VERSION 1.5.0rc3
ENV DOCKER_COMPOSE_VERSION 1.5.0
RUN curl -fsSL -o /docker-compose https://github.com/docker/compose/releases/download/$DOCKER_COMPOSE_VERSION/docker-compose-Darwin-x86_64
RUN chmod +x /docker-compose

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
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.3
RUN curl -fsSL -o /kitematic.zip https://github.com/kitematic/kitematic/releases/download/v$KITEMATIC_VERSION/Kitematic-$KITEMATIC_VERSION-Mac.zip

ENV INSTALLER_VERSION 1.9.0-rc4

ENV MIXPANEL_TOKEN c306ae65c33d7d09fe3e546f36493a6e

# Extract the VirtualBox .pkg
Expand Down
16 changes: 8 additions & 8 deletions Dockerfile.windows
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ RUN cd innosetup && \
wine "./innounp.exe" -e "is-unicode.exe"

# installer components
ENV INSTALLER_VERSION 1.9.0-rc4
ENV DOCKER_VERSION 1.9.0-rc4
ENV DOCKER_MACHINE_VERSION 0.5.0-rc4
ENV DOCKER_COMPOSE_VERSION 1.5.0rc3
ENV INSTALLER_VERSION 1.9.0
ENV DOCKER_VERSION 1.9.0
ENV DOCKER_MACHINE_VERSION 0.5.0
ENV DOCKER_COMPOSE_VERSION 1.5.0
ENV BOOT2DOCKER_ISO_VERSION $DOCKER_VERSION
ENV KITEMATIC_VERSION 0.9.3
ENV VIRTUALBOX_VERSION 5.0.8
Expand All @@ -30,17 +30,17 @@ ENV MIXPANEL_TOKEN c306ae65c33d7d09fe3e546f36493a6e

RUN mkdir /bundle
WORKDIR /bundle
# RUN curl -fsSL -o docker.exe "https://get.docker.com/builds/Windows/x86_64/docker-$DOCKER_VERSION.exe"
RUN curl -fsSL -o docker.exe "https://test.docker.com/builds/Windows/x86_64/docker-$DOCKER_VERSION.exe"
RUN curl -fsSL -o docker.exe "https://get.docker.com/builds/Windows/x86_64/docker-$DOCKER_VERSION.exe"
# RUN curl -fsSL -o docker.exe "https://test.docker.com/builds/Windows/x86_64/docker-$DOCKER_VERSION.exe"

RUN curl -fsSL -o docker-machine.zip "https://github.com/docker/machine/releases/download/v$DOCKER_MACHINE_VERSION/docker-machine_windows-amd64.zip" && \
unzip docker-machine.zip && \
rm docker-machine.zip

RUN curl -fsSL -o docker-compose.exe "https://github.com/docker/compose/releases/download/$DOCKER_COMPOSE_VERSION/docker-compose-Windows-x86_64.exe"

# RUN curl -fsSL -o boot2docker.iso https://github.com/boot2docker/boot2docker/releases/download/v$BOOT2DOCKER_ISO_VERSION/boot2docker.iso
RUN curl -fsSL -o boot2docker.iso https://github.com/tianon/boot2docker-legacy/releases/download/v$BOOT2DOCKER_ISO_VERSION/boot2docker.iso
RUN curl -fsSL -o boot2docker.iso https://github.com/boot2docker/boot2docker/releases/download/v$BOOT2DOCKER_ISO_VERSION/boot2docker.iso
# RUN curl -fsSL -o boot2docker.iso https://github.com/tianon/boot2docker-legacy/releases/download/v$BOOT2DOCKER_ISO_VERSION/boot2docker.iso

RUN curl -fsSL -o kitematic.zip "https://github.com/kitematic/kitematic/releases/download/v$KITEMATIC_VERSION/Kitematic-$KITEMATIC_VERSION-Windows-Alpha.zip" && \
mkdir kitematic && \
Expand Down

0 comments on commit b6f08f4

Please sign in to comment.