Skip to content

Conversation

@thaJeztah
Copy link
Member

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

@thaJeztah thaJeztah added this to the 19.03.0 milestone Jun 24, 2019
@thaJeztah
Copy link
Member Author

marking 'WIP' because the backported PR isn't merged yet

@codecov-io
Copy link

Codecov Report

Merging #1967 into 19.03 will increase coverage by <.01%.
The diff coverage is 100%.

@@            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 thaJeztah force-pushed the 19.03_backport_fix_advanced_options_for_backward_compat branch from e13d238 to 3bc3f03 Compare June 24, 2019 21:18
@thaJeztah thaJeztah changed the title [WIP][19.03 backport] Fix advanced options for backward compatibility [19.03 backport] Fix advanced options for backward compatibility Jun 25, 2019
Copy link
Contributor

@andrewhsu andrewhsu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Copy link
Contributor

@kolyshkin kolyshkin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@andrewhsu andrewhsu merged commit 2f1931f into docker:19.03 Jun 25, 2019
@thaJeztah thaJeztah deleted the 19.03_backport_fix_advanced_options_for_backward_compat branch June 25, 2019 19:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants