This repository has been archived by the owner on Oct 13, 2023. It is now read-only.
[18.03] backport Fix error with merge composefile with networks… #495
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
arf, we need to backport docker/cli#955 |
Signed-off-by: Vincent Demeester <vincent@sbr.pm> (cherry picked from commit 2ee9635b1e7163aaea285a2f58033575f8b0e4ed) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
… and other cases too. Updating mergo fixes the bugs (but introduced a slight behaviour change that had to be fixed too) Signed-off-by: Vincent Demeester <vincent@sbr.pm> (cherry picked from commit 0122730faf7136feb020078058537382fcc8413e) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
thaJeztah
force-pushed
the
18.03-backport-972-fix-merge-network
branch
from
14ab1bb
to
d6931c2
Compare
|
ping @andrewhsu this is green 👍 |
silvin-lubecki
pushed a commit
to silvin-lubecki/docker-ce
that referenced
this pull request
Jan 24, 2020
…72-fix-merge-network [18.03] backport Fix error with merge composefile with networks…
docker-jenkins
pushed a commit
that referenced
this pull request
May 15, 2020
full diff: gorilla/mux@v1.7.3...v1.7.4 v1.7.4 addresses a number of performance improvements, bugs, and documentation improvements. - Reduce allocations in (*routeRegexp).getURLQuery - Fixed golint warnings - fix headers regexp test case - Fix the CORSMethodMiddleware bug with subrouters - Remove/cleanup request context helpers - Guess the scheme if r.URL.Scheme is unset - Added capacity to slice creation, when capacity is known - Modified http status codes, using constants provided by the http package - bugfix/subrouter custom methodNotAllowed handler returning 404 - Update README (self-host logo) - Remove TravisCI badge - Add documentation for using mux to serve a SPA - Simplify code - Avoid unnecessary conversion - Update config.yml (#495) @elithrar Signed-off-by: Sebastiaan van Stijn <github@gone.nl> Upstream-commit: 5fd3496e7a96440bc1b08d16cc36f306b6e43665 Component: engine
docker-jenkins
pushed a commit
that referenced
this pull request
Jun 25, 2020
full diff: gorilla/mux@v1.7.3...v1.7.4 v1.7.4 addresses a number of performance improvements, bugs, and documentation improvements. - Reduce allocations in (*routeRegexp).getURLQuery - Fixed golint warnings - fix headers regexp test case - Fix the CORSMethodMiddleware bug with subrouters - Remove/cleanup request context helpers - Guess the scheme if r.URL.Scheme is unset - Added capacity to slice creation, when capacity is known - Modified http status codes, using constants provided by the http package - bugfix/subrouter custom methodNotAllowed handler returning 404 - Update README (self-host logo) - Remove TravisCI badge - Add documentation for using mux to serve a SPA - Simplify code - Avoid unnecessary conversion - Update config.yml (#495) @elithrar Signed-off-by: Sebastiaan van Stijn <github@gone.nl> Upstream-commit: e64d6d9ed75f25b519b9e68ca97ea8175543100d Component: cli
docker-jenkins
pushed a commit
that referenced
this pull request
Aug 24, 2020
[master] plugins: update buildx to v0.4.2 Upstream-commit: 26b8ce6 Component: packaging
akrasnov-drv
pushed a commit
to drivenets/docker-ce
that referenced
this pull request
Apr 23, 2023
[master] plugins: update buildx to v0.4.2
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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 docker/cli#981 and docker/cli#983 for 18.03
no conflicts