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.

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

Updated the /etc/init/docker.conf template. #268

Merged
merged 1 commit into from
Mar 18, 2015

Conversation

jperville
Copy link
Contributor

This PR brings our upstart docker service template up to date with the original at https://github.com/docker/docker/blob/master/contrib/init/upstart/docker.conf .

I found out about the issue when upgrading to lxc-docker 1.5.0; dpkg asked me if I want to replace the /etc/init/docker.conf file or keep my change. Ironically, the changes in the file are related to fixing an issue that I reported a while ago on the docker github that got merged last December.

@jperville
Copy link
Contributor Author

In the long term, since the lxc-docker packages from docker.io have been including an upstart service configuration for a while, should we stop overriding that file in this cookbook with our own (potentially out of sync) version? I believe so but this should be the point of another PR.

@jperville
Copy link
Contributor Author

The travis fail is unrelated to this PR.

@bflad
Copy link
Contributor

bflad commented Mar 18, 2015

Thanks for fixing this. The changes inside the upstart configuration LGTM (no missing dependencies or anything).

I completely agree with removing the template except for edge case binary/tarball installs, which I believe was the only reason this was implemented in the first place. There's probably a better way to approach the handling for only if we want to actually override the init_template and/or only binary/tarball installs, which I'd gladly accept a PR.

bflad added a commit that referenced this pull request Mar 18, 2015
Updated the /etc/init/docker.conf template.
@bflad bflad merged commit 57ca09b into sous-chefs:master Mar 18, 2015
@jperville jperville deleted the update-upstart-init-script branch September 21, 2015 15:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants