Skip to content

Fix /etc/init/docker.conf patch for Docker 1.10 #98

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
adderan wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix /etc/init/docker.conf patch for Docker 1.10 #98

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions toil/src/cgcloud/toil/toil_box.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ def _setup_docker( self ):
@@ -1,6 +1,6 @@
description "Docker daemon"

-start on (local-filesystems and net-device-up IFACE!=lo)
+start on (local-filesystems and net-device-up IFACE!=lo and started mesosbox)
-start on (filesystem and net-device-up IFACE!=lo)
+start on (filesystem and net-device-up IFACE!=lo and started mesosbox)
stop on runlevel [!2345]
limit nofile 524288 1048576
limit nproc 524288 1048576""" ) )
Expand Down