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

Use docker-compose if version is gte docker compose #3595

Merged
merged 10 commits into from
Mar 3, 2025

Conversation

aminvakil
Copy link
Collaborator

Fixes #3587

This PR tries to use docker-compose if its version is greater than docker compose.

Legal Boilerplate

Look, I get it. The entity doing business as "Sentry" was incorporated in the State of Delaware in 2015 as Functional Software, Inc. and is gonna need some rights from me in order to utilize my contributions in this here PR. So here's the deal: I retain all rights, title and interest in and to my contributions, and by keeping this boilerplate intact I confirm that Sentry can use, modify, copy, and redistribute my contributions, under Sentry's choice of terms.

@aldy505 aldy505 requested review from BYK and hubertdeng123 March 3, 2025 01:20
@aminvakil aminvakil force-pushed the docker_compose_3587 branch from 40f2502 to f5a392c Compare March 3, 2025 04:36
Copy link
Member

@BYK BYK left a comment

Choose a reason for hiding this comment

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

Looks good but need the question about code organisation answered before merging.

@BYK
Copy link
Member

BYK commented Mar 3, 2025

Great to see you again @aminvakil and thanks so much for the patch! 🚀

@aminvakil aminvakil force-pushed the docker_compose_3587 branch from f5a392c to 6d85710 Compare March 3, 2025 12:37
@aminvakil aminvakil changed the title Use docker-compose if version is gte docker compose Do not merge: Use docker-compose if version is gte docker compose Mar 3, 2025
@aminvakil
Copy link
Collaborator Author

I set STANDALONE_COMPOSE_VERSION to 2.40.0 to see if it really picks up and it failed with this line (as docker-compose does not exist):

  Found Docker Compose version 2.40.0

I think this PR is good to go.

@aminvakil aminvakil changed the title Do not merge: Use docker-compose if version is gte docker compose Use docker-compose if version is gte docker compose Mar 3, 2025
@BYK BYK enabled auto-merge (squash) March 3, 2025 13:05
@BYK BYK merged commit d885dd3 into getsentry:master Mar 3, 2025
5 checks passed
@aminvakil aminvakil deleted the docker_compose_3587 branch March 3, 2025 13:19
BYK added a commit that referenced this pull request Mar 5, 2025
With #3595, we now check both `docker-compose` and `docker compose` versions so this patch removes the implicit fallback to `docker-compose` for `$dc_base` and makes it explicit.
BYK added a commit that referenced this pull request Mar 5, 2025
With #3595, we now check both `docker-compose` and `docker compose` versions so this patch removes the implicit fallback to `docker-compose` for `$dc_base` and makes it explicit.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

Docker compose min-requirements check issue
3 participants