compose/loader: keep TCP+UDP when merging same published port - #7186
Open
locker95 wants to merge 1 commit into
Open
compose/loader: keep TCP+UDP when merging same published port#7186locker95 wants to merge 1 commit into
locker95 wants to merge 1 commit into
Conversation
Port merge keyed only on Published, so 443/tcp and 443/udp collapsed when combining compose files (e.g. stack config with an env-only override). Include protocol in the merge key. Fixes docker#6223 Signed-off-by: Dean Chen <862469039@qq.com>
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
1 participant
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.
docker stack config -c base.yml -c override.ymlwas dropping one of the twin entries when you publish the same host port as both TCP and UDP. Merge used only the published port as the map key, so the second protocol stomped the first even if the override didn't touchports.Key by
published/protocolinstead. Test covers 443/tcp + 443/udp surviving a no-op override merge.Fixes #6223