summaryrefslogtreecommitdiffstats
path: root/fuel-build/docker
diff options
context:
space:
mode:
authorStefan K. Berg <stefan.k.berg@ericsson.com>2015-02-13 17:09:52 +0100
committerStefan K. Berg <stefan.k.berg@ericsson.com>2015-02-17 16:22:42 +0100
commitec0606c650706be7444370128624924a3dd1767e (patch)
treec36e86482c38d119bd8a06301af47fb09bc3494a /fuel-build/docker
parent41048f09b545b34ff1ed398b1dd76aad48a98718 (diff)
Update of Fuel based build system to Fuel 6.0.1
Rebase of the build system to build Fuel from the stable/6.0 branch which currently creates Fuel 6.0.1. The Fuel baseline thus becomes: - OpenStack Juno - Ubuntu 12.04.4 - CentOS 6.5 An additional patch is added to the Fuel build system to enable a newer version of Fuel to be built under Docker (as the Ubuntu sandbox chroot is installing atd, where the post install expects upstart to be running which is not the case in the build container). Rebase of patches on top of Fuel to support 6.0.1. Change-Id: I2e884d27e1533be8d60c071a7ea9db998a4f5fea Signed-off-by: Stefan K. Berg <stefan.k.berg@ericsson.com>
Diffstat (limited to 'fuel-build/docker')
-rwxr-xr-xfuel-build/docker/runcontext3
1 files changed, 2 insertions, 1 deletions
diff --git a/fuel-build/docker/runcontext b/fuel-build/docker/runcontext
index d4e8b9c..6140fa0 100755
--- a/fuel-build/docker/runcontext
+++ b/fuel-build/docker/runcontext
@@ -18,8 +18,9 @@ FROM $context
RUN date || date
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 -t -e HOME=$HOME -u $USER -w $PWD -v ${HOME}/.ssh:${HOME}/.ssh -v $PWD:$PWD $CID "$@"
+docker run --privileged=true --rm -i -t -e HOME=$HOME -u $USER -w $PWD -v ${HOME}/.ssh:${HOME}/.ssh -v $GITROOT:$GITROOT $CID "$@"
rc=$?
docker rmi $CID > /dev/null
exit $rc