Skip to content

[WIP] Cherry picks 1.12.0 rc4#24467

Merged
tiborvass merged 105 commits intomoby:bump_v1.12.0from
tiborvass:cherry-picks-1.12.0-rc4
Jul 13, 2016
Merged

[WIP] Cherry picks 1.12.0 rc4#24467
tiborvass merged 105 commits intomoby:bump_v1.12.0from
tiborvass:cherry-picks-1.12.0-rc4

Conversation

@tiborvass
Copy link
Copy Markdown
Contributor

@tiborvass tiborvass commented Jul 8, 2016

Cherrypicks for rc4:

@GordonTheTurtle GordonTheTurtle added area/distribution Image Distribution platform/windows status/0-triage dco/no Automatically set by a bot when one of the commits lacks proper signature labels Jul 8, 2016
@tiborvass tiborvass force-pushed the cherry-picks-1.12.0-rc4 branch from c126211 to d8d1573 Compare July 8, 2016 22:31
@GordonTheTurtle GordonTheTurtle removed the dco/no Automatically set by a bot when one of the commits lacks proper signature label Jul 8, 2016
nicolaka and others added 24 commits July 8, 2016 15:31
Signed-off-by: Nico <[email protected]>
(cherry picked from commit 841f985)
Signed-off-by: Tibor Vass <[email protected]>
Signed-off-by: Vincent Demeester <[email protected]>
(cherry picked from commit 48744e0)
Signed-off-by: Tibor Vass <[email protected]>
For consistency with other filters (such as
"is-official"), this renames the desired_state
filter to "desired-state".

Signed-off-by: Sebastiaan van Stijn <[email protected]>
(cherry picked from commit d761719)
Signed-off-by: Tibor Vass <[email protected]>
… errors in cli docs

Signed-off-by: Charles Smith <[email protected]>
(cherry picked from commit f98f596)
Signed-off-by: Tibor Vass <[email protected]>
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 <[email protected]>
(cherry picked from commit 2bc2165)
Signed-off-by: Tibor Vass <[email protected]>
The --auto-accept documentation currently says that both worker and
manager nodes are automatically accepted by default. Correct it.

Signed-off-by: Aaron Lehmann <[email protected]>
(cherry picked from commit 9aed7d1)
Signed-off-by: Tibor Vass <[email protected]>
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 <[email protected]>
(cherry picked from commit 04c94a0)
Signed-off-by: Tibor Vass <[email protected]>
minor typos and punctuation.

Signed-off-by: Alan Thompson <[email protected]>
(cherry picked from commit 68b8cc9)
Signed-off-by: Tibor Vass <[email protected]>
the flag is named '--read-only', not '--readonly'

Signed-off-by: Sebastiaan van Stijn <[email protected]>
(cherry picked from commit ac12696)
Signed-off-by: Tibor Vass <[email protected]>
Signed-off-by: Bilal Amarni <[email protected]>
(cherry picked from commit 0244174)
Signed-off-by: Tibor Vass <[email protected]>
Signed-off-by: Adolfo Ochagavía <[email protected]>
(cherry picked from commit 76b09be)
Signed-off-by: Tibor Vass <[email protected]>
Signed-off-by: Antonio Murdaca <[email protected]>
(cherry picked from commit 585332d)
Signed-off-by: Tibor Vass <[email protected]>
…Updated to "--last"

Signed-off-by: Shoubhik Bose <[email protected]>
(cherry picked from commit 256edc2)
Signed-off-by: Tibor Vass <[email protected]>
Signed-off-by: Sebastiaan van Stijn <[email protected]>
(cherry picked from commit a268522)
Signed-off-by: Tibor Vass <[email protected]>
Signed-off-by: Otto Kekäläinen <[email protected]>
(cherry picked from commit 644a742)
Signed-off-by: Tibor Vass <[email protected]>
Signed-off-by: Steve Durrheimer <[email protected]>
(cherry picked from commit 0246987)
Signed-off-by: Tibor Vass <[email protected]>
Signed-off-by: Steve Durrheimer <[email protected]>
(cherry picked from commit 2086663)
Signed-off-by: Tibor Vass <[email protected]>
Signed-off-by: allencloud <[email protected]>
(cherry picked from commit 97c77b7)
Signed-off-by: Tibor Vass <[email protected]>
Signed-off-by: Lei Jitang <[email protected]>
(cherry picked from commit 8c17934)
Signed-off-by: Tibor Vass <[email protected]>
…untime'

Signed-off-by: Steve Durrheimer <[email protected]>
(cherry picked from commit a5c7eb6)
Signed-off-by: Tibor Vass <[email protected]>
Signed-off-by: Steve Durrheimer <[email protected]>
(cherry picked from commit f5d768e)
Signed-off-by: Tibor Vass <[email protected]>
(cherry picked from commit 88da491)

