Skip to content

Add /etc/default/docker support to upstart, too (mirroring sysvinit)#2652

Merged
tianon merged 1 commit intomoby:masterfrom
tianon:upstart-defaults-too
Nov 13, 2013
Merged

Add /etc/default/docker support to upstart, too (mirroring sysvinit)#2652
tianon merged 1 commit intomoby:masterfrom
tianon:upstart-defaults-too

Conversation

@tianon
Copy link
Copy Markdown
Member

@tianon tianon commented Nov 11, 2013

Now, we can have "/etc/default/docker" that contains:

DOCKER_OPTS="-D -H=unix:///var/run/docker.sock -H=tcp://127.0.0.1:4243"

... and both Upstart and SysV will use it correctly to start the docker daemon with the proper options.

@vieux
Copy link
Copy Markdown
Contributor

vieux commented Nov 12, 2013

ping @mzdaniel

@mzdaniel
Copy link
Copy Markdown
Contributor

mzdaniel commented Nov 13, 2013

Certainly, LGTM

@tianon
Copy link
Copy Markdown
Member Author

tianon commented Nov 13, 2013

Thanks, @mzdaniel :)

tianon added a commit that referenced this pull request Nov 13, 2013
@tianon
Merge pull request #2652 from tianon/upstart-defaults-too
b94e9ed 
Add /etc/default/docker support to upstart, too (mirroring sysvinit)
@tianon tianon merged commit b94e9ed into moby:master Nov 13, 2013
@tianon tianon deleted the upstart-defaults-too branch November 13, 2013 18:42
@tianon tianon mentioned this pull request Nov 15, 2013
Merged
@dhrp dhrp mentioned this pull request Dec 12, 2013
Closed
@garthk
Copy link
Copy Markdown

garthk commented Feb 14, 2014

Did this make it in, @tianon? The 0.8.0 /etc/init/docker.conf makes no attempt to call /etc/default/docker, making the automatically start containers documentation rather misleading. No, containers don't restart by default; no, editing /etc/init/docker.conf will not help you.

@tianon
Copy link
Copy Markdown
Member Author

tianon commented Feb 14, 2014

@garthk yes, this was merged months ago and has been in several of our released versions now. Can you paste your "/etc/init/docker.conf"? It sounds like you might have modified it, and APT was being "kind" and didn't update it for you so that your changes would be preserved.

@garthk
Copy link
Copy Markdown

garthk commented Feb 14, 2014

I eventually figured out the Puppet module was over-writing /etc/init/docker.conf with something quite old, hence garethr/garethr-docker#36 and garethr/garethr-docker#37.

I might also have permanently confused apt�, my brain, or both.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@tianon @vieux @mzdaniel @garthk