Skip to content
This repository was archived by the owner on Sep 26, 2021. It is now read-only.

Commit f8c5201

Browse files
committed
Use docker-machine ssh instead of env on windows
Signed-off-by: Jeffrey Morgan <[email protected]>
1 parent 7a35f84 commit f8c5201

File tree

3 files changed

+3
-26
lines changed

3 files changed

+3
-26
lines changed

Dockerfile.osx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ RUN curl -fsSL -o /boot2docker.iso https://github.com/boot2docker/boot2docker/re
4444
ENV KITEMATIC_VERSION 0.8.5
4545
RUN curl -fsSL -o /kitematic.zip https://github.com/kitematic/kitematic/releases/download/v$KITEMATIC_VERSION/Kitematic-$KITEMATIC_VERSION-Mac.zip
4646

47-
ENV INSTALLER_VERSION 1.8.2b
47+
ENV INSTALLER_VERSION 1.8.2c
4848

4949
ENV MIXPANEL_TOKEN c306ae65c33d7d09fe3e546f36493a6e
5050

Dockerfile.windows

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ RUN cd innosetup && \
1717
wine "./innounp.exe" -e "is-unicode.exe"
1818

1919
# installer components
20-
ENV INSTALLER_VERSION 1.8.2b
20+
ENV INSTALLER_VERSION 1.8.2c
2121
ENV DOCKER_VERSION 1.8.2
2222
ENV DOCKER_MACHINE_VERSION 0.4.1
2323
ENV BOOT2DOCKER_ISO_VERSION $DOCKER_VERSION

windows/start.sh

Lines changed: 1 addition & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -31,27 +31,4 @@ fi
3131

3232
echo "Starting machine $VM..."
3333
$DOCKER_MACHINE start $VM
34-
35-
echo "Setting environment variables for machine $VM..."
36-
eval "$($DOCKER_MACHINE env --shell=bash $VM)"
37-
38-
clear
39-
cat << EOF
40-
41-
42-
## .
43-
## ## ## ==
44-
## ## ## ## ## ===
45-
/"""""""""""""""""\___/ ===
46-
~~~ {~~ ~~~~ ~~~ ~~~~ ~~~ ~ / ===- ~~~
47-
\______ o __/
48-
\ \ __/
49-
\____\_______/
50-
51-
EOF
52-
echo -e "${BLUE}docker${NC} is configured to use the ${GREEN}$VM${NC} machine with IP ${GREEN}$($DOCKER_MACHINE ip $VM)${NC}"
53-
echo "For help getting started, check out the docs at https://docs.docker.com"
54-
echo
55-
cd
56-
57-
exec "$BASH" --login -i
34+
$DOCKER_MACHINE ssh $VM

0 commit comments

Comments
 (0)