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

Allow --detach and --quiet flags when using --rollback #60

Merged
merged 1 commit into from
Jun 10, 2017

Conversation

seemethere
Copy link
Contributor

Cherry-picked from: docker/cli#144

Commit 78c204ef798c7380e11ba26e5cd231e04fc6efe4 added
(f9bd8ec in the moby repo)
a validation to prevent --rollback from being used
in combination with other flags that update the
service spec.

This validation was not taking into account that
some flags only affect the CLI behavior, and
are okay to be used when rolling back.

This patch updates the validation, and adds
--quiet and --detach to the list of allowed
flags.

Signed-off-by: Sebastiaan van Stijn github@gone.nl
(cherry picked from commit f10f29df8d7ffede3faa29120a06c199e52a1d0c)
Signed-off-by: Eli Uriegas eli.uriegas@docker.com

Commit 78c204ef798c7380e11ba26e5cd231e04fc6efe4 added
(f9bd8ec in the moby repo)
a validation to prevent `--rollback` from being used
in combination with other flags that update the
service spec.

This validation was not taking into account that
some flags only affect the CLI behavior, and
are okay to be used when rolling back.

This patch updates the validation, and adds
`--quiet` and `--detach` to the list of allowed
flags.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit f10f29df8d7ffede3faa29120a06c199e52a1d0c)
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
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

@andrewhsu andrewhsu mentioned this pull request Jun 10, 2017
40 tasks
@andrewhsu
Copy link
Contributor

LGTM

@andrewhsu andrewhsu merged commit 47c1b00 into docker-archive:17.06 Jun 10, 2017
@andrewhsu andrewhsu modified the milestone: 17.06.0 Jul 12, 2017
@seemethere seemethere deleted the cherry_pick_144 branch August 2, 2017 21:34
andrewhsu pushed a commit that referenced this pull request Dec 4, 2017
use golang 1.9.2
Upstream-commit: ca48d41
Component: packaging
docker-jenkins pushed a commit that referenced this pull request Sep 22, 2018
[18.09] Remove boltdb dependency
Upstream-commit: ccab60936554e7bbcc06d507b5d9217ed0f80f69
Component: engine
silvin-lubecki pushed a commit to silvin-lubecki/docker-ce that referenced this pull request Jan 29, 2020
Allow --detach and --quiet flags when using --rollback
silvin-lubecki pushed a commit to silvin-lubecki/docker-ce that referenced this pull request Jan 30, 2020
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