[19.03 backport] Fix advanced options for backward compatibility#1967
Merged
andrewhsu merged 1 commit intodocker:19.03from Jun 25, 2019
Conversation
Member
Author
|
marking 'WIP' because the backported PR isn't merged yet |
Codecov Report
@@ Coverage Diff @@
## 19.03 #1967 +/- ##
=========================================
+ Coverage 56.7% 56.71% +<.01%
=========================================
Files 310 310
Lines 21786 21789 +3
=========================================
+ Hits 12354 12357 +3
Misses 8519 8519
Partials 913 913 |
For backward compatibility: if no custom options are provided for the network, and only a single network is specified, omit the endpoint-configuration on the client (the daemon will still create it when creating the container) This fixes an issue on older versions of legacy Swarm, which did not support `NetworkingConfig.EndpointConfig`. This was introduced in 5bc0963 (docker#1767) Signed-off-by: Sebastiaan van Stijn <[email protected]> (cherry picked from commit 4d7e6bf) Signed-off-by: Sebastiaan van Stijn <[email protected]>
thaJeztah
force-pushed
the
19.03_backport_fix_advanced_options_for_backward_compat
branch
from
e13d238 to
3bc3f03
Compare
thaJeztah
changed the title
thaJeztah
deleted the
19.03_backport_fix_advanced_options_for_backward_compat
branch
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
5 participants
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.
backport of #1963 for 19.03
For backward compatibility: if no custom options are provided for the network,
and only a single network is specified, omit the endpoint-configuration
on the client (the daemon will still create it when creating the container)
This fixes an issue on older versions of legacy Swarm, which did not support
NetworkingConfig.EndpointConfig.This was introduced in 5bc0963 (#1767)
fixes #1854