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

Switch to using docker compose v2 #9926

Merged
merged 3 commits into from
Apr 2, 2024
Merged

Switch to using docker compose v2 #9926

merged 3 commits into from
Apr 2, 2024

Conversation

wgreenberg
Copy link
Collaborator

Azure recently dropped the docker-compose standalone executable (aka docker-compose v1), and since it's not receiving updates anymore, let's get with the times and update to v2 as well.

Azure recently dropped the `docker-compose` standalone executable (aka
docker-compose v1), and since it's not receiving updates anymore, let's
get with the times and update to v2 as well.
@bmw
Copy link
Member

bmw commented Apr 2, 2024

i did some ci config mangling at https://dev.azure.com/certbot/certbot/_build/results?buildId=7596&view=results to see if this works since we don't run boulder tests on PRs for better or worse

@@ -89,10 +89,11 @@ def _setup_primary_node(config):
'boulder, but is not installed or not available for current user.')

try:
subprocess.check_output(['docker-compose', '-v'], stderr=subprocess.STDOUT)
subprocess.check_output(['docker', 'compose', 'ps'], stderr=subprocess.STDOUT)
Copy link
Member

Choose a reason for hiding this comment

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

looks like the test run i kicked off failed. maybe try docker compose ls here? docker compose ps fails for me locally if there's not a docker-compose.yml file in the current working directory

@@ -16,6 +16,7 @@ Certbot adheres to [Semantic Versioning](https://semver.org/).

* We no longer publish our beta Windows installer as was originally announced
[here](https://community.letsencrypt.org/t/certbot-discontinuing-windows-beta-support-in-2024/208101).
* Switch to using docker compose v2, as Azure's images dropped v1.
Copy link
Member

Choose a reason for hiding this comment

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

we can keep it if ya want, but i'd suggest removing this since this isn't user facing and just affects our internal ci stuff

@@ -154,7 +154,7 @@ Running automated integration tests

Generally it is sufficient to open a pull request and let Github and Azure Pipelines run
integration tests for you. However, you may want to run them locally before submitting
your pull request. You need Docker and docker-compose installed and working.
your pull request. You need Docker and docker-compose (v1 or v2) installed and working.
Copy link
Member

Choose a reason for hiding this comment

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

is it true that v1 still works?

if so, feel free to keep this as is, but i actually think we can probably just delete the docker-compose requirement here. we required docker-compose here once upon a time, but we actually no longer require it for pebble which is what's being used in the description below and your work in #9918 exists

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

aha, you're very right. removing!

Copy link
Member

@bmw bmw left a comment

Choose a reason for hiding this comment

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

lgtm! thanks for jumping on this will

@wgreenberg wgreenberg merged commit a7674bd into master Apr 2, 2024
16 checks passed
@wgreenberg wgreenberg deleted the docker-compose-v2 branch April 2, 2024 21: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.

None yet

2 participants