ref: Less complicated docker compose detection #3604
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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.
aminvakil
suggested changes
Mar 5, 2025
Codecov ReportAll modified and coverable lines are covered by tests ✅
✅ All tests successful. No failed tests found. Additional details and impacted files@@ Coverage Diff @@
## master #3604 +/- ##
=======================================
Coverage 99.45% 99.45%
=======================================
Files 3 3
Lines 183 183
=======================================
Hits 182 182
Misses 1 1 ☔ View full report in Codecov by Sentry. |
aminvakil
reviewed
Mar 5, 2025
Co-authored-by: Amin Vakil <[email protected]>
aminvakil
approved these changes
Mar 5, 2025
hubertdeng123
approved these changes
Mar 5, 2025
| @@ -9,22 +9,20 @@ fi | |||
| echo "${_group}Initializing Docker Compose ..." | |||
|
|
|||
| # To support users that are symlinking to docker-compose | |||
| dc_base="$(docker compose version &>/dev/null && echo 'docker compose' || echo 'docker-compose')" | |||
| dc_base="$(docker compose version --short &>/dev/null && echo 'docker compose' || echo '')" | |||
| dc_base_standalone="$(docker-compose version &>/dev/null && echo 'docker-compose' || echo '')" | |||
There was a problem hiding this comment.
Might as well use --short here too
Suggested change
| dc_base_standalone="$(docker-compose version &>/dev/null && echo 'docker-compose' || echo '')" | |
| dc_base_standalone="$(docker-compose version --short &>/dev/null && echo 'docker-compose' || echo '')" |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
With #3595, we now check both
docker-composeanddocker composeversions so this patch removes the implicit fallback todocker-composefor$dc_baseand makes it explicit.