summaryrefslogtreecommitdiffstats
path: root/build/docker
diff options
context:
space:
mode:
authorStefan Berg <sfb@consultron.com>2016-01-29 14:44:43 +0100
committerStefan Berg <sfb@consultron.com>2016-01-29 14:44:43 +0100
commit1a560c19021ff232b7869b3057af4bcc46145b40 (patch)
tree14cd014dac38ffca567b3e2611a20fc05754f998 /build/docker
parent65c164021cb356b3d4e6888488fb62c3395da4f5 (diff)
Brahmaputra master sync
Signed-off-by: Stefan Berg <sfb@consultron.com>
Diffstat (limited to 'build/docker')
-rw-r--r--build/docker/Dockerfile2
-rw-r--r--build/docker/ubuntu-builder/enable_dockerx220
2 files changed, 0 insertions, 22 deletions
diff --git a/build/docker/Dockerfile b/build/docker/Dockerfile
index 867859bb8..b7ef6d3a7 100644
--- a/build/docker/Dockerfile
+++ b/build/docker/Dockerfile
@@ -34,7 +34,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/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