From 4201ffc84ba7eb7c61470a15695eea70ba2b1ac0 Mon Sep 17 00:00:00 2001 From: Jeffrey Morgan Date: Wed, 12 Aug 2015 19:41:38 -0700 Subject: [PATCH 1/3] Check for migration ability --- osx/mpkg/boot2dockeriso.pkg/Scripts/postinstall | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/osx/mpkg/boot2dockeriso.pkg/Scripts/postinstall b/osx/mpkg/boot2dockeriso.pkg/Scripts/postinstall index 34937f77ff..d333648270 100755 --- a/osx/mpkg/boot2dockeriso.pkg/Scripts/postinstall +++ b/osx/mpkg/boot2dockeriso.pkg/Scripts/postinstall @@ -18,7 +18,11 @@ VM=default VBOXMANAGE=/Applications/VirtualBox.app/Contents/MacOS/VBoxManage -if [ -f $VBOXMANAGE ] && [ -f /usr/local/bin/docker-machine ]; then +# Make sure this version of boot2docker can migrate +/usr/local/bin/docker-machine create --help | grep virtualbox-import-boot2docker-vm +DOCKER_MACHINE_MIGRATION_CHECK=$? + +if [ -f $VBOXMANAGE ] && [ -f /usr/local/bin/docker-machine ] && [ $DOCKER_MACHINE_MIGRATION_CHECK -eq 0 ]; then sudo -u $USER $VBOXMANAGE showvminfo $BOOT2DOCKER_VM &> /dev/null BOOT2DOCKER_VM_EXISTS_CODE=$? From 825b387c391b0c2e9ddaa5990d7e881e13df9b35 Mon Sep 17 00:00:00 2001 From: Jeffrey Morgan Date: Wed, 12 Aug 2015 20:20:51 -0700 Subject: [PATCH 2/3] Bump to 1.8.1 Signed-off-by: Jeffrey Morgan --- osx/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/osx/Dockerfile b/osx/Dockerfile index 8deef214a5..1f7a3957f6 100644 --- a/osx/Dockerfile +++ b/osx/Dockerfile @@ -26,7 +26,7 @@ RUN curl -fsSL -o /vbox.dmg http://download.virtualbox.org/virtualbox/$VBOX_VERS # Download the Docker parts -ENV DOCKER_VERSION 1.8.0 +ENV DOCKER_VERSION 1.8.1 RUN curl -fsSL -o /docker https://get.docker.com/builds/Darwin/x86_64/docker-$DOCKER_VERSION RUN chmod +x /docker @@ -44,7 +44,7 @@ RUN curl -fsSL -o /boot2docker.iso https://github.com/boot2docker/boot2docker/re ENV KITEMATIC_VERSION 0.8.1 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.8.0b +ENV INSTALLER_VERSION 1.8.1 ENV MIXPANEL_TOKEN c306ae65c33d7d09fe3e546f36493a6e From 5cd30d7e629b5c83f586c6d25fc2aabc76bf82b6 Mon Sep 17 00:00:00 2001 From: Jeffrey Morgan Date: Wed, 12 Aug 2015 20:40:59 -0700 Subject: [PATCH 3/3] Bump kitematic to 0.8.2 on osx Signed-off-by: Jeffrey Morgan --- osx/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osx/Dockerfile b/osx/Dockerfile index 1f7a3957f6..28db7cad8e 100644 --- a/osx/Dockerfile +++ b/osx/Dockerfile @@ -41,7 +41,7 @@ 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 -ENV KITEMATIC_VERSION 0.8.1 +ENV KITEMATIC_VERSION 0.8.2 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.8.1