Skip to content
New issue

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

#

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

Already on GitHub? # to your account

Jump to bottom

Update code to use the "docker compose" syntax vice "docker-compose" #461

Merged
merged 3 commits into from
Apr 3, 2023
Merged

Update code to use the "docker compose" syntax vice "docker-compose" #461

merged 3 commits into from
Apr 3, 2023

Conversation

jsf9k
Copy link
Member

@jsf9k jsf9k commented Jun 7, 2022 •
edited
Loading

🗣 Description

This pull request updates the code to use the docker compose syntax instead of the docker-compose syntax.

💭 Motivation and context

The docker compose syntax is the preferred (and only correct) syntax after the changes in cisagov/ansible-role-docker#60.

🧪 Testing

Automated testing passes.

✅ Pre-approval checklist

  • This PR has an informative and human-readable title.
  • Changes are limited to a single goal - eschew scope creep!
  • All relevant type-of-change labels have been added.
  • I have read the CONTRIBUTING document.
  • These code changes follow cisagov code standards.
  • All relevant repo and/or project documentation has been updated to reflect the changes in this PR.
  • All new and existing tests pass.

@jsf9k jsf9k added bug This issue or pull request addresses broken functionality breaking change This issue or pull request involves changes to existing functionality labels Jun 7, 2022
@jsf9k jsf9k marked this pull request as ready for review June 7, 2022 19:18
@jsf9k jsf9k requested review from dav3r, felddy and mcdonnnj as code owners June 7, 2022 19:18
dav3r
dav3r approved these changes Jun 7, 2022
View reviewed changes
Copy link
Member

@dav3r dav3r left a comment

Choose a reason for hiding this comment

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

👍 👍

@jsf9k jsf9k force-pushed the bugfix/update-docker-compose-syntax branch from ea1ccc8 to 71b806b Compare June 15, 2022 18:19
@jsf9k jsf9k force-pushed the bugfix/update-docker-compose-syntax branch from 71b806b to 0d222bb Compare June 23, 2022 13:43
felddy
felddy approved these changes Sep 9, 2022
View reviewed changes
Copy link
Member

@felddy felddy left a comment

Choose a reason for hiding this comment

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

I like that compose is now in Docker. I wish they'd update their bash completions to understand it too. Strong work @jsf9k 💪

mcdonnnj
mcdonnnj approved these changes Sep 9, 2022
View reviewed changes
Copy link
Member

@mcdonnnj mcdonnnj left a comment

Choose a reason for hiding this comment

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

Makes sense. I just had some comment wording suggestions for your consideration.

@jsf9k jsf9k force-pushed the bugfix/update-docker-compose-syntax branch from 1e76e3c to c1dbddf Compare September 9, 2022 19:00
@dav3r dav3r added this to the Summer CyHy AMI Spectacular milestone Sep 20, 2022
@jsf9k jsf9k force-pushed the bugfix/update-docker-compose-syntax branch from c1dbddf to 96745a0 Compare October 18, 2022 20:11
@mcdonnnj mcdonnnj force-pushed the bugfix/update-docker-compose-syntax branch from 96745a0 to f4c64fc Compare October 19, 2022 19:42
@jsf9k jsf9k force-pushed the bugfix/update-docker-compose-syntax branch 2 times, most recently from 15c9027 to b4bff89 Compare December 30, 2022 15:06
@jsf9k jsf9k force-pushed the bugfix/update-docker-compose-syntax branch from b4bff89 to 7401739 Compare March 20, 2023 18:40
@jsf9k jsf9k requested review from jasonodoom and a team March 24, 2023 19:31
jsf9k and others added 3 commits April 3, 2023 13:22
@jsf9k @mcdonnnj
Update code to use the "docker compose" syntax vice "docker-compose"
db09af8 
The "docker compose" syntax is the preferred (and only correct) syntax
after the changes in cisagov/ansible-role-docker#60.
@jsf9k @mcdonnnj
Change wording to clarify meaning
26f7edc 
Co-authored-by: Nick <50747025+mcdonnnj@users.noreply.github.com>
@jsf9k @mcdonnnj
Change awkward working
187207d 
Now that we are using `docker compose` instead of `docker-compose`, there were a few places where this caused the wording to be awkward.

Co-authored-by: Nick <50747025+mcdonnnj@users.noreply.github.com>
@mcdonnnj mcdonnnj force-pushed the bugfix/update-docker-compose-syntax branch from 7401739 to 187207d Compare April 3, 2023 17:25
@mcdonnnj mcdonnnj merged commit 7bac565 into develop Apr 3, 2023
@mcdonnnj mcdonnnj deleted the bugfix/update-docker-compose-syntax branch April 3, 2023 17:42
# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers

@felddy felddy felddy approved these changes

@dav3r dav3r dav3r approved these changes

@mcdonnnj mcdonnnj mcdonnnj approved these changes

@jasonodoom jasonodoom Awaiting requested review from jasonodoom

Assignees

@jsf9k jsf9k

@mcdonnnj mcdonnnj

Labels
breaking change This issue or pull request involves changes to existing functionality bug This issue or pull request addresses broken functionality
Projects
CyHy System
Status: Done
Milestone
Summer CyHy AMI Spectacular
Development

Successfully merging this pull request may close these issues.
4 participants
@jsf9k @felddy @dav3r @mcdonnnj