From fd88f2eed9363ab68ba0228c0c4be66af7e6f408 Mon Sep 17 00:00:00 2001 From: Nathan LeClaire Date: Thu, 8 Dec 2016 12:58:17 -0800 Subject: [PATCH] Bump versions for 1.12.4-rc1 Signed-off-by: Nathan LeClaire --- Dockerfile.osx | 12 ++++++------ Dockerfile.windows | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Dockerfile.osx b/Dockerfile.osx index 1667feae..3b85b8b3 100644 --- a/Dockerfile.osx +++ b/Dockerfile.osx @@ -18,20 +18,20 @@ 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.1.8 -ENV VBOX_REV 111374 +ENV VBOX_VERSION 5.1.10 +ENV VBOX_REV 112026 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.3 -ENV DOCKER_VERSION 1.12.3 +ENV INSTALLER_VERSION 1.12.4-rc1 +ENV DOCKER_VERSION 1.12.4-rc1 # Change this to 'test.docker.com' for RCs and 'get.docker.com' for official # releases. -ENV DOCKER_ENDPOINT get.docker.com +ENV DOCKER_ENDPOINT test.docker.com # 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 @@ -49,7 +49,7 @@ RUN curl -fsSL -o /docker-machine https://github.com/docker/machine/releases/dow RUN chmod +x /docker-machine -ENV DOCKER_COMPOSE_VERSION 1.8.1 +ENV DOCKER_COMPOSE_VERSION 1.9.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 diff --git a/Dockerfile.windows b/Dockerfile.windows index 64fd3a3b..5f3ef2ad 100644 --- a/Dockerfile.windows +++ b/Dockerfile.windows @@ -17,14 +17,14 @@ RUN cd innosetup && \ wine "./innounp.exe" -e "is-unicode.exe" # installer components -ENV INSTALLER_VERSION 1.12.3 -ENV DOCKER_VERSION 1.12.3 +ENV INSTALLER_VERSION 1.12.4-rc1 +ENV DOCKER_VERSION 1.12.4-rc1 ENV DOCKER_MACHINE_VERSION 0.8.2 -ENV DOCKER_COMPOSE_VERSION 1.8.1 +ENV DOCKER_COMPOSE_VERSION 1.9.0 ENV BOOT2DOCKER_ISO_VERSION $DOCKER_VERSION ENV KITEMATIC_VERSION 0.12.0 -ENV VIRTUALBOX_VERSION 5.1.8 -ENV VIRTUALBOX_REVISION 111374 +ENV VIRTUALBOX_VERSION 5.1.10 +ENV VIRTUALBOX_REVISION 112026 ENV GIT_VERSION 2.9.0 ENV MIXPANEL_TOKEN c306ae65c33d7d09fe3e546f36493a6e @@ -34,7 +34,7 @@ WORKDIR /bundle # Change this to 'test.docker.com' for RCs and 'get.docker.com' for official # releases. -ENV DOCKER_ENDPOINT get.docker.com +ENV DOCKER_ENDPOINT test.docker.com RUN curl -fsSL -o dockerbins.zip "https://${DOCKER_ENDPOINT}/builds/Windows/x86_64/docker-${DOCKER_VERSION}.zip" && \ unzip dockerbins.zip && \