From 5e880285ec5fa8e8843e9f978d3caddf6d7b6d27 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Thu, 9 Jan 2014 12:09:25 -0500 Subject: [PATCH 1/2] ExecStartPre commands updated Docker-DCO-1.1-Signed-off-by: Lokesh Mandvekar (github: lsm5) systemd service no longer does '/bin/mount/ --make-rprivate /'. Core issue fixed by Alex Larsson (commit 157d99a). ip forwarding enabled. Upstream-commit: f09a78cd219b24d4308034c8dd13410cfe5fbec7 Component: engine --- components/engine/contrib/init/systemd/docker.service | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/components/engine/contrib/init/systemd/docker.service b/components/engine/contrib/init/systemd/docker.service index aae7b6daf9..dc7cc450dd 100644 --- a/components/engine/contrib/init/systemd/docker.service +++ b/components/engine/contrib/init/systemd/docker.service @@ -1,11 +1,13 @@ [Unit] -Description=Docker Application Container Engine +Description=Docker Application Container Engine Documentation=http://docs.docker.io After=network.target [Service] -ExecStartPre=/bin/mount --make-rprivate / +Type=simple +ExecStartPre=/usr/sbin/sysctl -w net.ipv4.ip_forward=1 net.ipv6.conf.all.forwarding=1 ExecStart=/usr/bin/docker -d +Restart=on-failure [Install] WantedBy=multi-user.target From 667c92d38b0d80e4567da9f832c82a447ce3586b Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 29 Jan 2014 11:05:11 -0500 Subject: [PATCH 2/2] remove ip fowarding from systemd (fixed: commit #3801) Docker-DCO-1.1-Signed-off-by: Lokesh Mandvekar (github: lsm5) Upstream-commit: a9d0bbcfc6e45817f39f15a7c9b11305b4c04bad Component: engine --- components/engine/contrib/init/systemd/docker.service | 2 -- 1 file changed, 2 deletions(-) diff --git a/components/engine/contrib/init/systemd/docker.service b/components/engine/contrib/init/systemd/docker.service index dc7cc450dd..387be2eb1c 100644 --- a/components/engine/contrib/init/systemd/docker.service +++ b/components/engine/contrib/init/systemd/docker.service @@ -4,8 +4,6 @@ Documentation=http://docs.docker.io After=network.target [Service] -Type=simple -ExecStartPre=/usr/sbin/sysctl -w net.ipv4.ip_forward=1 net.ipv6.conf.all.forwarding=1 ExecStart=/usr/bin/docker -d Restart=on-failure