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

Conversation

@thaJeztah
Copy link
Member

cherry-pick of docker/cli@d11b5cc (docker/cli#896) for 18.03

git checkout -b 18.03-backport-templated-configs-secrets upstream/18.03
git cherry-pick -s -S -x -Xsubtree=components/cli d11b5ccdfa4df102c1783afca28de25323e6f520
git push --set-upstream origin 18.03-backport-templated-configs-secrets

no conflicts

Signed-off-by: Sebastiaan van Stijn <[email protected]>
(cherry picked from commit d11b5ccdfa4df102c1783afca28de25323e6f520)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah thaJeztah added this to the 18.03.0 milestone Feb 26, 2018
@thaJeztah thaJeztah changed the title [18.03] dd --template-driver option for secrets/configs [18.03] Add --template-driver option for secrets/configs Feb 26, 2018
@thaJeztah thaJeztah requested a review from dnephin February 26, 2018 10:36
@thaJeztah
Copy link
Member Author

ping @vdemeester @dnephin

Copy link
Contributor

@vdemeester vdemeester left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM 🐯

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 andrewhsu merged commit 9dbc108 into docker-archive:18.03 Mar 6, 2018
@thaJeztah thaJeztah deleted the 18.03-backport-templated-configs-secrets branch March 6, 2018 13:46
docker-jenkins pushed a commit that referenced this pull request Jan 23, 2020
[19.03 backport] daemon: don't listen on the same address multiple times
Upstream-commit: c3936abb675e88a62215d7fac9f52b365f273ca6
Component: engine
silvin-lubecki pushed a commit to silvin-lubecki/docker-ce that referenced this pull request Jan 24, 2020
…emplated-configs-secrets

[18.03] Add --template-driver option for secrets/configs
docker-jenkins pushed a commit that referenced this pull request Mar 12, 2020
Don't disable socket activation when stopping docker service
Upstream-commit: 5c1d24e
Component: packaging
akrasnov-drv pushed a commit to drivenets/docker-ce that referenced this pull request Apr 23, 2023
Don't disable socket activation when stopping docker service
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