From 430a1d4ab19e47cc24d6f664f024c9570b1dc368 Mon Sep 17 00:00:00 2001 From: David Gageot Date: Tue, 12 Jan 2016 18:43:09 +0100 Subject: [PATCH 1/3] Bump docker-machine to 0.5.6 Signed-off-by: David Gageot --- Dockerfile.osx | 2 +- Dockerfile.windows | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile.osx b/Dockerfile.osx index dc84259c42..21ec297720 100644 --- a/Dockerfile.osx +++ b/Dockerfile.osx @@ -32,7 +32,7 @@ ENV DOCKER_VERSION 1.9.1 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 diff --git a/Dockerfile.windows b/Dockerfile.windows index 9c490230b2..fdea7e50fc 100644 --- a/Dockerfile.windows +++ b/Dockerfile.windows @@ -19,7 +19,7 @@ RUN cd innosetup && \ # installer components ENV INSTALLER_VERSION 1.9.1h 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 From 2ac3ccca27c9535fd211ce1be0f3725af8f29844 Mon Sep 17 00:00:00 2001 From: David Gageot Date: Tue, 12 Jan 2016 18:43:46 +0100 Subject: [PATCH 2/3] Bump toolbox version to 1.9.1i Signed-off-by: David Gageot --- Dockerfile.osx | 2 +- Dockerfile.windows | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile.osx b/Dockerfile.osx index 21ec297720..5ba4d32af9 100644 --- a/Dockerfile.osx +++ b/Dockerfile.osx @@ -26,7 +26,7 @@ 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 diff --git a/Dockerfile.windows b/Dockerfile.windows index fdea7e50fc..a152330d21 100644 --- a/Dockerfile.windows +++ b/Dockerfile.windows @@ -17,7 +17,7 @@ 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.6 ENV DOCKER_COMPOSE_VERSION 1.5.2 From 1ff43d08b007ceae6e83c9724b9d2c7ece0b3140 Mon Sep 17 00:00:00 2001 From: David Gageot Date: Wed, 13 Jan 2016 07:29:21 +0100 Subject: [PATCH 3/3] Bump Kitematic version to 0.9.5.1 Signed-off-by: David Gageot --- Dockerfile.osx | 2 +- Dockerfile.windows | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile.osx b/Dockerfile.osx index 5ba4d32af9..302d702556 100644 --- a/Dockerfile.osx +++ b/Dockerfile.osx @@ -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 diff --git a/Dockerfile.windows b/Dockerfile.windows index a152330d21..01c6545cbf 100644 --- a/Dockerfile.windows +++ b/Dockerfile.windows @@ -22,7 +22,7 @@ ENV DOCKER_VERSION 1.9.1 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