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

Conversation

@thaJeztah
Copy link
Member

@thaJeztah thaJeztah commented Dec 15, 2017

Cherry-picks for 17.12 of:

git checkout -b 17.12-backport-docs-and-completion upstream/17.12  
git cherry-pick -s -S -x -Xsubtree=components/cli 43217d733205b0694f791e7326bfed6d13b645f0
git cherry-pick -s -S -x -Xsubtree=components/cli db05d8ad79e34e8096f31585fe9ffe0ce18f98d8
git cherry-pick -s -S -x -Xsubtree=components/cli 8ec80eec672b93be03843412f195fae477e81c4a
git cherry-pick -s -S -x -Xsubtree=components/cli a2d0b6e122021cfac87a99a46d3d02339552d281

no conflicts

ping @MistyHacks @andrewhsu PTAL

thaJeztah and others added 2 commits December 14, 2017 20:27
Commit ddadd3db494ce568a6b847932677f837802ea6b5 refactored
the markdown documentation, but accidentally changed
`on-failure` to `failure`.

This patch corrects this change.

Signed-off-by: Sebastiaan van Stijn <[email protected]>
(cherry picked from commit 43217d733205b0694f791e7326bfed6d13b645f0)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
Signed-off-by: Kotaro Yoshimatsu <[email protected]>
(cherry picked from commit db05d8ad79e34e8096f31585fe9ffe0ce18f98d8)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah thaJeztah added this to the 17.12.0 milestone Dec 15, 2017
Adds bash completion for
- `service create --generic-resource`
- `service update --generic-resource-(add|rm)`
- `dockerd --node-generic-resource`

Signed-off-by: Harald Albers <[email protected]>
(cherry picked from commit 8ec80eec672b93be03843412f195fae477e81c4a)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah
Copy link
Member Author

Added docker/cli#749

@albers
Copy link
Contributor

albers commented Dec 15, 2017

@thaJeztah It would be really nice to have these in here as well: docker/cli#717, docker/cli#713, docker/cli#682. They've been hanging around for quite a while.

Signed-off-by: Harald Albers <[email protected]>
(cherry picked from commit a2d0b6e122021cfac87a99a46d3d02339552d281)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah
Copy link
Member Author

Added docker/cli#713 - I'll try to add more 👍

@albers
Copy link
Contributor

albers commented Dec 16, 2017 via email

Copy link
Contributor

@seemethere seemethere left a comment

Choose a reason for hiding this comment

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

LGTM

@seemethere seemethere merged commit ddc114e into docker-archive:17.12 Dec 19, 2017
@thaJeztah thaJeztah deleted the 17.12-backport-docs-and-completion branch December 19, 2017 18:39
docker-jenkins pushed a commit that referenced this pull request Jul 6, 2019
Merged with https://github.com/seemethere/unir
Upstream-commit: bdcef5cf2259c9aab6d4e5196c357174fcdf83c1
Component: packaging
docker-jenkins pushed a commit that referenced this pull request Sep 20, 2019
[19.03 backport] Send exec exit event on failures
Upstream-commit: 879fba29d54b4403bb11cc69fa0ba9b6b4aca7c2
Component: engine
silvin-lubecki pushed a commit to silvin-lubecki/docker-ce that referenced this pull request Jan 24, 2020
…ocs-and-completion

[17.12] backport docs and completion
silvin-lubecki pushed a commit to silvin-lubecki/docker-ce that referenced this pull request Jan 27, 2020
…ocs-and-completion

[17.12] backport docs and completion
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