Merge branch 'master' of github.com:docker/toolbox

Signed-off-by: Joffrey F <[email protected]>

osx/mpkg/quickstart.app/Contents/Resources/Scripts/start.sh

@@ -50,7 +50,7 @@ if [ $VM_EXISTS_CODE -eq 1 ]; then
   "${DOCKER_MACHINE}" create -d virtualbox $PROXY_ENV --virtualbox-memory 2048 --virtualbox-disk-size 204800 "${VM}"
 fi
 
-VM_STATUS="$(${DOCKER_MACHINE} status ${VM} 2>&1)"
+VM_STATUS="$( set +e ; ${DOCKER_MACHINE} status ${VM} )"
 if [ "${VM_STATUS}" != "Running" ]; then
   "${DOCKER_MACHINE}" start "${VM}"
   yes | "${DOCKER_MACHINE}" regenerate-certs "${VM}"

osx/uninstall.sh

@@ -17,7 +17,7 @@ while true; do
 done
 
 echo "Removing Applications..."
-rm -rf /Applications/Docker
+rm -rf /Applications/Docker.app
 
 echo "Removing docker binaries..."
 rm -f /usr/local/bin/docker

script/build-osx

@@ -16,7 +16,7 @@ docker build \
 	--build-arg VBOX_REV="${VBOX_REV}" \
 	--build-arg MIXPANEL_TOKEN="${MIXPANEL_TOKEN}" \
 	.
-CONTAINER="$(docker run -d osx-installer)"
+CONTAINER="$(docker create osx-installer)"
 mkdir -p dist
 docker cp "${CONTAINER}":/DockerToolbox.pkg dist/
 docker rm "${CONTAINER}" 2>/dev/null || true

script/build-windows

@@ -16,7 +16,7 @@ docker build \
 	--build-arg VBOX_REV="${VBOX_REV}" \
 	--build-arg MIXPANEL_TOKEN="${MIXPANEL_TOKEN}" \
 	.
-CONTAINER="$(docker run -d windows-installer)"
+CONTAINER="$(docker create windows-installer)"
 mkdir -p dist
 docker cp "${CONTAINER}":/installer/Output/DockerToolbox.exe dist/
 docker rm "${CONTAINER}" 2>/dev/null || true

windows/start.sh

@@ -61,7 +61,7 @@ if [ $VM_EXISTS_CODE -eq 1 ]; then
 fi
 
 STEP="Checking status on $VM"
-VM_STATUS="$(${DOCKER_MACHINE} status ${VM} 2>&1)"
+VM_STATUS="$( set +e ; ${DOCKER_MACHINE} status ${VM} )"
 if [ "${VM_STATUS}" != "Running" ]; then
   "${DOCKER_MACHINE}" start "${VM}"
   yes | "${DOCKER_MACHINE}" regenerate-certs "${VM}"