Properly handle containers which pre-date the resolv.conf update feature #10018
Conversation
This file contains 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
| // if the user has modified the resolv.conf since container start time, safer | ||
| // to just never update the container's resolv.conf during it's lifetime which | ||
| // we can control by setting hashBytes to an empty string | ||
| hashBytes = []byte("") |
|
LGTM |
|
@estesp Thanks, also I think worth to mention this in docs about this feature. Just to have place where to point when there will be issue about this :) |
| // to just never update the container's resolv.conf during it's lifetime which | ||
| // we can control by setting hashBytes to an empty string | ||
| hashBytes = []byte("") | ||
| } else { |
There was a problem hiding this comment.
As usual I don't like else :) You can reverse condition and get rid of it.
This fixes the container start issue for containers which were started on a daemon prior to the resolv.conf updater PR. The update code will now safely ignore these containers (given they don't have a sha256 hash to compare against) and will not attempt to update the resolv.conf through their lifetime. Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
estesp
force-pushed
the
resolvconf-updater-bugfix
branch
from
3c750bc
to
30eff27
Compare
|
@LK4D4 forgot to add a comment last night after submitting a note to the docs and making the re-order to get rid of |
|
@estesp Thank you! |
LK4D4
added a commit
that referenced
this pull request
Jan 11, 2015
Properly handle containers which pre-date the resolv.conf update feature
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.
This fixes the container start issue for containers which were started
on a daemon prior to the resolv.conf updater PR. The update code will
now safely ignore these containers (given they don't have a sha256 hash
to compare against) and will not attempt to update the resolv.conf
through their lifetime.
Docker-DCO-1.1-Signed-off-by: Phil Estes estesp@linux.vnet.ibm.com (github: estesp)