Bensuperpc/dockcross
1
0
Fork 0
mirror of https://github.com/bensuperpc/dockcross.git synced 2024-12-31 20:54:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #309 from thewtex/msys

Browse Source 
Msys
This commit is contained in:
Matt McCormick 2019-03-06 00:03:38 -05:00 committed by GitHub
commit d32aba1ba7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
imagefiles/dockcross
View File

@ -208,14 +208,15 @@ if [ -z "$SSH_DIR" ]; then
fi fi
HOST_VOLUMES= HOST_VOLUMES=
if [ -e "$SSH_DIR" ]; then if [ -e "$SSH_DIR" -a -z "$MSYS"]; then
HOST_VOLUMES+="-v $SSH_DIR:/home/$(id -un)/.ssh" HOST_VOLUMES+="-v $SSH_DIR:/home/$(id -un)/.ssh"
fi fi
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# Now, finally, run the command in a container # Now, finally, run the command in a container
# #
tty -s && TTY_ARGS=-ti || TTY_ARGS= TTY_ARGS=
tty -s && [ -z "$MSYS" ] && TTY_ARGS=-ti
CONTAINER_NAME=dockcross_$RANDOM CONTAINER_NAME=dockcross_$RANDOM
docker run $TTY_ARGS --name $CONTAINER_NAME \ docker run $TTY_ARGS --name $CONTAINER_NAME \
-v "$HOST_PWD":/work \ -v "$HOST_PWD":/work \