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

add support for docker compose v2 (fix #730) #1140

Merged
merged 2 commits into from
Dec 11, 2023

Conversation

uniform641
Copy link
Contributor

Linux servers with docker engine installed through docker document could not run network.sh successfully due to docker compose version compatibility. The default docker engine doesn't support docker-compose command.

As the docker document suggest, docker compose is preferred to use in docker compose V2.

This PR adds support for docker compose V2 version. It uses docker compose command if it finds docker-compose command fails to execute.

@uniform641 uniform641 requested a review from a team as a code owner November 25, 2023 12:45
Signed-off-by: uniform64 <jiny2048@gmail.com>
some missing places in the previous commit

Signed-off-by: uniform64 <jiny2048@gmail.com>
Copy link
Contributor

@lehors lehors 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!

@lehors lehors merged commit cdb126d into hyperledger:main Dec 11, 2023
40 checks passed
@denyeart
Copy link
Contributor

@uniform641 @lehors Apologies for the late review, but I think this change will break things when using "podman-compose".
That is, when CONTAINER_CLI is set to "podman".

Could you please comment and/or add another PR to make it work with "podman-compose"? Otherwise we may need to revert the commit.

@lehors
Copy link
Contributor

lehors commented Dec 11, 2023

Ah I had meant to check this out actually and then forgot and couldn't remember why I hadn't merged it already. I'm getting soft in the brains. :-(

@uniform641
Copy link
Contributor Author

Sorry I didn't know about podman-compose. I will fix it to make it work ASAP.

@uniform641
Copy link
Contributor Author

@denyeart @lehors I have another PR(#1147) fixing the bug.

denyeart pushed a commit that referenced this pull request Dec 12, 2023
fix bugs in #1140

Signed-off-by: uniform64 <jiny2048@gmail.com>
@denyeart
Copy link
Contributor

Thanks, I've merged #1147

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.

3 participants