From 4c345be02a646a618ec7bec7a376d0b6821a3e91 Mon Sep 17 00:00:00 2001
From: Petri Sirkkala <sirpete@iki.fi>
Date: Fri, 6 Nov 2015 09:44:21 +0200
Subject: [PATCH 1/2] Fail fast in case we are run without terminal
---
osx/uninstall.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/osx/uninstall.sh b/osx/uninstall.sh
index 5e29e137..c86b707d 100755
--- a/osx/uninstall.sh
+++ b/osx/uninstall.sh
@@ -12,7 +12,7 @@ while true; do
case $yn in
[Yy]* ) docker-machine rm -f $(docker-machine ls -q); break;;
[Nn]* ) break;;
- * ) echo "Please answer yes or no.";;
+ * ) echo "Please answer yes or no."; exit 1;;
esac
done
From 2b28473d34d15d6c3d6df524975ef7cdcd0fbedd Mon Sep 17 00:00:00 2001
From: Jean-Laurent de Morlhon <jeanlaurent@morlhon.net>
Date: Wed, 18 Nov 2015 16:00:42 +0100
Subject: [PATCH 2/2] Bump docker-machine to 0.5.1
Signed-off-by: Jean-Laurent de Morlhon <jeanlaurent@morlhon.net>
---
Dockerfile.osx | 2 +-
Dockerfile.windows | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Dockerfile.osx b/Dockerfile.osx
index bc8ebd9d..86b6ad53 100644
--- a/Dockerfile.osx
+++ b/Dockerfile.osx
@@ -32,7 +32,7 @@ ENV DOCKER_VERSION 1.9.0
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
+ENV DOCKER_MACHINE_VERSION 0.5.1
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*
diff --git a/Dockerfile.windows b/Dockerfile.windows
index 3c499d9c..3a502328 100644
--- a/Dockerfile.windows
+++ b/Dockerfile.windows
@@ -19,7 +19,7 @@ RUN cd innosetup && \
# installer components
ENV INSTALLER_VERSION 1.9.0d
ENV DOCKER_VERSION 1.9.0
-ENV DOCKER_MACHINE_VERSION 0.5.0
+ENV DOCKER_MACHINE_VERSION 0.5.1
ENV DOCKER_COMPOSE_VERSION 1.5.1
ENV BOOT2DOCKER_ISO_VERSION $DOCKER_VERSION
ENV KITEMATIC_VERSION 0.9.3