diff options
Diffstat (limited to 'fuel/build/docker/runcontext')
-rwxr-xr-x | fuel/build/docker/runcontext | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/fuel/build/docker/runcontext b/fuel/build/docker/runcontext index 77e4921e1..341612b4e 100755 --- a/fuel/build/docker/runcontext +++ b/fuel/build/docker/runcontext @@ -42,11 +42,15 @@ EOF` GITROOT=`git rev-parse --show-toplevel` IID=`echo $res | sed 's/.* //'` CID_FILE=`mktemp -u -t runcontext.XXXXXXXXXX` -RUN_CONTEXT_OPT="--cidfile $CID_FILE --privileged=true --rm -i -e HOME=$HOME -u $USER -w $PWD -v ${HOME}/.ssh:${HOME}/.ssh -v $GITROOT:$GITROOT" -if [ "${INTERACTIVE}" != "FALSE" ]; then - RUN_CONTEXT_OPT+=" -t" +# Evaluate the need for bind mounting the cache directory +if [ -n "$CACHEBASE" ]; then + if echo $CACHEBASE | grep -q '^file://'; then + CACHEMOUNT="-v $(echo $CACHEBASE | sed 's;file://;;'):$(echo $CACHEBASE | sed 's;file://;;')" + fi fi +RUN_CONTEXT_OPT="--cidfile $CID_FILE --privileged=true --rm -e HOME=$HOME -e CACHEDEBUG -e CACHETRANSPORT -e CACHEMAXAGE -e CACHEBASE -u $USER -w $PWD -v ${HOME}/.ssh:${HOME}/.ssh -v $GITROOT:$GITROOT $CACHEMOUNT" + echo command: docker run ${RUN_CONTEXT_OPT} $IID "$@" docker run ${RUN_CONTEXT_OPT} $IID "$@" |