Bensuperpc/dockcross
1
0
Fork 0
mirror of https://github.com/bensuperpc/dockcross.git synced 2025-01-22 14:15:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #138 from conz27/ssh_support

Browse Source 
SSH Support for Git Clone / Checkout
This commit is contained in:
Matt McCormick 2017-05-13 11:04:25 -04:00 committed by GitHub
commit 68962e0e84
3 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
common.debian
View File

@ -24,6 +24,7 @@ RUN apt-get update --yes && apt-get install --no-install-recommends --yes \
python-pip \ python-pip \
rsync \ rsync \
sed \ sed \
ssh \
bison \ bison \
flex \ flex \
tar \ tar \

2
common.manylinux
View File

@ -18,5 +18,5 @@ RUN /usr/local/bin/install-python-packages.sh
COPY manylinux-common/pre_exec.sh /dockcross/pre_exec.sh COPY manylinux-common/pre_exec.sh /dockcross/pre_exec.sh
RUN yum -y install pax zip \ RUN yum -y install pax zip openssh-clients \
&& yum clean all && yum clean all

11
imagefiles/dockcross
View File

@ -193,6 +193,16 @@ else
HOST_PWD=$PWD HOST_PWD=$PWD
fi fi
# Mount Additional Volumes
if [ -z "$SSH_DIR" ]; then
SSH_DIR="$HOME/.ssh"
fi
HOST_VOLUMES=
if [ -e "$SSH_DIR" ]; then
HOST_VOLUMES+="-v $SSH_DIR:/home/$(id -un)/.ssh"
fi
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# Now, finally, run the command in a container # Now, finally, run the command in a container
# #
@ -200,6 +210,7 @@ tty -s && TTY_ARGS=-ti || TTY_ARGS=
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 \
$HOST_VOLUMES \
$USER_IDS \ $USER_IDS \
$FINAL_ARGS \ $FINAL_ARGS \
$FINAL_IMAGE "$@" $FINAL_IMAGE "$@"