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

[18.03] Add --template-driver option for secrets/configs #441

Merged
merged 1 commit into from
Mar 6, 2018
Merged

[18.03] Add --template-driver option for secrets/configs #441

merged 1 commit into from
Mar 6, 2018

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

@thaJeztah
Add --template-driver option for secrets/configs
eda1e25 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit d11b5ccdfa4df102c1783afca28de25323e6f520)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@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
Copy link
Member Author

ping @vdemeester @dnephin

vdemeester
vdemeester approved these changes Feb 26, 2018
View reviewed changes
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 🐯

dnephin
dnephin approved these changes Feb 26, 2018
View reviewed changes
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
@thaJeztah
Merge pull request #441 from thaJeztah/19.03_backport_fix_double_host
5effd71 
[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
@andrewhsu
Merge pull request docker-archive#441 from thaJeztah/18.03-backport-t…
2f0f733 
…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
@silvin-lubecki
Merge pull request #441 from thaJeztah/socket_activation
7b556ed 
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
@silvin-lubecki
Merge pull request docker-archive#441 from thaJeztah/socket_activation
5c1d24e 
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.
Reviewers

@dnephin dnephin dnephin approved these changes

@vdemeester vdemeester vdemeester approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
18.03.0
Development

Successfully merging this pull request may close these issues.
4 participants
@thaJeztah @vdemeester @dnephin @andrewhsu