Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[carry] Add support for template_driver in composefiles #1746

Merged
merged 1 commit into from
Mar 19, 2019

Conversation

thaJeztah
Copy link
Member

@thaJeztah thaJeztah commented Mar 18, 2019

Carry of #1100 - rebased, and moved the option to schema 3.8
closes #1100

This maps the --template-driver flag on secret and config creation.

@thaJeztah
Copy link
Member Author

ping @silvin-lubecki @vdemeester PTAL

@codecov-io
Copy link

Codecov Report

Merging #1746 into master will decrease coverage by 0.01%.
The diff coverage is 40%.

@@            Coverage Diff             @@
##           master    #1746      +/-   ##
==========================================
- Coverage    56.1%   56.09%   -0.02%     
==========================================
  Files         306      306              
  Lines       21049    21057       +8     
==========================================
+ Hits        11810    11812       +2     
- Misses       8382     8386       +4     
- Partials      857      859       +2

1 similar comment
@codecov-io
Copy link

Codecov Report

Merging #1746 into master will decrease coverage by 0.01%.
The diff coverage is 40%.

@@            Coverage Diff             @@
##           master    #1746      +/-   ##
==========================================
- Coverage    56.1%   56.09%   -0.02%     
==========================================
  Files         306      306              
  Lines       21049    21057       +8     
==========================================
+ Hits        11810    11812       +2     
- Misses       8382     8386       +4     
- Partials      857      859       +2

Copy link
Contributor

@silvin-lubecki silvin-lubecki 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
Collaborator

@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.

Thanks 😍 LGTM 🦁
… but needs a rebase @thaJeztah

@thaJeztah
Copy link
Member Author

ah, saw that one coming 😅 - working on another PR, but I'll update after 👍

This maps the `--template-driver` flag on secret and config creation.

Signed-off-by: Vincent Demeester <[email protected]>
Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah thaJeztah force-pushed the carry_compose_template_driver branch from 2b46921 to 7764101 Compare March 18, 2019 22:49
@thaJeztah
Copy link
Member Author

rebased; regenerated cli/compose/schema/bindata.go

@masaeedu
Copy link

masaeedu commented Jun 2, 2020

Is the documentation at https://docs.docker.com/compose/compose-file generated from the source code here or is that a separate repo altogether?

@thaJeztah
Copy link
Member Author

@masaeedu documentation there is not generated automatically, but from a Markdown file in https://github.com/docker/docker.github.io/blob/master/compose/compose-file/index.md

@masaeedu
Copy link

masaeedu commented Jun 9, 2020

@thaJeztah Would that repo be the right place to open an issue to add documentation concerning template_driver and what variables are available? If I Ctrl+F template on https://docs.docker.com/compose/compose-file/ I get nothing.

@thaJeztah
Copy link
Member Author

@masaeedu yes, that would be the right place. I think the reason it wasn't documented yet, was that docker-compose (standalone) did not yet have support for the 3.8 schema until docker/compose#7217 (which is in docker compose v1.25.5 and up: https://github.com/docker/compose/releases/tag/1.25.5.

I see docker/docs#10273 added some of the changes, but didn't include all of them. Let me have a look at updating the docs

@thaJeztah
Copy link
Member Author

opened docker/docs#10980 to add some basic information (probably could use some enhancement after that, but at least the fields are mentioned now)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants