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

(MAINT) Use docker-compose config instead file parsing #672

Merged
merged 4 commits into from
Nov 16, 2020

Conversation

rbelnap
Copy link
Contributor

@rbelnap rbelnap commented Oct 19, 2020

Parsing the files directly causes issues for variable interpolation in the docker-compose.yml files. For example, the common image name image:${IMAGE_TAG:-latest}in a docker-compose.yml will never be found without docker-compose finding $IMAGE_TAG and substituting it. docker-compose config will also merge the compose files properly without the provider needing to parse and merge manually.

My ruby is barely passable, so there may be significant improvements here.

@rbelnap rbelnap requested a review from a team as a code owner October 19, 2020 14:57
@codecov-io
Copy link

codecov-io commented Oct 19, 2020

Codecov Report

Merging #672 into main will decrease coverage by 0.08%.
The diff coverage is 0.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##             main     #672      +/-   ##
==========================================
- Coverage   22.37%   22.28%   -0.09%     
==========================================
  Files          20       20              
  Lines         751      754       +3     
==========================================
  Hits          168      168              
- Misses        583      586       +3     
Impacted Files Coverage Δ
lib/puppet/provider/docker_compose/ruby.rb 21.66% <0.00%> (+1.03%) ⬆️
...ib/puppet/parser/functions/docker_service_flags.rb 0.00% <0.00%> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 9a72a53...740e1c6. Read the comment docs.

@michaeltlombardi michaeltlombardi self-assigned this Nov 9, 2020
@michaeltlombardi
Copy link
Contributor

Thanks so much for this contribution!

@michaeltlombardi michaeltlombardi changed the title switch docker-compose provider to use docker-compose config instead of parsing files (MAINT) Use docker-compose config instead file parsing Nov 16, 2020
@michaeltlombardi michaeltlombardi merged commit 607335e into puppetlabs:main Nov 16, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants