From 5eb00202e05f1a65e49f6ff6c14df6c899ea45fe Mon Sep 17 00:00:00 2001 From: unclejack Date: Thu, 20 Jun 2013 20:13:00 +0300 Subject: [PATCH] let docker set up its own bridge --- .../app-emulation/docker/files/docker.service | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/docker.service b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/docker.service index 16dc208d97..6f28c1ef31 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/docker.service +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/docker.service @@ -1,17 +1,12 @@ [Service] Type=forking ExecStartPre=/bin/mount --make-rprivate / -ExecStartPre=/sbin/brctl addbr lxcbr0 -ExecStartPre=/bin/ifconfig lxcbr0 10.65.41.1 # HACK: for some reason docker is crashing when exiting a container when being # supervised by systemd. Fork out for now. Real solution should be: -# ExecStart=/usr/bin/docker -d -D -b lxcbr0 +# ExecStart=/usr/bin/docker -d -D -ExecStart=/bin/bash -c "/usr/bin/nohup /usr/bin/docker -d -D -b lxcbr0 &" - -ExecStopPost=/bin/ifconfig lxcbr0 down -ExecStopPost=/sbin/brctl delbr lxcbr0 +ExecStart=/bin/bash -c "/usr/bin/nohup /usr/bin/docker -d -D &" [Install] WantedBy=multi-user.target