docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-15 07:40:57 +03:00
Code Activity

Merge pull request #1673 from xdissent/1659-upstart-order

Browse Source 
Start docker after lxc-net to prevent ip forwarding race
Upstream-commit: 212b582362e66fc0d9403c0b8c46022f5d103224
Component: engine
This commit is contained in:
Daniel Mizyrycki
2013-08-30 16:05:40 -07:00
parent 69521a9731 6f14a61b9c
commit 40fb0d73cb
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/engine/contrib/install.sh
View File

@@ -47,7 +47,7 @@ else
echo "Creating /etc/init/dockerd.conf..."
cat >/etc/init/dockerd.conf <<EOF
description "Docker daemon"
start on filesystem or runlevel [2345]
start on filesystem and started lxc-net
stop on runlevel [!2345]
respawn
exec /usr/local/bin/docker -d

2
components/engine/hack/release/make.sh
View File

@@ -52,7 +52,7 @@ private PaaS, service-oriented architectures, etc."
UPSTART_SCRIPT='description "Docker daemon"
start on filesystem or runlevel [2345]
start on filesystem and started lxc-net
stop on runlevel [!2345]
respawn

2
components/engine/packaging/ubuntu/docker.upstart
View File

@@ -1,6 +1,6 @@
description "Run docker"
start on filesystem or runlevel [2345]
start on filesystem and started lxc-net
stop on runlevel [!2345]
respawn