Use docker-machine ssh instead of env on windows

Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>
docker-archive · Sep 28, 2015 · f8c5201 · f8c5201
1 parent 7a35f84
commit f8c5201
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 26 deletions.
diff --git a/Dockerfile.osx b/Dockerfile.osx
@@ -44,7 +44,7 @@ RUN curl -fsSL -o /boot2docker.iso https://github.com/boot2docker/boot2docker/re
 ENV KITEMATIC_VERSION 0.8.5
 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.2b
+ENV INSTALLER_VERSION 1.8.2c
 
 ENV MIXPANEL_TOKEN c306ae65c33d7d09fe3e546f36493a6e
 

diff --git a/Dockerfile.windows b/Dockerfile.windows
@@ -17,7 +17,7 @@ RUN cd innosetup && \
     wine "./innounp.exe" -e "is-unicode.exe"
 
 # installer components
-ENV INSTALLER_VERSION 1.8.2b
+ENV INSTALLER_VERSION 1.8.2c
 ENV DOCKER_VERSION 1.8.2
 ENV DOCKER_MACHINE_VERSION 0.4.1
 ENV BOOT2DOCKER_ISO_VERSION $DOCKER_VERSION

diff --git a/windows/start.sh b/windows/start.sh
@@ -31,27 +31,4 @@ fi
 
 echo "Starting machine $VM..."
 $DOCKER_MACHINE start $VM
-
-echo "Setting environment variables for machine $VM..."
-eval "$($DOCKER_MACHINE env --shell=bash $VM)"
-
-clear
-cat << EOF
-
-
-                        ##         .
-                  ## ## ##        ==
-               ## ## ## ## ##    ===
-           /"""""""""""""""""\___/ ===
-      ~~~ {~~ ~~~~ ~~~ ~~~~ ~~~ ~ /  ===- ~~~
-           \______ o           __/
-             \    \         __/
-              \____\_______/
-
-EOF
-echo -e "${BLUE}docker${NC} is configured to use the ${GREEN}$VM${NC} machine with IP ${GREEN}$($DOCKER_MACHINE ip $VM)${NC}"
-echo "For help getting started, check out the docs at https://docs.docker.com"
-echo
-cd
-
-exec "$BASH" --login -i
+$DOCKER_MACHINE ssh $VM