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

[cherry-pick] Enable client side digest pinning for stack deploy #44

Merged
merged 3 commits into from
Jun 10, 2017

Conversation

nishanttotla
Copy link
Contributor

@nishanttotla nishanttotla commented Jun 8, 2017

This PR cherry-picks the two commits from docker/cli#121. It is required to avoid a digest-pinning regression for docker stack deploy.

It enables digest pinning for docker stack deploy, and adds a --resolve-image flag to stack deploy to provide options to control it.

Some of the refactoring from docker/cli#145 that came earlier doesn't show up in this cherry-pick, but I've tried to make sure the changes here don't cause problems, since docker/cli#121 is based on top of docker/cli#145 (cc @dnephin)

Tests might fail right now, I'll add a commit to fix them. In particular, changes from moby/moby#33386 are what will be needed.

cc @andrewhsu

Signed-off-by: Nishant Totla <[email protected]>
(cherry picked from commit 9f1bea2657e1830313ebe4d82e0037bc660a7f73)
Signed-off-by: Nishant Totla <[email protected]>
Signed-off-by: Nishant Totla <[email protected]>
(cherry picked from commit f790e839fc7d669acafa6365ca7a83cbedfe9e2d)
Signed-off-by: Nishant Totla <[email protected]>
@nishanttotla nishanttotla changed the title [WIP] Enable client side digest pinning for stack deploy [cherry-pick][WIP] Enable client side digest pinning for stack deploy Jun 8, 2017
Because of cherry-pick from commit
f790e839fc7d669acafa6365ca7a83cbedfe9e2d

Signed-off-by: Nishant Totla <[email protected]>
@nishanttotla nishanttotla changed the title [cherry-pick][WIP] Enable client side digest pinning for stack deploy [cherry-pick] Enable client side digest pinning for stack deploy Jun 8, 2017
@tiborvass
Copy link
Contributor

@dnephin PTAL - I want to make sure the cherry-pick was done correctly since it had to circumvent the refactoring.

Copy link
Contributor

@dnephin dnephin 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
Copy link
Contributor

LGTM

@andrewhsu andrewhsu merged commit eff2539 into docker-archive:17.06 Jun 10, 2017
@nishanttotla nishanttotla deleted the cpick-cli-121 branch June 13, 2017 21:39
@andrewhsu andrewhsu modified the milestone: 17.06.0 Jul 12, 2017
docker-jenkins pushed a commit that referenced this pull request Sep 5, 2018
[18.09] Fix supervisor healthcheck throttling
Upstream-commit: 7485ef7e46e2766a0da06fc63001e84d8ea36514
Component: engine
silvin-lubecki pushed a commit to silvin-lubecki/docker-ce that referenced this pull request Jan 29, 2020
[cherry-pick] Enable client side digest pinning for stack deploy
silvin-lubecki pushed a commit to silvin-lubecki/docker-ce that referenced this pull request Feb 3, 2020
[cherry-pick] Enable client side digest pinning for stack deploy
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.

4 participants