Skip to content
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

Remove lxc-net dependency on Upstart service #6

Merged
merged 1 commit into from
Dec 16, 2015
Merged

Remove lxc-net dependency on Upstart service #6

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 templates/docker-init.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# Generated by Ansible for {{ansible_fqdn}}
description "Docker daemon"

start on filesystem and started lxc-net
start on filesystem
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure of the initial need for lxc-net but if anyone needs it (and I assume that originally it was needed) then it would be better if we could at least make it optional using a flag. On a related note, maybe that won't be needed depending on #3 .

stop on runlevel [!2345]

respawn

script
[ ! -f /etc/default/docker ] || . /etc/default/docker
/usr/bin/docker -d $DOCKER_OPTS
end script
end script