diff options
| author |   Stefan K. Berg <stefan.k.berg@ericsson.com> | 2015-02-12 12:12:34 +0100 |
|---|---|---|
| committer | Stefan K. Berg <stefan.k.berg@ericsson.com> | 2015-02-12 12:16:55 +0100 |
| commit | 41048f09b545b34ff1ed398b1dd76aad48a98718 (patch) | |
| tree | d7de97e4a93bd2f645f75ebda2a1cd51b959f66e /fuel-build/docker/runcontext | |
| parent | d29df40fd66d6a90fde858e8a0bc0d0e98a01794 (diff) | |
Simplification and cleanup of build process
Docker build image:
- Uplift of the base Ubuntu version to 14.04.
- Instead of building the Ubuntu image with debootstrap, we use the official
Docker repository version of Ubuntu.
- Cleanup of the way how runcontext operates
- Fix: Make sure that the build system can be run as root
Top Makefile:
- Building the Fuel ISO on Docker local /tmp directory not to pollute local
directory with files owned by root.
- Removed unused targets.
Change-Id: I684348b2a15546eadf98d810239a84ff9798b1e8
Signed-off-by: Stefan K. Berg <stefan.k.berg@ericsson.com>
Diffstat (limited to 'fuel-build/docker/runcontext')
| -rwxr-xr-x | fuel-build/docker/runcontext | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/fuel-build/docker/runcontext b/fuel-build/docker/runcontext index 45a7645..d4e8b9c 100755 --- a/fuel-build/docker/runcontext +++ b/fuel-build/docker/runcontext @@ -15,16 +15,11 @@ GID=`id -g` USER=`whoami` res=`docker build -q --rm - <<EOF FROM $context -RUN echo "invalidate cache" && echo "done" -RUN /usr/sbin/groupadd --gid $GID $USER -RUN /usr/sbin/adduser --system --uid=$UID --gid=$GID --home $HOME --shell /bin/bash $USER -RUN /usr/sbin/usermod -a -G fuse $USER -RUN echo "export HOME=$HOME" >> /etc/bash.bashrc -RUN echo "$@" >> /etc/bash.bashrc -RUN echo 'exit \\$?' >> /etc/bash.bashrc +RUN date || date +RUN /root/setcontext $USER $UID $GID $HOME EOF` CID=`echo $res | sed 's/.* //'` -docker run --privileged=true --rm -i -t -u $USER -w $PWD -v ${HOME}/.ssh:${HOME}/.ssh -v $PWD:$PWD $CID bash +docker run --privileged=true --rm -i -t -e HOME=$HOME -u $USER -w $PWD -v ${HOME}/.ssh:${HOME}/.ssh -v $PWD:$PWD $CID "$@" rc=$? docker rmi $CID > /dev/null exit $rc |