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

[17.06] backport various completion script updates #104

Merged
merged 12 commits into from
Jul 12, 2017
Merged

[17.06] backport various completion script updates #104

merged 12 commits into from
Jul 12, 2017

Conversation

andrewhsu
Copy link
Contributor

@andrewhsu andrewhsu commented Jul 11, 2017

backport completion script fixes:

  1. Add bash completion for docker network create --ingress docker/cli#239 Add bash completion for docker network create --ingress
  2. Add bash completion for label filter of prune commands docker/cli#246 Add bash completion for label filter of prune commands
  3. Add bash completion for service create|update --entrypoint docker/cli#247 Add bash completion for service create|update --entrypoint
  4. Add bash completion for network create --scope|--config-only|config-from docker/cli#248 Add bash completion for network create --scope|--config-only|config-from
  5. Fix bash completion for network create --internal docker/cli#249 Fix bash completion for network create --internal
  6. Add bash completion for service create --detach docker/cli#250 Add bash completion for service create --detach
  7. Add bash completion for plugin events docker/cli#251 Add bash completion for plugin events
  8. Add bash completion for service create|update (update|rollback)-order docker/cli#256 Add bash completion for service create|update (update|rollback)-order
  9. Add bash completion for service create|update --network-(add|rm) docker/cli#257 Add bash completion for service create|update --network-(add|rm)
  10. Add bash completion for swarm ca docker/cli#268 Add bash completion for swarm ca
  11. Fix bash completion for swarm init|join --data-path-addr docker/cli#269 Fix bash completion for swarm init|join --data-path-addr
  12. Remove bash completion for service update --network docker/cli#321 Remove bash completion for service update --network

with cherry-pick (each PR only had one commit):

$ git cherry-pick -s -x -Xsubtree=components/cli \
  e4f9ad7 8b99b65 e0462e8 22579ba 12dc9eb 8baef10 \
  f0f7150 71dd0e0 fa0f470 5bd00a5 fa4dc88 e7e77b5

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

ping @albers PTAL

@albers
Copy link
Contributor

albers commented Jul 11, 2017

It's really hard to keep up with all the changes in Docker. But I figured out how to work with this repo and found a hack that gets the completion script into the dev container. moby/moby#33801 is not present here.

I verified the changes successfully. All features are present. The script can be loaded with ancient bash version as well (MacOS).

One point though: The implementation of --detach in 25ac146 is suboptimal (not wrong, but not helpful). There is already an unmerged fix which should go here: docker/cli#284.

@albers
Copy link
Contributor

albers commented Jul 11, 2017

can we also pull in docker/cli#321 (was just merged)?

albers added 12 commits July 12, 2017 00:47
Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit e4f9ad77c8de298af11a57f9ca89c88fa3d62181)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit 8b99b65ca82534edca786a9e3a61d77297626690)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Also fixes a wrong option: `--arg` should be `--args`.

Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit e0462e8472af1f0835104651e062b35756901d59)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
…from`

Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit 22579ba56cd5da8fa2808f1041b9dbc65738d40a)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
`--internal` is a boolean option. It was falsely treated as non-boolean.

Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit 12dc9eb11f3e6911a024008dc664fd124f8eb36f)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit 8baef1098ecef546040b7582344d4f08aab08dc9)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit f0f71505377ef2af5e51ee07b1b054cd83ec3886)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit 71dd0e0b668a5755d89815a9c310c2370680c1dc)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit fa0f470a5f43c11b611afcdfc47d1d985f98553c)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit 5bd00a563e9cc013d9d67e4770cae2be65963f98)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit fa4dc8820af82052834d96704f927ec789530be1)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
The `--network` option is only available for `docker service create`.

Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit e7e77b5e65062006d1e858ab2d4a1cde2651abf2)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
@andrewhsu
Copy link
Contributor Author

andrewhsu commented Jul 12, 2017

I brought in docker/cli@e7e77b5 and rebased to 17.06 branch.

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.

still LGTM

@andrewhsu andrewhsu merged commit f1d6145 into docker-archive:17.06 Jul 12, 2017
@andrewhsu andrewhsu deleted the backport-completion-scripts branch July 12, 2017 02:03
@andrewhsu andrewhsu modified the milestone: 17.06.1 Jul 12, 2017
docker-jenkins pushed a commit that referenced this pull request May 20, 2018
Update go to 1.10.2
Upstream-commit: 1aa5fac
Component: packaging
docker-jenkins pushed a commit that referenced this pull request Nov 1, 2018
[18.09] Vendor swarmkit to 6186e40
Upstream-commit: 4fc9786f7869a823962b7da6c876288b37d8da54
Component: engine
akrasnov-drv pushed a commit to drivenets/docker-ce that referenced this pull request Apr 23, 2023
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.

3 participants