1.13.1 rc1 cherrypicks #30331
Merged
1.13.1 rc1 cherrypicks #30331
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
… --filter' Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com> (cherry picked from commit 784ebcc) Signed-off-by: Victor Vieux <vieux@docker.com>
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com> (cherry picked from commit ee2ce82) Signed-off-by: Victor Vieux <vieux@docker.com>
Fixes moby#30263 Signed-off-by: Harald Albers <github@albersweb.de> (cherry picked from commit 2076261) Signed-off-by: Victor Vieux <vieux@docker.com>
Signed-off-by: Harald Albers <github@albersweb.de> (cherry picked from commit e91dbba) Signed-off-by: Victor Vieux <vieux@docker.com>
Signed-off-by: Harald Albers <github@albersweb.de> (cherry picked from commit aa006f1) Signed-off-by: Victor Vieux <vieux@docker.com>
Signed-off-by: Harald Albers <github@albersweb.de> (cherry picked from commit 12952f5) Signed-off-by: Victor Vieux <vieux@docker.com>
|
ping @albers @sdurrheimer if there's changes missing 😄 |
|
And I think I have one or two more things to add. |
Signed-off-by: Harald Albers <github@albersweb.de> (cherry picked from commit 07bd515) Signed-off-by: Victor Vieux <vieux@docker.com>
Signed-off-by: Harald Albers <github@albersweb.de> (cherry picked from commit f93da79) Signed-off-by: Victor Vieux <vieux@docker.com>
Signed-off-by: Harald Albers <github@albersweb.de> (cherry picked from commit a39a2bb) Signed-off-by: Victor Vieux <vieux@docker.com>
Signed-off-by: Harald Albers <github@albersweb.de> (cherry picked from commit 01ac33c) Signed-off-by: Victor Vieux <vieux@docker.com>
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com> (cherry picked from commit 455b7bc) Signed-off-by: Victor Vieux <vieux@docker.com>
Signed-off-by: Harald Albers <github@albersweb.de> (cherry picked from commit 725a864) Signed-off-by: Victor Vieux <vieux@docker.com>
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com> (cherry picked from commit cdf5778) Signed-off-by: Victor Vieux <vieux@docker.com>
When Size was reverted to be equal to VirtualSize, the df command formatter was not correctly updated to account for the change. Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com> (cherry picked from commit dcc1b4b) Signed-off-by: Victor Vieux <vieux@docker.com>
Signed-off-by: Harald Albers <github@albersweb.de> (cherry picked from commit d049ef2) Signed-off-by: Victor Vieux <vieux@docker.com>
Signed-off-by: Harald Albers <github@albersweb.de> (cherry picked from commit 182048f) Signed-off-by: Victor Vieux <vieux@docker.com>
As noted by moby#30083, the new strict checking of mediatypes misses some cases where earlier bugs caused nonstandard mediatypes to be stored in manifests. Two of the known cases are text/html and application/json, which were returned by certain registries and stored by earlier versions of Docker. Add special cases for text/html and application/json. Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com> (cherry picked from commit a215e15) Signed-off-by: Victor Vieux <vieux@docker.com>
Instead of a timeout the context is cancelled on error to ensure proper cleanup of the associated fifos' goroutines. Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com> (cherry picked from commit c178700) Signed-off-by: Victor Vieux <vieux@docker.com>
The top-level `docker inspect` command could return an error if the nodes Swarm certificates were expired. In situations where the user did not explicitly ask for an object-type (`--type=foo`), we should ignore these errors, and consider them equal to "node is not a swarm manager". This change makes `docker inspect` ignore these errors if no type was specified. As a further optimization, the "swarm status" result is now stored in a variable, so that other swarm-specific API calls can be skipped. Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 66cf4cc) Signed-off-by: Victor Vieux <vieux@docker.com>
krallin/tini#55 (comment) krallin/tini#55 (comment) moby#28037 Signed-off-by: Elan Ruusamäe <glen@delfi.ee> (cherry picked from commit d7df731) Signed-off-by: Victor Vieux <vieux@docker.com>
c54b717 caused a regression for pluginv1 on Windows, where extraneous backslashes were added to BasePath of the plugin. For pluginv1 on windows, BasePath() should return an empty string, since the plugin is fully aware of the mount path. Also, unlike Linux where all paths are relative to "/", Windows paths are dependent on system drives and mapped drives. Fixes moby#30148 Signed-off-by: Anusha Ragunathan <anusha.ragunathan@docker.com> (cherry picked from commit 0ef21eb) Signed-off-by: Victor Vieux <vieux@docker.com>
Signed-off-by: Harald Albers <github@albersweb.de> (cherry picked from commit 550947e) Signed-off-by: Victor Vieux <vieux@docker.com>
Signed-off-by: Tibor Vass <tibor@docker.com> (cherry picked from commit 5f713ce) Signed-off-by: Victor Vieux <vieux@docker.com>
Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com> (cherry picked from commit 20e2437) Signed-off-by: Victor Vieux <vieux@docker.com>
go 1.7.4 introduced official go ppc64le binaries, so use those instead of using older versions of go and building from src. Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com> (cherry picked from commit 62ab680) Signed-off-by: Victor Vieux <vieux@docker.com>
Signed-off-by: John Howard <jhoward@microsoft.com> (cherry picked from commit 8a45eea) Signed-off-by: Victor Vieux <vieux@docker.com>
Signed-off-by: Victor Vieux <vieux@docker.com>
Signed-off-by: Darren Stahl <darst@microsoft.com> (cherry picked from commit b2a7f6a) Signed-off-by: Victor Vieux <vieux@docker.com>
…names This fix tries to address the issue raised in 30242 where the `Scope` field always changed to `swarm` in the ouput of `docker network ls/inspect` when duplicate networks name exist. The reason for the issue was that `buildNetworkResource()` use network name (which may not be unique) to check for the scope. This fix fixes the issue by always use network ID in `buildNetworkResource()`. A test has been added. The test fails before the fix and passes after the fix. This fix fixes 30242. Signed-off-by: Yong Tang <yong.tang.github@outlook.com> (cherry picked from commit 05a831a) Signed-off-by: Victor Vieux <vieux@docker.com>
This patch adds a "src" alias for `--secret` to be consistent with `--mount`. Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 950658b) Signed-off-by: Victor Vieux <vieux@docker.com>
Using source, the following error is made: invalid field in secret request: src Signed-off-by: Michael Irwin <mikesir87@gmail.com> (cherry picked from commit 9250117) Signed-off-by: Victor Vieux <vieux@docker.com>
- When the node leaves the cluster, if any user run container(s) is connected to the swarm network, then daemon needs to detach the container(s) and remove the network. Signed-off-by: Alessandro Boch <aboch@docker.com> (cherry picked from commit 3cedca5) Signed-off-by: Victor Vieux <vieux@docker.com>
vieux
force-pushed
the
1.13.1-rc1-cherrypicks
branch
from
6f3c1b3
to
a64c935
Compare
|
#30489 will also need to be cherry picked after the merge. |
|
LGTM |
|
@unclejack yes I'll take care of it after |
|
unrelated windows test error. |
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.
Add zsh completion for 'docker {container,image,network,system} prune --filter #30317
Add zsh completion for 'docker swarm --availability' #30282
Add bash completion for
dockerd --initanddocker run|create --init#30266Add bash completion for
build --squash#30200Honour $DOCKER_HIDE_LEGACY_COMMANDS in bash completion #30132
Fix treatment of DOCKER_HIDE_LEGACY_COMMANDS in bash completion #30163
Add bash completion for
docker swarm unlock|unlock-key#30399Add missing options to bash completion for
docker swarm init|update#30398Add bash completion for
docker service ps --filter node#30375Fix bash completion for
docker service update#30373Add zsh completion for 'docker plugin install --alias' #30268
Add bash completion for
plugin install --disable-content-trust#30125Add zsh completion for 'dockerd --init' and 'docker {create,run} --init' #30318
Ensure proper value is used when computing reclaimable space #30378
Add bash completion and docs for
docker run|create --init-path#30283distribution: Add text/html and application/json as image mediatypes #30262
Remove timeout on fifos opening #30140
Ignore certificate expiry error for top-level inspect #29246
Fix pluginv1 Windows volumes #30150
Only show global warnings once #28939
do not create init-dir if not needed #29846
Fix deadlock on v1 plugin with activate error #30408
Fix failure in
docker ps --formatwhen.Labelhas args #30291Fix bash completion for completing nodes #30376
plugins: add example docs for a rexray plugin #30294
[project] bump go to go 1.7.4 #29142
[ppc64le] use official go 1.7.4 binaries #29256
Windows: Bump to latest version of git #29159
Windows: Add service dependency ConDrv #30111
Fix incorrect
Scopeinnetwork ls/inspectwith duplicate network names #30250Add "src" alias for
--secret#30407Fixed secret creation usage during service create in docs #30370
Remove attachable network on swarm leave #30157