[WIP] Cherry picks 1.12.0 rc4 #24467
Merged
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
GordonTheTurtle
added
area/distribution
platform/windows
status/0-triage
dco/no
tiborvass
force-pushed
the
cherry-picks-1.12.0-rc4
branch
from
c126211
to
d8d1573
Compare
GordonTheTurtle
removed
the
dco/no
Signed-off-by: Nico <nicolaka@gmail.com> (cherry picked from commit 841f985) Signed-off-by: Tibor Vass <tibor@docker.com>
Signed-off-by: Vincent Demeester <vincent@sbr.pm> (cherry picked from commit 48744e0) Signed-off-by: Tibor Vass <tibor@docker.com>
For consistency with other filters (such as "is-official"), this renames the desired_state filter to "desired-state". Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit d761719) Signed-off-by: Tibor Vass <tibor@docker.com>
… errors in cli docs Signed-off-by: Charles Smith <charles.smith@docker.com> (cherry picked from commit f98f596) Signed-off-by: Tibor Vass <tibor@docker.com>
Swarm was putting volume type mounts into the container config's "Volumes" field, but really these need to go into "Binds". "Volumes" is only for normal "-v /foo" volumes, not named volumes or anything else. Signed-off-by: Brian Goff <cpuguy83@gmail.com> (cherry picked from commit 2bc2165) Signed-off-by: Tibor Vass <tibor@docker.com>
The --auto-accept documentation currently says that both worker and manager nodes are automatically accepted by default. Correct it. Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com> (cherry picked from commit 9aed7d1) Signed-off-by: Tibor Vass <tibor@docker.com>
lowercase the output, to prevent "About" halfway, and add "ago" to the output, as timestamps are always in the past. Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 04c94a0) Signed-off-by: Tibor Vass <tibor@docker.com>
minor typos and punctuation. Signed-off-by: Alan Thompson <cloojure@gmail.com> (cherry picked from commit 68b8cc9) Signed-off-by: Tibor Vass <tibor@docker.com>
the flag is named '--read-only', not '--readonly' Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit ac12696) Signed-off-by: Tibor Vass <tibor@docker.com>
Signed-off-by: Bilal Amarni <bilal.amarni@gmail.com> (cherry picked from commit 0244174) Signed-off-by: Tibor Vass <tibor@docker.com>
Signed-off-by: Antonio Murdaca <runcom@redhat.com> (cherry picked from commit 585332d) Signed-off-by: Tibor Vass <tibor@docker.com>
…Updated to "--last" Signed-off-by: Shoubhik Bose <sbose78@gmail.com> (cherry picked from commit 256edc2) Signed-off-by: Tibor Vass <tibor@docker.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit a268522) Signed-off-by: Tibor Vass <tibor@docker.com>
Signed-off-by: Otto Kekäläinen <otto@seravo.fi> (cherry picked from commit 644a742) Signed-off-by: Tibor Vass <tibor@docker.com>
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com> (cherry picked from commit 0246987) Signed-off-by: Tibor Vass <tibor@docker.com>
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com> (cherry picked from commit 2086663) Signed-off-by: Tibor Vass <tibor@docker.com>
Signed-off-by: allencloud <allen.sun@daocloud.io> (cherry picked from commit 97c77b7) Signed-off-by: Tibor Vass <tibor@docker.com>
Signed-off-by: Lei Jitang <leijitang@huawei.com> (cherry picked from commit 8c17934) Signed-off-by: Tibor Vass <tibor@docker.com>
…untime' Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com> (cherry picked from commit a5c7eb6) Signed-off-by: Tibor Vass <tibor@docker.com>
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com> (cherry picked from commit f5d768e) Signed-off-by: Tibor Vass <tibor@docker.com>
(cherry picked from commit 88da491) Signed-off-by: Tibor Vass <tibor@docker.com>
schema1 manifests is not working on ARM64, we should skip integration-cli tests for schema1 manifests on ARM64. Signed-off-by: Lei Jitang <leijitang@huawei.com> (cherry picked from commit 9c1566a) Signed-off-by: Tibor Vass <tibor@docker.com>
Signed-off-by: Francis Chuang <francis.chuang@boostport.com> (cherry picked from commit 1205a55) Signed-off-by: Tibor Vass <tibor@docker.com>
Signed-off-by: allencloud <allen.sun@daocloud.io> (cherry picked from commit 416613f) Signed-off-by: Tibor Vass <tibor@docker.com>
For any operation that involves netwoks (other than network create), swarmkit expects the target as network-id. Service upate was using network-name as the target and that caused the issue. Signed-off-by: Madhu Venugopal <madhu@docker.com> (cherry picked from commit b32cfb3) Signed-off-by: Tibor Vass <tibor@docker.com>
We use containerd and there is no execution driver anymore. Addresses: moby#24461 Signed-off-by: Qiang Huang <h.huangqiang@huawei.com> (cherry picked from commit 1fb1136) Signed-off-by: Tibor Vass <tibor@docker.com>
Signed-off-by: Anusha Ragunathan <anusha@docker.com> (cherry picked from commit 863ab9a) Signed-off-by: Tibor Vass <tibor@docker.com>
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com> (cherry picked from commit f02ec39) Signed-off-by: Tibor Vass <tibor@docker.com>
Signed-off-by: Dave Henderson <dhenderson@gmail.com> (cherry picked from commit 9af24ba) Signed-off-by: Tibor Vass <tibor@docker.com>
The `--pid` flag was added in Docker 1.5.0, but the API changes were not documented. In Docker 1.12.0, `--pid=container:<name|id>` was added as an additional option, but also undocumented. This adds the missing API documentation for this option. Also see commits 47e3da8 (for 1.5.0), and ebeb5a0 (for 1.12.0). Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 2c9b5ad) Signed-off-by: Tibor Vass <tibor@docker.com>
This fix fixes a minor typo in swarm tutorial's delete service docs. Signed-off-by: Yong Tang <yong.tang.github@outlook.com> (cherry picked from commit 93fa7e7) Signed-off-by: Tibor Vass <tibor@docker.com>
Signed-off-by: John Harris <john@johnharris.io> (cherry picked from commit 8e14882) Signed-off-by: Tibor Vass <tibor@docker.com>
If the remote registry responds with a NAME_UNKNOWN error, treat this as a fatal error and don't retry the push. Tested against an ECR registry. Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com> (cherry picked from commit a12ab28) Signed-off-by: Tibor Vass <tibor@docker.com>
Add option to skip kernel check for older kernels which have been patched to support multiple lower directories in overlayfs. Fixes moby#24023 Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan) (cherry picked from commit ff98da0) Signed-off-by: Tibor Vass <tibor@docker.com>
Signed-off-by: Ralf Sippl <ralf.sippl@gmail.com> (cherry picked from commit c8e4e95) Signed-off-by: Tibor Vass <tibor@docker.com>
Signed-off-by: Ralf Sippl <ralf.sippl@gmail.com> (cherry picked from commit 65e7213) Signed-off-by: Tibor Vass <tibor@docker.com>
Signed-off-by: Charles Smith <charles.smith@docker.com> (cherry picked from commit 9ae64de) Signed-off-by: Tibor Vass <tibor@docker.com>
Signed-off-by: Alexander Morozov <lk4d4@docker.com> (cherry picked from commit ae4137a) Signed-off-by: Tibor Vass <tibor@docker.com>
The "none" option was not added to the documentation. This adds an example, and adds additional information on manually accepting or rejecting a node. Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 0651775) Signed-off-by: Tibor Vass <tibor@docker.com>
Looks like there's issues with sourceforge project pages. Given that sourceforge isn't really what it used to be, trying to find alternative URLs where possible. Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 0e7a107) Signed-off-by: Tibor Vass <tibor@docker.com>
Signed-off-by: Madhu Venugopal <madhu@docker.com> (cherry picked from commit 92c40f9) Signed-off-by: Tibor Vass <tibor@docker.com>
fixes moby#24400 Signed-off-by: Madhu Venugopal <madhu@docker.com> (cherry picked from commit a4926a4) Signed-off-by: Tibor Vass <tibor@docker.com>
Signed-off-by: Brian Goff <cpuguy83@gmail.com> (cherry picked from commit 5f7b1b6) Signed-off-by: Tibor Vass <tibor@docker.com>
Signed-off-by: Brian Goff <cpuguy83@gmail.com> (cherry picked from commit 7dff310) Signed-off-by: Tibor Vass <tibor@docker.com>
Flatten the list of `docker run` flags and group them loosely by category (general purpose, security, networking, ...). Signed-off-by: Arnaud Porterie (icecrime) <arnaud.porterie@docker.com> (cherry picked from commit 5b21c8a) Signed-off-by: Tibor Vass <tibor@docker.com>
Add a `--network` flag which replaces `--net` without deprecating it yet. The `--net` flag remains hidden and supported. Add a `--network-alias` flag which replaces `--net-alias` without deprecating it yet. The `--net-alias` flag remains hidden and supported. Signed-off-by: Arnaud Porterie (icecrime) <arnaud.porterie@docker.com> (cherry picked from commit c0c7d5e) Signed-off-by: Tibor Vass <tibor@docker.com>
The original sed placement was creating packages with an "unsupported" tag in the package name. Fixes moby#24197 Signed-off-by: Christy Perez <christy@linux.vnet.ibm.com> (cherry picked from commit dab2878) Signed-off-by: Tibor Vass <tibor@docker.com>
|
LGTM waiting for CI |
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.
Cherrypicks for rc4:
docker node lsdocker service --helptext for--endpoint-modemore consistentdocker network create -d bridge testworks if there is already an overlay network named test? #23983psindocker topdocker {service,node}filtersdocker swarm {init,join}docker info--netto--network