summaryrefslogtreecommitdiffstats
path: root/fuel/build/docker
diff options
context:
space:
mode:
authorJonas Bjurel <jonas.bjurel@ericsson.com>2015-03-17 20:24:42 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2015-03-17 20:24:42 +0000
commit759706220ebf55d4bcb1cd967c984eb18f022d05 (patch)
tree2b5c57c83fdc15e23cf19ae92d0581421ebeedc8 /fuel/build/docker
parent92284bbf3c64af4b5ec45aabd0e405597d5b9e2b (diff)
parentdf6c1db2695030b1ba68184bac9aab9fb2d41e71 (diff)
Merge "*** FIRST VERSION OF CI BUILD SCRIPT *** - Provides build cache management to a remote location - Provides automatic cashe repopulation - See /fuel/ci/README - Rebased to master - Bug around cache handling fixed - New option -r introduced to invoke external script/program instead of standard http(s)/fttp get and put, eg. scripts or programs to integrate with dropbox, or similar. The script needs to anheaer to curl argument list. - Stefan Berg's comments implemented - Fatih Degirmenci's comments implemented with one exemption: the revision state .iso naming convention still remains the same - we need to discuss this. With the implementation of Fatih's comments the build.sh argument structure is slightly changed, please see ./build.sh -h"
Diffstat (limited to 'fuel/build/docker')
-rwxr-xr-xfuel/build/docker/runcontext11
1 files changed, 10 insertions, 1 deletions
diff --git a/fuel/build/docker/runcontext b/fuel/build/docker/runcontext
index a22fb29..cf116fc 100755
--- a/fuel/build/docker/runcontext
+++ b/fuel/build/docker/runcontext
@@ -20,7 +20,16 @@ RUN /root/setcontext $USER $UID $GID $HOME
EOF`
GITROOT=`git rev-parse --show-toplevel`
CID=`echo $res | sed 's/.* //'`
-docker run --privileged=true --rm -i -e HOME=$HOME -u $USER -w $PWD -v ${HOME}/.ssh:${HOME}/.ssh -v $GITROOT:$GITROOT $CID "$@"
+
+ RUN_CONTEXT_OPT="--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"
+fi
+
+echo command: docker run ${RUN_CONTEXT_OPT} $CID "$@"
+docker run ${RUN_CONTEXT_OPT} $CID "$@"
+
rc=$?
docker rmi $CID > /dev/null
exit $rc