From 0d78d5b33ae3f874a13f78d206727e07b311da66 Mon Sep 17 00:00:00 2001 From: Jeffrey Morgan Date: Mon, 18 Jan 2016 16:50:36 -0800 Subject: [PATCH 1/4] 1.10.0-rc1 Signed-off-by: Jeffrey Morgan --- Dockerfile.osx | 17 +++++++++-------- Dockerfile.windows | 17 +++++++++-------- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/Dockerfile.osx b/Dockerfile.osx index ceb6d842c2..853c62f9c9 100644 --- a/Dockerfile.osx +++ b/Dockerfile.osx @@ -26,23 +26,24 @@ RUN curl -fsSL -o /vbox.dmg http://download.virtualbox.org/virtualbox/$VBOX_VERS # Download the Docker parts -ENV INSTALLER_VERSION 1.9.1j -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 +ENV INSTALLER_VERSION 1.10.0-rc1 +ENV DOCKER_VERSION 1.10.0-rc1 +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.6 +ENV DOCKER_MACHINE_VERSION 0.6.0-rc1 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 -ENV DOCKER_COMPOSE_VERSION 1.5.2 +ENV DOCKER_COMPOSE_VERSION 1.6.0-rc1 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.6 RUN curl -fsSL -o /kitematic.zip https://github.com/kitematic/kitematic/releases/download/v$KITEMATIC_VERSION/Kitematic-$KITEMATIC_VERSION-Mac.zip diff --git a/Dockerfile.windows b/Dockerfile.windows index 0405f3c6a7..0802c8f3ef 100644 --- a/Dockerfile.windows +++ b/Dockerfile.windows @@ -17,10 +17,11 @@ RUN cd innosetup && \ wine "./innounp.exe" -e "is-unicode.exe" # installer components -ENV INSTALLER_VERSION 1.9.1j -ENV DOCKER_VERSION 1.9.1 -ENV DOCKER_MACHINE_VERSION 0.5.6 -ENV DOCKER_COMPOSE_VERSION 1.5.2 +ENV INSTALLER_VERSION 1.10.0-rc1 +ENV DOCKER_VERSION 1.10.0-rc1 +ENV DOCKER_MACHINE_VERSION 0.6.0-rc1 +ENV DOCKER_COMPOSE_VERSION 1.6.0-rc1 + ENV BOOT2DOCKER_ISO_VERSION $DOCKER_VERSION ENV KITEMATIC_VERSION 0.9.6 ENV VIRTUALBOX_VERSION 5.0.14 @@ -30,15 +31,15 @@ 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.exe "https://github.com/docker/machine/releases/download/v$DOCKER_MACHINE_VERSION/docker-machine_windows-amd64.exe" 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.zip" && \ mkdir kitematic && \ From dcc7734a67ef939f47cf454239106d9b24eef34a Mon Sep 17 00:00:00 2001 From: Jeffrey Morgan Date: Wed, 27 Jan 2016 19:11:00 -0800 Subject: [PATCH 2/4] Bump versions Signed-off-by: Jeffrey Morgan --- Dockerfile.osx | 6 +++--- Dockerfile.windows | 7 +++---- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/Dockerfile.osx b/Dockerfile.osx index 853c62f9c9..cef7862923 100644 --- a/Dockerfile.osx +++ b/Dockerfile.osx @@ -26,8 +26,8 @@ RUN curl -fsSL -o /vbox.dmg http://download.virtualbox.org/virtualbox/$VBOX_VERS # Download the Docker parts -ENV INSTALLER_VERSION 1.10.0-rc1 -ENV DOCKER_VERSION 1.10.0-rc1 +ENV INSTALLER_VERSION 1.10.0-rc2 +ENV DOCKER_VERSION 1.10.0-rc2 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 @@ -37,7 +37,7 @@ ENV DOCKER_MACHINE_VERSION 0.6.0-rc1 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 -ENV DOCKER_COMPOSE_VERSION 1.6.0-rc1 +ENV DOCKER_COMPOSE_VERSION 1.6.0-rc2 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 0802c8f3ef..9e2b5aa612 100644 --- a/Dockerfile.windows +++ b/Dockerfile.windows @@ -17,11 +17,10 @@ RUN cd innosetup && \ wine "./innounp.exe" -e "is-unicode.exe" # installer components -ENV INSTALLER_VERSION 1.10.0-rc1 -ENV DOCKER_VERSION 1.10.0-rc1 +ENV INSTALLER_VERSION 1.10.0-rc2 +ENV DOCKER_VERSION 1.10.0-rc2 ENV DOCKER_MACHINE_VERSION 0.6.0-rc1 -ENV DOCKER_COMPOSE_VERSION 1.6.0-rc1 - +ENV DOCKER_COMPOSE_VERSION 1.6.0-rc2 ENV BOOT2DOCKER_ISO_VERSION $DOCKER_VERSION ENV KITEMATIC_VERSION 0.9.6 ENV VIRTUALBOX_VERSION 5.0.14 From a1c1f697831d62362b4623e50781d0d1237aaf7d Mon Sep 17 00:00:00 2001 From: Jean-Laurent de Morlhon Date: Tue, 2 Feb 2016 17:33:16 -0800 Subject: [PATCH 3/4] Bump docker-machine version to 0.6.0-rc3 Signed-off-by: Jean-Laurent de Morlhon --- Dockerfile.osx | 2 +- Dockerfile.windows | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile.osx b/Dockerfile.osx index cef7862923..190864f93d 100644 --- a/Dockerfile.osx +++ b/Dockerfile.osx @@ -33,7 +33,7 @@ RUN curl -fsSL -o /docker https://test.docker.com/builds/Darwin/x86_64/docker-$D RUN chmod +x /docker -ENV DOCKER_MACHINE_VERSION 0.6.0-rc1 +ENV DOCKER_MACHINE_VERSION 0.6.0-rc3 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 9e2b5aa612..17504f0afa 100644 --- a/Dockerfile.windows +++ b/Dockerfile.windows @@ -19,7 +19,7 @@ RUN cd innosetup && \ # installer components ENV INSTALLER_VERSION 1.10.0-rc2 ENV DOCKER_VERSION 1.10.0-rc2 -ENV DOCKER_MACHINE_VERSION 0.6.0-rc1 +ENV DOCKER_MACHINE_VERSION 0.6.0-rc3 ENV DOCKER_COMPOSE_VERSION 1.6.0-rc2 ENV BOOT2DOCKER_ISO_VERSION $DOCKER_VERSION ENV KITEMATIC_VERSION 0.9.6 From f6dc25a3b2fbc64b3fa1219c027fdbe75f82b611 Mon Sep 17 00:00:00 2001 From: Jean-Laurent de Morlhon Date: Tue, 2 Feb 2016 17:56:20 -0800 Subject: [PATCH 4/4] Bumping docker to 1.10.0-rc3 Signed-off-by: Jean-Laurent de Morlhon --- Dockerfile.osx | 4 ++-- Dockerfile.windows | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile.osx b/Dockerfile.osx index 190864f93d..2488e6ea78 100644 --- a/Dockerfile.osx +++ b/Dockerfile.osx @@ -26,8 +26,8 @@ RUN curl -fsSL -o /vbox.dmg http://download.virtualbox.org/virtualbox/$VBOX_VERS # Download the Docker parts -ENV INSTALLER_VERSION 1.10.0-rc2 -ENV DOCKER_VERSION 1.10.0-rc2 +ENV INSTALLER_VERSION 1.10.0-rc3 +ENV DOCKER_VERSION 1.10.0-rc3 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 17504f0afa..111ce33098 100644 --- a/Dockerfile.windows +++ b/Dockerfile.windows @@ -17,8 +17,8 @@ RUN cd innosetup && \ wine "./innounp.exe" -e "is-unicode.exe" # installer components -ENV INSTALLER_VERSION 1.10.0-rc2 -ENV DOCKER_VERSION 1.10.0-rc2 +ENV INSTALLER_VERSION 1.10.0-rc3 +ENV DOCKER_VERSION 1.10.0-rc3 ENV DOCKER_MACHINE_VERSION 0.6.0-rc3 ENV DOCKER_COMPOSE_VERSION 1.6.0-rc2 ENV BOOT2DOCKER_ISO_VERSION $DOCKER_VERSION