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

Align docker-compose with go-yaml/v3 #1472

Merged
merged 3 commits into from
Apr 18, 2023
Merged

Align docker-compose with go-yaml/v3 #1472

merged 3 commits into from
Apr 18, 2023

Conversation

jbregstone
Copy link
Contributor

@jbregstone jbregstone commented Apr 17, 2023

What was the problem?

I recently upgraded to the newest version of Docker desktop. When I ran docker:composeUp I saw an error and looking into it more I found an incompatibility issue with the merge key YAML.

docker/compose#10411

https://yaml.org/type/merge.html

Associated tickets or Slack threads:

How does this fix it?1

How to test this PR

  • Step 1 Build and run dockerComposeUp
  • Step 22

Footnotes

  1. Pull-Requests guidelines. If PR is significant, update Current Software State wiki page.

  2. To check if a PR will succeed in the SecRel workflow, test PRs in the SecRel pipeline.

@jbregstone jbregstone changed the title Changes to yaml format Changes to docker-compose format to align with go-yaml/v3 Apr 17, 2023
@jbregstone jbregstone changed the title Changes to docker-compose format to align with go-yaml/v3 Align docker-compose with go-yaml/v3 Apr 17, 2023
@github-actions
Copy link
Contributor

github-actions bot commented Apr 17, 2023

Test Results

159 tests  ±0   159 ✔️ ±0   3m 55s ⏱️ -3s
  54 suites ±0       0 💤 ±0 
  54 files   ±0       0 ±0 

Results for commit 2e928bb. ± Comparison against base commit 295a9f1.

♻️ This comment has been updated with latest results.

@github-actions
Copy link
Contributor

JaCoCo Test Coverage

There is no coverage information present for the Files changed

Total Project Coverage 75.4%

@jbregstone jbregstone marked this pull request as ready for review April 18, 2023 12:02
Copy link
Contributor

@yoomlam yoomlam left a comment

Choose a reason for hiding this comment

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

Thank you!

@yoomlam yoomlam requested a review from au2 April 18, 2023 13:49
@au2 au2 merged commit 0507eb7 into develop Apr 18, 2023
@au2 au2 deleted the update-docker-compose branch April 18, 2023 14:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants