summaryrefslogtreecommitdiffstats
path: root/build/docker/Dockerfile
diff options
context:
space:
mode:
authorStefan K. Berg <stefan.k.berg@ericsson.com>2016-01-08 13:26:00 +0100
committerStefan K. Berg <stefan.k.berg@ericsson.com>2016-01-17 12:10:12 +0100
commit8e599759ede512a773eccef59eb2824940307564 (patch)
tree645f1a95633dfa00ed4c64135cbc1ee7fe79519c /build/docker/Dockerfile
parentc14790e44122781b96b1b287f901c36645d7df7b (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/Dockerfile')
-rw-r--r--build/docker/Dockerfile2
1 files changed, 0 insertions, 2 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