[17.06] backport (cli) If docker swarm ca is not called with the --rotate flag, warn if other flags are passed#110
[17.06] backport (cli) If docker swarm ca is not called with the --rotate flag, warn if other flags are passed#110andrewhsu merged 2 commits intodocker-archive:17.06from andrewhsu:fix-swarm-warn
docker swarm ca is not called with the --rotate flag, warn if other flags are passed#110Conversation
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>
|
@cyli when you get the chance can you have a look at this backport? |
|
@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 |
|
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>
|
I brought in the commit from docker/cli#328: Conflict with |
|
LGTM on green, thanks @andrewhsu and @thaJeztah! |
Remove pigz requirement for CentOS Upstream-commit: 4d5e046 Component: packaging
…json [18.09 backport] API: properly handle invalid JSON to return a 400 status Upstream-commit: 8f18feabeb9ef7fe670ff6f1ecbba2a6460e0267 Component: engine
[17.06] backport (cli) If `docker swarm ca` is not called with the `--rotate` flag, warn if other flags are passed
…entos Remove pigz requirement for CentOS
3 participants
Backport fix (each PR has just one git commit):
docker swarm cais not called with the--rotateflag, warn if other flags are passed docker/cli#207 Ifdocker swarm cais not called with the--rotateflag, warn if other flags are passedswarm cais called with flags other than--rotatedocker/cli#328 Fix warning in docker CLI whenswarm cais called with flags other than--rotateWith cherry-pick of docker/cli@32b43bc and docker/cli@4615c92:
Conflict with
components/cli/cli/command/swarm/ca_test.goin that the docker/cli@4615c92 cherry-pick wanted to modify it and it did not exist on the17.06branch. Resolved the conflict by not apply the diff to that file.