Added compose v2 syntax compatibility #299
Open
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
| @@ -23,15 +23,22 @@ endif | |||
| # Start the containers | |||
| .PHONY: compose-up | |||
| compose-up: | |||
| ifeq ($(DOCKER_COMPOSE),docker compose) | |||
There was a problem hiding this comment.
you already echo docker compose into the $(DOCKER_COMPOSE) var, so I think it can be used directly here(as originally) and you don't need to check the contents to then replicate it in the condition block?
AFAIK the syntax after is the same, so it should be enough.
Not sure if it wouldn't cause issues, with it not having the full path to the docker binary?
kaplan-michael
force-pushed
the
master
branch
from
954e8f3 to
f0c3148
Compare
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.
This PR provides compatibility with integrated "docker-compose" tool since Compose V2 as explained here https://docs.docker.com/compose/releases/migrate
Running the makefile now checks whether legacy docker installation is available or compose v2 compatible Docker is installed.