Signed-off-by: Tibor Vass <[email protected]>
schema1 manifests is not working on ARM64, we should skip integration-cli
tests for schema1 manifests on ARM64.

Signed-off-by: Lei Jitang <[email protected]>
(cherry picked from commit 9c1566a)
Signed-off-by: Tibor Vass <[email protected]>
Signed-off-by: Francis Chuang <[email protected]>
(cherry picked from commit 1205a55)
Signed-off-by: Tibor Vass <[email protected]>
allencloud and others added 24 commits July 12, 2016 15:43
Signed-off-by: allencloud <[email protected]>
(cherry picked from commit 416613f)
Signed-off-by: Tibor Vass <[email protected]>
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 <[email protected]>
(cherry picked from commit b32cfb3)
Signed-off-by: Tibor Vass <[email protected]>
…#22730

Signed-off-by: Mansi Nahar <[email protected]>
(cherry picked from commit 82d70f4)
Signed-off-by: Tibor Vass <[email protected]>
We use containerd and there is no execution driver anymore.

Addresses: moby#24461

Signed-off-by: Qiang Huang <[email protected]>
(cherry picked from commit 1fb1136)
Signed-off-by: Tibor Vass <[email protected]>
Signed-off-by: Anusha Ragunathan <[email protected]>
(cherry picked from commit 863ab9a)
Signed-off-by: Tibor Vass <[email protected]>
Signed-off-by: Tonis Tiigi <[email protected]>
(cherry picked from commit f02ec39)
Signed-off-by: Tibor Vass <[email protected]>
Signed-off-by: Dave Henderson <[email protected]>
(cherry picked from commit 9af24ba)
Signed-off-by: Tibor Vass <[email protected]>
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 <[email protected]>
(cherry picked from commit 2c9b5ad)
Signed-off-by: Tibor Vass <[email protected]>
This fix fixes a minor typo in swarm tutorial's delete service docs.

Signed-off-by: Yong Tang <[email protected]>
(cherry picked from commit 93fa7e7)
Signed-off-by: Tibor Vass <[email protected]>
Signed-off-by: John Harris <[email protected]>

(cherry picked from commit 8e14882)
Signed-off-by: Tibor Vass <[email protected]>
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 <[email protected]>
(cherry picked from commit a12ab28)
Signed-off-by: Tibor Vass <[email protected]>
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 <[email protected]> (github: dmcgowan)
(cherry picked from commit ff98da0)
Signed-off-by: Tibor Vass <[email protected]>
Signed-off-by: Ralf Sippl <[email protected]>
(cherry picked from commit c8e4e95)
Signed-off-by: Tibor Vass <[email protected]>
Signed-off-by: Ralf Sippl <[email protected]>
(cherry picked from commit 65e7213)
Signed-off-by: Tibor Vass <[email protected]>
Signed-off-by: Charles Smith <[email protected]>
(cherry picked from commit 9ae64de)
Signed-off-by: Tibor Vass <[email protected]>
Signed-off-by: Alexander Morozov <[email protected]>
(cherry picked from commit ae4137a)
Signed-off-by: Tibor Vass <[email protected]>
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 <[email protected]>
(cherry picked from commit 0651775)
Signed-off-by: Tibor Vass <[email protected]>
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 <[email protected]>
(cherry picked from commit 0e7a107)
Signed-off-by: Tibor Vass <[email protected]>
Signed-off-by: Madhu Venugopal <[email protected]>
(cherry picked from commit 92c40f9)
Signed-off-by: Tibor Vass <[email protected]>
fixes moby#24400

Signed-off-by: Madhu Venugopal <[email protected]>
(cherry picked from commit a4926a4)
Signed-off-by: Tibor Vass <[email protected]>
Signed-off-by: Brian Goff <[email protected]>
(cherry picked from commit 5f7b1b6)
Signed-off-by: Tibor Vass <[email protected]>
Signed-off-by: Brian Goff <[email protected]>
(cherry picked from commit 7dff310)
Signed-off-by: Tibor Vass <[email protected]>
Flatten the list of `docker run` flags and group them loosely by
category (general purpose, security, networking, ...).

Signed-off-by: Arnaud Porterie (icecrime) <[email protected]>
(cherry picked from commit 5b21c8a)
Signed-off-by: Tibor Vass <[email protected]>
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) <[email protected]>
(cherry picked from commit c0c7d5e)
Signed-off-by: Tibor Vass <[email protected]>
The original sed placement was creating packages with an
"unsupported" tag in the package name.

Fixes moby#24197

Signed-off-by: Christy Perez <[email protected]>
(cherry picked from commit dab2878)
Signed-off-by: Tibor Vass <[email protected]>
@tiborvass
Copy link
Copy Markdown
Contributor Author

LGTM waiting for CI

@tiborvass tiborvass merged commit e4c35bd into moby:bump_v1.12.0 Jul 13, 2016
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.