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

[17.06] backport (cli) If docker swarm ca is not called with the --rotate flag, warn if other flags are passed #110

Merged
merged 2 commits into from
Jul 13, 2017

Conversation

andrewhsu
Copy link
Contributor

@andrewhsu andrewhsu commented Jul 11, 2017

Backport fix (each PR has just one git commit):

With cherry-pick of docker/cli@32b43bc and docker/cli@4615c92:

$ git cherry-pick -s -x -Xsubtree=components/cli 32b43bc 4615c92

Conflict with components/cli/cli/command/swarm/ca_test.go in that the docker/cli@4615c92 cherry-pick wanted to modify it and it did not exist on the 17.06 branch. Resolved the conflict by not apply the diff to that file.

flags, including cert expiry, will be ignored, so warn if a user attempts
to use `docker swarm ca --cert-expiry` or something.

Signed-off-by: Ying Li <ying.li@docker.com>
(cherry picked from commit 32b43bc21a053cbe566feefd3c54def739d40bfe)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
@andrewhsu
Copy link
Contributor Author

@cyli when you get the chance can you have a look at this backport?

@andrewhsu andrewhsu modified the milestone: 17.06.1 Jul 12, 2017
@cyli
Copy link
Contributor

cyli commented Jul 12, 2017

@andrewhsu That definitely matches the change in the docker/cli#207, however I noticed a comment indicating a bug in that partiuclar fix, so have openned docker/cli#328.

The only change is to change that second flagCACert to flagCertExpiry. I'm not sure how to cherry-pick that change, since there was a refactor between docker/cli#207, and docker/cli#328.

@thaJeztah
Copy link
Member

I just merged docker/cli#328 - if it doesn't apply cleanly, perhaps just add a second commit to the PR to perform the fix

…assed,

and add a test.

Signed-off-by: Ying Li <ying.li@docker.com>
(cherry picked from commit 4615c92f661b724ece58937ccfecbb24f602fc32)

Conflicts:
components/cli/cli/command/swarm/ca_test.go
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
@andrewhsu
Copy link
Contributor Author

andrewhsu commented Jul 13, 2017

I brought in the commit from docker/cli#328:

$ git cherry-pick -s -x -Xsubtree=components/cli 4615c92f

Conflict with components/cli/cli/command/swarm/ca_test.go in that the docker/cli@4615c92 cherry-pick wanted to modify it and it did not exist on the 17.06 branch. Resolved the conflict by not apply the diff to that file.

@cyli
Copy link
Contributor

cyli commented Jul 13, 2017

LGTM on green, thanks @andrewhsu and @thaJeztah!

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 merged commit 9795a15 into docker-archive:17.06 Jul 13, 2017
@andrewhsu andrewhsu deleted the fix-swarm-warn branch July 13, 2017 03:20
docker-jenkins pushed a commit that referenced this pull request May 23, 2018
Remove pigz requirement for CentOS
Upstream-commit: 4d5e046
Component: packaging
docker-jenkins pushed a commit that referenced this pull request Nov 27, 2018
…json

[18.09 backport] API: properly handle invalid JSON to return a 400 status
Upstream-commit: 8f18feabeb9ef7fe670ff6f1ecbba2a6460e0267
Component: engine
silvin-lubecki pushed a commit to silvin-lubecki/docker-ce that referenced this pull request Jan 29, 2020
[17.06] backport (cli) If `docker swarm ca` is not called with the `--rotate` flag, warn if other flags are passed
akrasnov-drv pushed a commit to drivenets/docker-ce that referenced this pull request Apr 23, 2023
…entos

Remove pigz requirement for CentOS
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