Merged
Conversation
| if [ -f /etc/default/$UPSTART_JOB ]; then | ||
| . /etc/default/$UPSTART_JOB | ||
| fi | ||
| exec "$DOCKER" daemon $DOCKER_OPTS 2>&1 | logger -t docker -p local7.info |
Contributor
There was a problem hiding this comment.
This! this is the line that's different! I found it!
Contributor
There was a problem hiding this comment.
can you put a comment somewhere in this file either at the top describing the changes or comments where the changes are?
Contributor
|
@und1sk0 - double check dock-init to ensure we aren't overwriting this file anymore, plz. |
Contributor
Author
|
@rsandor dock-init updates /etc/default/docker, different file. This updates the upstart config (/etc/init/docker.conf) |
Contributor
|
LGTM - does mean that we have to have a small (< 60 second, likely) downtime for the services that we have running in docker to update this... |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Dependancies
Server must be rebooted or docker-engine restarted.
Reviewers
Tests
Deployment (post-merge)