From b6f08f43f07ee9ac2c9a9fb7c19e62657afab163 Mon Sep 17 00:00:00 2001 From: Jeffrey Morgan Date: Tue, 3 Nov 2015 13:51:56 -0800 Subject: [PATCH] Bump versions Signed-off-by: Jeffrey Morgan --- Dockerfile.osx | 16 ++++++++-------- Dockerfile.windows | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Dockerfile.osx b/Dockerfile.osx index cd547d74..3b5c2b5a 100644 --- a/Dockerfile.osx +++ b/Dockerfile.osx @@ -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 diff --git a/Dockerfile.windows b/Dockerfile.windows index 129f6322..ec7ad433 100644 --- a/Dockerfile.windows +++ b/Dockerfile.windows @@ -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 @@ -30,8 +30,8 @@ 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 && \ @@ -39,8 +39,8 @@ RUN curl -fsSL -o docker-machine.zip "https://github.com/docker/machine/releases 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 && \