From 4ab7fe515ab4fcdc11806ccce971a8dfb3a669ed Mon Sep 17 00:00:00 2001 From: Piotr Kardasz Date: Mon, 10 Jun 2024 12:15:41 +0200 Subject: [PATCH 1/3] Add support for docker compose v2 To use fallback version: export DOCKER_COMPOSE="docker-compose" --- Makefile | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index 61eae83004..11e6480ffa 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,6 @@ .PHONY: run +DOCKER_COMPOSE ?= docker compose DOCKER_USER ?= "$(shell id -u):$(shell id -g)" ENV ?= "dev" @@ -7,34 +8,39 @@ init: @if [ ! -e compose.override.yml ]; then \ cp compose.override.dist.yml compose.override.yml; \ fi - @ENV=$(ENV) DOCKER_USER=$(DOCKER_USER) docker-compose run --rm php composer install --no-interaction --no-scripts - @ENV=$(ENV) DOCKER_USER=$(DOCKER_USER) docker-compose run --rm nodejs + @ENV=$(ENV) DOCKER_USER=$(DOCKER_USER) $(DOCKER_COMPOSE) run --rm php composer install --no-interaction --no-scripts + @ENV=$(ENV) DOCKER_USER=$(DOCKER_USER) $(DOCKER_COMPOSE) run --rm nodejs make install - @ENV=$(ENV) DOCKER_USER=$(DOCKER_USER) docker-compose up -d + @ENV=$(ENV) DOCKER_USER=$(DOCKER_USER) $(DOCKER_COMPOSE) up -d run: make up debug: - @ENV=$(ENV) DOCKER_USER=$(DOCKER_USER) docker-compose -f compose.yml -f compose.override.yml -f compose.debug.yml up -d + @ENV=$(ENV) DOCKER_USER=$(DOCKER_USER) $(DOCKER_COMPOSE) -f compose.yml -f compose.override.yml -f compose.debug.yml up -d up: - @ENV=$(ENV) DOCKER_USER=$(DOCKER_USER) docker-compose up -d + @ENV=$(ENV) DOCKER_USER=$(DOCKER_USER) $(DOCKER_COMPOSE) up -d down: - @ENV=$(ENV) DOCKER_USER=$(DOCKER_USER) docker-compose down + @ENV=$(ENV) DOCKER_USER=$(DOCKER_USER) $(DOCKER_COMPOSE) down install: - @ENV=$(ENV) DOCKER_USER=$(DOCKER_USER) docker-compose run --rm php bin/console sylius:install -s default -n + @ENV=$(ENV) DOCKER_USER=$(DOCKER_USER) $(DOCKER_COMPOSE) run --rm php bin/console sylius:install -s default -n clean: - @ENV=$(ENV) DOCKER_USER=$(DOCKER_USER) docker-compose down -v + @ENV=$(ENV) DOCKER_USER=$(DOCKER_USER) $(DOCKER_COMPOSE) down -v php-shell: - @ENV=$(ENV) DOCKER_USER=$(DOCKER_USER) docker-compose exec php sh + @ENV=$(ENV) DOCKER_USER=$(DOCKER_USER) $(DOCKER_COMPOSE) exec php sh node-shell: - @ENV=$(ENV) DOCKER_USER=$(DOCKER_USER) docker-compose run --rm -i nodejs sh + @ENV=$(ENV) DOCKER_USER=$(DOCKER_USER) $(DOCKER_COMPOSE) run --rm -i nodejs sh node-watch: - @ENV=$(ENV) DOCKER_USER=$(DOCKER_USER) docker-compose run --rm -i nodejs "npm run watch" + @ENV=$(ENV) DOCKER_USER=$(DOCKER_USER) $(DOCKER_COMPOSE) run --rm -i nodejs "npm run watch" + +docker-compose-check: + @which $(DOCKER_COMPOSE) > /dev/null || (echo "Please install docker compose binary" && exit 1) + @echo "You are using \"$(DOCKER_COMPOSE)\" binary" + @echo "Current version is \"$$($(DOCKER_COMPOSE) version)\"" From 577e0916ed20e5437d7590212bf9f8e8c2f437fb Mon Sep 17 00:00:00 2001 From: Piotr Kardasz Date: Tue, 11 Jun 2024 00:12:56 +0200 Subject: [PATCH 2/3] Add docker compose binary check in Makefile --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 11e6480ffa..1b65d84a6d 100644 --- a/Makefile +++ b/Makefile @@ -5,12 +5,13 @@ DOCKER_USER ?= "$(shell id -u):$(shell id -g)" ENV ?= "dev" init: + @make -s docker-compose-check @if [ ! -e compose.override.yml ]; then \ cp compose.override.dist.yml compose.override.yml; \ fi @ENV=$(ENV) DOCKER_USER=$(DOCKER_USER) $(DOCKER_COMPOSE) run --rm php composer install --no-interaction --no-scripts @ENV=$(ENV) DOCKER_USER=$(DOCKER_USER) $(DOCKER_COMPOSE) run --rm nodejs - make install + @make -s install @ENV=$(ENV) DOCKER_USER=$(DOCKER_USER) $(DOCKER_COMPOSE) up -d run: From 837117eef0b9ba40be46eeead5c15e8e1eb3e9d2 Mon Sep 17 00:00:00 2001 From: Piotr Kardasz <40711740+piotrkardasz@users.noreply.github.com> Date: Tue, 11 Jun 2024 10:00:29 +0200 Subject: [PATCH 3/3] Keep the same syntax for all commands in the Makefile Co-authored-by: Francis Hilaire --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 1b65d84a6d..c052062fa9 100644 --- a/Makefile +++ b/Makefile @@ -15,7 +15,7 @@ init: @ENV=$(ENV) DOCKER_USER=$(DOCKER_USER) $(DOCKER_COMPOSE) up -d run: - make up + @make -s up debug: @ENV=$(ENV) DOCKER_USER=$(DOCKER_USER) $(DOCKER_COMPOSE) -f compose.yml -f compose.override.yml -f compose.debug.yml up -d