Support ComposeV2 #339
Merged
Support ComposeV2 #339
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
added 5 commits
January 25, 2022 13:12
docker-compose v2 returns an exit code of 1 when running ps on a non-existent container, when v1 returned 0 and an empty list.
docker-compose v2 starts containers that depend on failed containers. This may be considered a bug or a feature. Either way, the only way to recover is to bring all containers down.
docker-compoose config doesn't always include the version number from the original configuration, so this can't be reliably used to know whether the services are under the services key or directly under the root.
docker-compose v2 now names containers in the form:
${container_id}_${name}-\d+
Previously, it used an underscore after the name.
augi
requested changes
Jan 25, 2022
src/main/groovy/com/avast/gradle/dockercompose/ComposeExecutor.groovy
Outdated
Show resolved
Hide resolved
src/test/groovy/com/avast/gradle/dockercompose/CaptureOutputTest.groovy
Outdated
Show resolved
Hide resolved
added 3 commits
January 25, 2022 16:33
docker-compose ps returns an exit code of 1 when a named service doesn't exist. Rather than trying to work out why the exit code is 1, get the service list first to see whether it's worth running ps with a service name.
Test that uotput from containers is captured by doccker-compose. v2 strangely strips newlines in certain circumstances.
|
Thank you very much for your contribution! 👍 I tried it locally on a few real-world projects and it works like a charm, so I'm going to release this change in |
|
Great! Thanks for your help with this. 😄 |
devinrsmith
added a commit
to devinrsmith/deephaven-core
that referenced
this pull request
Jan 9, 2023
This is primarily to pick up support for docker compose v2 output, avast/gradle-docker-compose-plugin#339. Note: the plugin still requires `docker-compose` (see avast/gradle-docker-compose-plugin#322). In my case, I was able to simply proxy via bash to `docker compose`: ``` $ cat ~/.local/bin/docker-compose docker compose $@ ``` There may be more official ways to create this shim layer.
This was referenced Jan 9, 2023
Merged
devinrsmith
added a commit
to deephaven/deephaven-core
that referenced
this pull request
Jan 11, 2023
This is primarily to pick up support for docker compose v2 output, avast/gradle-docker-compose-plugin#339. Note: the plugin still requires `docker-compose` (see avast/gradle-docker-compose-plugin#322). In my case, I was able to simply proxy via bash to `docker compose`: ``` $ cat ~/.local/bin/docker-compose #!/usr/bin/env bash docker compose $@ ``` https://github.com/docker/compose-switch/ may be the "official" way to redirect docker-compose, but I haven't looked into it.
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.
docker-composeversion 2 introduces a few subtle changes that the Gradle plugin needs updating to cope with:The key one (and the one we noticed first) is the container name separator change from
_to-, e.g.:dc0d8ebebfc1bd2d95a03ae408b9320f_test__fail_1vs.8a14f97d108b86c6af4af2a05bff880f_test_-fail-1). This stopped the plugin parsing the container names and setting the environment variables${serviceName}_HOST, etc.docker-compose psnow exits with code 1 when the container doesn't exist (instead of outputting an empty list.ComposeV2 removes support for unversioned configuration files.
Tested with
docker-compose1.29.2 and 2.2.3 on an Intel Mac.