Bump versions

Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>

Author: jmorganca

Dockerfile.osx

@@ -26,16 +26,15 @@ RUN curl -fsSL -o /vbox.dmg http://download.virtualbox.org/virtualbox/$VBOX_VERS
 
 # Download the Docker parts
 
-ENV INSTALLER_VERSION 1.9.1c
+ENV INSTALLER_VERSION 1.9.1d
 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
 RUN chmod +x /docker
 
-ENV DOCKER_MACHINE_VERSION 0.5.2
-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*
+ENV DOCKER_MACHINE_VERSION 0.5.3
+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
 RUN curl -fsSL -o /docker-compose https://github.com/docker/compose/releases/download/$DOCKER_COMPOSE_VERSION/docker-compose-Darwin-x86_64
@@ -45,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.3
+ENV KITEMATIC_VERSION 0.9.4
 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
@@ -114,7 +113,7 @@ RUN cd /mpkg/dockermachine.pkg && \
 	mkdir rootfs && \
 	cd rootfs && \
   mkdir -p usr/local/bin && \
-  mv /docker-machine* usr/local/bin/ && \
+  mv /docker-machine usr/local/bin/ && \
   ls -al /usr/local/bin/ && \
 	find . | cpio -o --format odc | gzip -c > ../Payload && \
 	mkbom . ../Bom && \

Dockerfile.windows

@@ -17,12 +17,12 @@ RUN cd innosetup && \
     wine "./innounp.exe" -e "is-unicode.exe"
 
 # installer components
-ENV INSTALLER_VERSION 1.9.1c
+ENV INSTALLER_VERSION 1.9.1d
 ENV DOCKER_VERSION 1.9.1
-ENV DOCKER_MACHINE_VERSION 0.5.2
+ENV DOCKER_MACHINE_VERSION 0.5.3
 ENV DOCKER_COMPOSE_VERSION 1.5.2
 ENV BOOT2DOCKER_ISO_VERSION $DOCKER_VERSION
-ENV KITEMATIC_VERSION 0.9.3
+ENV KITEMATIC_VERSION 0.9.4
 ENV VIRTUALBOX_VERSION 5.0.10
 ENV VIRTUALBOX_REVISION 104061
 ENV GIT_VERSION 2.5.0
@@ -33,9 +33,7 @@ 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-machine.zip "https://github.com/docker/machine/releases/download/v$DOCKER_MACHINE_VERSION/docker-machine_windows-amd64.zip" && \
-  unzip docker-machine.zip && \
-  rm docker-machine.zip
+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"
 

windows/Toolbox.iss

@@ -5,7 +5,7 @@
 
 #define b2dIsoPath "..\bundle\boot2docker.iso"
 #define dockerCli "..\bundle\docker.exe"
-#define dockerMachineCli "..\bundle\docker-machine*.exe"
+#define dockerMachineCli "..\bundle\docker-machine.exe"
 #define dockerComposeCli "..\bundle\docker-compose.exe"
 #define kitematic "..\bundle\kitematic"
 #define git "..\bundle\Git.exe"