dockerng: compare sets instead of lists of security_opt #39483
Closed
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
Apparently some versions of docker add label=disabled to security_opt when the container is launched as privileged. This causes Salt to relaunch the container to remove it on next run. Container started as privileged and with the security_opt set, causes it to have the option set twice and makes salt want to remove one instance. With this fix, dockerng will compare just (non-)existence of the flag. So containers started with privileged flag and security_opt set to label=disabled will not get relaunched on every salt run. Fixes saltstack#39447
|
@Foxlik Thanks for this fix! I cherry-picked your fix on top of the 2016.3 release branch so that we can merge it forward and the fix will not need to be backported to earlier release branches. You can read more about our merge-forward workflow here. Resubmitting this fix against 2016.3 also ensures that there will be no conflicts with a PR I opened to deprecate the old (pre-dockerng) docker modules (#39474). Thanks again! I'm going to go ahead and close this in favor of #39498. |
|
thanks for getting it in Erik! ;-) |
terminalmage
pushed a commit
that referenced
this pull request
Feb 20, 2017
Resubmit PR #39483 against 2016.3 branch
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.
What does this PR do?
Apparently some versions of docker add label=disabled to security_opt when the container is launched as privileged. This causes Salt to relaunch the container to remove it on next run.
Container started as privileged and with the security_opt set, causes it to have the option set twice and makes salt want to remove one instance. With this fix, dockerng will compare just (non-)existence of the flag. So containers started with privileged flag and security_opt set to label=disabled will not get relaunched on every salt run.
What issues does this PR fix or reference?
Fixes #39447
Previous Behavior
security_opt lists were compared as sorted lists. Having one option multiple times being seen as a difference
New Behavior
security_opt lists are compared as sorted sets, effectively just comparing (non-)existence of the flag regardless of count.
Tests written?
No