diff options
| author |   Stefan K. Berg <stefan.k.berg@ericsson.com> | 2016-01-08 13:26:00 +0100 |
|---|---|---|
| committer | Stefan K. Berg <stefan.k.berg@ericsson.com> | 2016-01-17 12:10:12 +0100 |
| commit | 8e599759ede512a773eccef59eb2824940307564 (patch) | |
| tree | 645f1a95633dfa00ed4c64135cbc1ee7fe79519c /build/docker | |
| parent | c14790e44122781b96b1b287f901c36645d7df7b (diff) | |
Fuel 8 uplift
Introducing Fuel 8 with associated changes:
Improvements in usage of cgroups - they are now bind mounted from
the host which solved a Docker-in-Docker problem.
The cache tool (cache.mk) has a new argument "getbiweek" which is
used by the top Makefile when building the Fuel ISO. This makes sure
that there's a fresh build every second week even if the cache is not
purged automatically based on its meta data. This is something we
should add everywhere (in a separate change set).
And obviously, Fuel is now building from stable/8.0 upstream.
NOTE! f_repobuild has been disabled for now, it throws an error
when run. Will be fixed separately.
Change-Id: I7e2ee737fd3bedc75f58539fbc3c5fd1fa08cfa1
Signed-off-by: Stefan K. Berg <stefan.k.berg@ericsson.com>
Diffstat (limited to 'build/docker')
| -rw-r--r-- | build/docker/Dockerfile | 2 | ||||
| -rwxr-xr-x | build/docker/runcontext | 2 | ||||
| -rw-r--r-- | build/docker/ubuntu-builder/enable_dockerx2 | 20 |
3 files changed, 1 insertions, 23 deletions
diff --git a/build/docker/Dockerfile b/build/docker/Dockerfile index f3d122db9..9d1881c05 100644 --- a/build/docker/Dockerfile +++ b/build/docker/Dockerfile @@ -31,7 +31,5 @@ RUN chmod 4755 /bin/fusermount ADD ./setcontext /root/setcontext RUN chmod +x /root/setcontext -ADD ./enable_dockerx2 /root/enable_dockerx2 -RUN chmod +x /root/enable_dockerx2 VOLUME /var/lib/docker diff --git a/build/docker/runcontext b/build/docker/runcontext index b442deeed..4ddd754f9 100755 --- a/build/docker/runcontext +++ b/build/docker/runcontext @@ -111,7 +111,7 @@ if [ -n "$CACHEBASE" ]; then fi fi -RUN_CONTEXT_OPT="--cidfile $CID_FILE --privileged=true --rm -e HOME=$HOME -e CACHEDEBUG -e CACHETRANSPORT -e CACHEMAXAGE -e CACHEBASE -e BUILD_FUEL_PLUGINS -u $USER_ID:$GROUP_ID -w $PWD -v $GITROOT:$GITROOT $CACHEMOUNT" +RUN_CONTEXT_OPT="--cidfile $CID_FILE --privileged=true --rm -e HOME=$HOME -e CACHEDEBUG -e CACHETRANSPORT -e CACHEMAXAGE -e CACHEBASE -e BUILD_FUEL_PLUGINS -u $USER_ID:$GROUP_ID -w $PWD -v $GITROOT:$GITROOT -v /sys/fs/cgroup:/sys/fs/cgroup:ro $CACHEMOUNT" # Passing "debug" puts up an interactive bash shell if [ "$1" == "debug" ]; then diff --git a/build/docker/ubuntu-builder/enable_dockerx2 b/build/docker/ubuntu-builder/enable_dockerx2 deleted file mode 100644 index 1511c70ea..000000000 --- a/build/docker/ubuntu-builder/enable_dockerx2 +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh -############################################################################## -# Copyright (c) 2015 Ericsson AB and others. -# stefan.k.berg@ericsson.com -# jonas.bjurel@ericsson.com -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## -# -# Needed to expose underlying cgroups to container -echo "running x2" > /x2 -mount -n -t tmpfs -o uid=0,gid=0,mode=0755 cgroup /sys/fs/cgroup -mount -t securityfs none /sys/kernel/security - -for mnt in $(cut -d: -f2 /proc/1/cgroup); do - mkdir /sys/fs/cgroup/$mnt - mount -n -t cgroup -o $mnt cgroup /sys/fs/cgroup/$mnt -done |