Skip to content
This repository was archived by the owner on Oct 13, 2023. It is now read-only.

Conversation

@andrewhsu
Copy link
Contributor

All cherry-picks went in clean, no conflicts.

docker/cli#610 Update bash completion and deprecation for synchronous service updates

$ git cherry-pick -s -x -Xsubtree=components/cli 60bfaba 20d9cec
[d f26232e8f6] Update bash completion for synchronous `docker service` commands
 Author: Harald Albers <github@albersweb.de>
 Date: Sat Oct 7 13:57:26 2017 +0200
 1 file changed, 3 insertions(+), 3 deletions(-)
[d 6fc2c6b8c5] Update deprecation for synchronous service updates
 Author: Harald Albers <github@albersweb.de>
 Date: Sat Oct 7 14:28:56 2017 +0200
 1 file changed, 5 insertions(+), 2 deletions(-)

docker/cli#611 Add bash completion for stack deploy --resolve-image

$ git cherry-pick -s -x -Xsubtree=components/cli 9559b9b
[d b0596beda5] Add bash completion for `stack deploy --resolve-image`
 Author: Harald Albers <github@albersweb.de>
 Date: Mon Oct 9 13:29:17 2017 +0200
 2 files changed, 8 insertions(+), 2 deletions(-)

docker/cli#618 Add bash completion for secret create --driver

$ git cherry-pick -s -x -Xsubtree=components/cli 1d7a31f
[d 550052ebae] Add bash completion for `secret create --driver`
 Author: Harald Albers <github@albersweb.de>
 Date: Wed Oct 11 18:55:28 2017 +0200
 1 file changed, 3 insertions(+), 3 deletions(-)

docker/cli#580 Update rmi.md

$ git cherry-pick -s -x -Xsubtree=components/cli 9004495
[d 8b13940b3b] Update rmi.md
 Author: djgoosen <djgoosen@users.noreply.github.com>
 Date: Sun Oct 1 21:36:13 2017 -0700
 1 file changed, 1 insertion(+), 1 deletion(-)

docker/cli#598 Fix dockerd reference heading levels

$ git cherry-pick -s -x -Xsubtree=components/cli aca0421
[d 792e8f9a82] Fix dockerd reference heading levels
 Author: Sebastiaan van Stijn <github@gone.nl>
 Date: Wed Oct 4 18:09:12 2017 +0200
 1 file changed, 10 insertions(+), 10 deletions(-)

docker/cli#603 Fix markdown link in service-create reference docs

$ git cherry-pick -s -x -Xsubtree=components/cli 6b6511f
[d e7f51b183f] Fix markdown link in service-create reference docs
 Author: Sebastiaan van Stijn <github@gone.nl>
 Date: Thu Oct 5 12:17:40 2017 +0200
 1 file changed, 3 insertions(+), 2 deletions(-)

albers and others added 7 commits October 11, 2017 15:26
The default value for
`docker service create|update|scale|rollback --detach|-d` changed from
`true` to `false`.
This updates bash completion to complete just `--detach|-d`.

Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit 60bfaba6fbf33b14ce1ae59fda396fe57dbfdc7c)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
- The default was not changed in 17.09 but will be in 17.10
- `service scale` and `service rollback` are also affected.

Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit 20d9ceca7859269778851c27b6b0aadd02a325a1)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Also adds minimal documentation for this flag.

Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit 9559b9b7a8707b4c83d53bdb5b5a7cbe00b241c0)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit 1d7a31f87e8c85ef6ef0a3d9987e308cf35e4841)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Signed-off-by: Daniel Goosen <daniel.goosen@surveysampling.com>
(cherry picked from commit 9004495541cfa99a2850a60fccb990a054fe6df4)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Commit ddadd3db494ce568a6b847932677f837802ea6b5 changed
the heading levels of various sections, but as a result,
the "daemon configuration file" section (and other sections)
changed from a H2 to a H4, therefore no longer showing
up in the page's TOC / navigation bar.

This patch changes the heading level to a H3 for
sections that should show up in the page navigation.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit aca0421eb8ed55534d0083739d7deefbb25f6130)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Markdown nested in a HTML table doesn't work, so changing
the link to a plain HTML link.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 6b6511f1914199d868e5a7c1591b14a52ba4842a)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
@andrewhsu andrewhsu added this to the 17.10.0 milestone Oct 11, 2017
@andrewhsu
Copy link
Contributor Author

cc @albers

Copy link
Member

@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thank you!

@andrewhsu andrewhsu merged commit 1311aaf into docker-archive:17.10 Oct 11, 2017
@andrewhsu andrewhsu deleted the d branch October 11, 2017 23:10
silvin-lubecki pushed a commit to silvin-lubecki/docker-ce that referenced this pull request Jan 29, 2020
[17.10] backport doc fixes and shell completion script fixes
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants