Add docker-compose-plugin package for Debian #60

jsf9k · 2022-06-02T20:44:57Z

🗣 Description

This pull request adds the docker-compose-plugin package for Debian instances.

💭 Motivation and context

The assessors require docker compose version 2.2.3 or later. The docker-compose package currently supports a 1.x version, while the docker-compose-plugin package supports a 2.x version; therefore, the assessors' needs dictate that we install the docker-compose-plugin package.

The difference between the two Debian packages is that docker-compose provides a docker-compose command, while the docker-compose-plugin package provides docker compose functionality to the docker command.

🧪 Testing

All automated tests pass. These changes were also tested successfully via the manual testing done in cisagov/docker-packer#41.

✅ 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.
Tests have been added and/or modified to cover the changes in this PR.
All new and existing tests pass.

The versioning of the docker compose plugin is different than that of the docker-compose Python package. The assessors require a version >=2.2.3, which forces the installation of docker-compose-plugin package. Also update the Molecule test code in accordance with these changes, and refactor the code to be more understandable and more in line with the way we have been writing such tests lately.

jsf9k · 2022-06-02T21:47:10Z

I'm open to removing docker-compose anywhere we are able to install docker-compose-plugin. Please let me know what you guys think is best.

mcdonnnj · 2022-06-02T21:54:19Z

I'm open to removing docker-compose anywhere we are able to install docker-compose-plugin. Please let me know what you guys think is best.

I'm fine with that because Docker has made it pretty clear that docker compose is the future. That being said we should check the compatibility list to make sure there's nothing breaking.

molecule/default/tests/test_default.py

@mcdonnnj

Duh. I was rushing to wrap this up and committed some nonsense. Thanks to @mcdonnnj for cleaning up after me. Co-authored-by: Nick <50747025+mcdonnnj@users.noreply.github.com>

jsf9k · 2022-06-03T03:20:26Z

I'm open to removing docker-compose anywhere we are able to install docker-compose-plugin. Please let me know what you guys think is best.

I'm fine with that because Docker has made it pretty clear that docker compose is the future. That being said we should check the compatibility list to make sure there's nothing breaking.

I see nothing breaking.

This change will be reverted once cisagov/ansible-role-docker#60 is approved and merged.

mcdonnnj

I believe these should be removed to resolve tests failing after your latest commit (and in concert with your refactor of how the testing is done).

molecule/default/tests/test_default.py

…lled The latter is the new and preferred way of working with Docker compositions, if available.

Co-authored-by: Nick <50747025+mcdonnnj@users.noreply.github.com>

mcdonnnj

Looking good! One small suggestion from me but otherwise

vars/Debian_stretch.yml

Co-authored-by: Nick <50747025+mcdonnnj@users.noreply.github.com>

dav3r

👍 Though please consider my one comment request.

molecule/default/tests/test_default.py

…cker-compose-plugin Co-authored-by: dav3r <david.redmin@trio.dhs.gov>

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

Docker has moved to a compose plugin for the docker command instead of the standalone docker-compose package. As of cisagov/ansible-role-docker#60 this newer syntax is required.

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

Docker has moved to a compose plugin for the docker command instead of the standalone docker-compose package. As of cisagov/ansible-role-docker#60 this newer syntax is required.

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

jsf9k added the improvement This issue or pull request will add or improve functionality, maintainability, or ease of use label Jun 2, 2022

jsf9k self-assigned this Jun 2, 2022

jsf9k linked an issue Jun 2, 2022 that may be closed by this pull request

Newer version of docker-compose required #61

Closed

jsf9k force-pushed the improvement/add-docker-compose-plugin branch from 428c517 to 5dd3d1d Compare June 2, 2022 21:10

jsf9k added 2 commits June 2, 2022 17:25

Fix typo

e49ae2e

jsf9k force-pushed the improvement/add-docker-compose-plugin branch from 5dd3d1d to e49ae2e Compare June 2, 2022 21:26

Add @mcdonnnj to codeowners

bca5f9e

jsf9k marked this pull request as ready for review June 2, 2022 21:46

jsf9k requested review from dav3r, felddy and mcdonnnj as code owners June 2, 2022 21:46

mcdonnnj requested changes Jun 2, 2022

View reviewed changes

Actually check if the package is installed

0eee28a

Duh. I was rushing to wrap this up and committed some nonsense. Thanks to @mcdonnnj for cleaning up after me. Co-authored-by: Nick <50747025+mcdonnnj@users.noreply.github.com>

jsf9k added a commit to cisagov/docker-packer that referenced this pull request Jun 3, 2022

Temporarily use a non-default branch of cisagov/ansible-role-docker

3bacd4c

This change will be reverted once cisagov/ansible-role-docker#60 is approved and merged.

jsf9k mentioned this pull request Jun 3, 2022

Bump version to pick up recent cisagov/ansible-role-docker changes cisagov/docker-packer#41

Merged

10 tasks

mcdonnnj reviewed Jun 3, 2022

View reviewed changes

molecule/default/tests/test_default.py Outdated Show resolved Hide resolved

