[25.0 backport] docker stack: allow '=' separator in extra_hosts #4910
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
extra_hosts in the compose file format allows '=' as a separator, and brackets around IP addresses, the engine API doesn't. So, transform the values when reading a compose file for 'docker stack'. Signed-off-by: Rob Murray <rob.murray@docker.com> (cherry picked from commit c986d09) Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
Codecov Report
Additional details and impacted files@@ Coverage Diff @@
## 25.0 #4910 +/- ##
==========================================
+ Coverage 61.32% 61.35% +0.02%
==========================================
Files 287 287
Lines 20071 20088 +17
==========================================
+ Hits 12309 12324 +15
- Misses 6869 6870 +1
- Partials 893 894 +1 |
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 I did
The compose file format allows
=as a separator in extra hosts, anddocker compose configuses it instead of:.Accept either separator in
docker stack deploy, converting to:for the engine's API.Also, remove brackets from IP addresses, as they're allowed by the compose file (although not generated by
docker compose config).Fixes #4859
- How I did it
Similar to changes in the CLI's
--add-hosts, buildx and compose - check for an=separator first, then try:, and strip the brackets.- How to verify it
As described in #4859 - plus updated unit tests.
- Description for the changelog
Accept '=' separators and '[ipv6]' in compose files for 'docker stack deploy'.