molecule/default/tests/test_default.py Outdated Show resolved Hide resolved

Do not install docker-compose if docker-compose-plugin is being insta…

3e4d6ac

…lled The latter is the new and preferred way of working with Docker compositions, if available.

jsf9k force-pushed the improvement/add-docker-compose-plugin branch from fa8e66c to 3e4d6ac Compare June 3, 2022 03:47

Remove needless parametrization

fb527a4

Co-authored-by: Nick <50747025+mcdonnnj@users.noreply.github.com>

jsf9k requested a review from mcdonnnj June 3, 2022 04:07

mcdonnnj approved these changes Jun 3, 2022

View reviewed changes

vars/Debian_stretch.yml Outdated Show resolved Hide resolved

Fix capitalization in comment

b91af0b

Co-authored-by: Nick <50747025+mcdonnnj@users.noreply.github.com>

dav3r approved these changes Jun 6, 2022

View reviewed changes

molecule/default/tests/test_default.py Outdated Show resolved Hide resolved

Add a comment explaining the difference between docker-compose and do…

0b18fb4

…cker-compose-plugin Co-authored-by: dav3r <david.redmin@trio.dhs.gov>

jsf9k merged commit 018b6ef into develop Jun 6, 2022

jsf9k deleted the improvement/add-docker-compose-plugin branch June 6, 2022 15:25

jsf9k added a commit to cisagov/cyhy_amis that referenced this pull request Jun 7, 2022

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

ea1ccc8

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

jsf9k mentioned this pull request Jun 7, 2022

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

Merged

7 tasks

jsf9k mentioned this pull request Jun 7, 2022

Update code to use the "docker compose" syntax vice "docker-compose" cisagov/skeleton-docker#105

Merged

7 tasks

jsf9k mentioned this pull request Jun 7, 2022

Update code to use the "docker compose" syntax vice "docker-compose" cisagov/ansible-role-guacamole#58

Merged

7 tasks

mcdonnnj mentioned this pull request Jun 8, 2022

Skeletonize the repository cisagov/ncats-webui#11

Merged

8 tasks

dav3r added a commit to cisagov/cyhy-reports that referenced this pull request Jun 10, 2022

Use "docker compose" syntax instead of "docker-compose"

5485ed9

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

dav3r mentioned this pull request Jun 10, 2022

Handle notifications with large number of tickets and use docker compose syntax cisagov/cyhy-reports#77

Merged

6 tasks

jsf9k added a commit to cisagov/gatherer that referenced this pull request Jun 13, 2022

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

8083e72

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

jsf9k added a commit to cisagov/cyhy_amis that referenced this pull request Jun 15, 2022

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

71b806b

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

jsf9k added a commit to cisagov/cyhy_amis that referenced this pull request Jun 23, 2022

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

0d222bb

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

mcdonnnj pushed a commit to cisagov/cyhy_amis that referenced this pull request Jul 20, 2022

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

8686b3e

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

jsf9k added a commit to cisagov/cyhy_amis that referenced this pull request Sep 9, 2022

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

6447858

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

mcdonnnj pushed a commit to cisagov/cyhy_amis that referenced this pull request Oct 11, 2022

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

104fccf

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

jsf9k added a commit to cisagov/cyhy_amis that referenced this pull request Oct 18, 2022

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

58ac8ab

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

mcdonnnj pushed a commit to cisagov/cyhy_amis that referenced this pull request Oct 19, 2022

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

a8e4ffd

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

jsf9k added a commit to cisagov/cyhy_amis that referenced this pull request Dec 29, 2022

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

14850e7

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

jsf9k added a commit to cisagov/cyhy_amis that referenced this pull request Dec 30, 2022

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

1d743da

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

jsf9k added a commit to cisagov/cyhy_amis that referenced this pull request Mar 20, 2023

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

c559dea

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

mcdonnnj pushed a commit to cisagov/cyhy_amis that referenced this pull request Apr 3, 2023

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.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add docker-compose-plugin package for Debian #60

Add docker-compose-plugin package for Debian #60

jsf9k commented Jun 2, 2022 •

edited

Loading

jsf9k commented Jun 2, 2022

mcdonnnj commented Jun 2, 2022

jsf9k commented Jun 3, 2022

mcdonnnj left a comment •

edited

Loading

mcdonnnj left a comment

dav3r left a comment

Add docker-compose-plugin package for Debian #60

Add docker-compose-plugin package for Debian #60

Conversation

jsf9k commented Jun 2, 2022 • edited Loading

🗣 Description

💭 Motivation and context

🧪 Testing

✅ Pre-approval checklist

jsf9k commented Jun 2, 2022

mcdonnnj commented Jun 2, 2022

jsf9k commented Jun 3, 2022

mcdonnnj left a comment • edited Loading

Choose a reason for hiding this comment

mcdonnnj left a comment

Choose a reason for hiding this comment

dav3r left a comment

Choose a reason for hiding this comment

jsf9k commented Jun 2, 2022 •

edited

Loading

mcdonnnj left a comment •

edited

Loading