From ed7a50176cfd804b97446216e670c2ab593dd2f8 Mon Sep 17 00:00:00 2001 From: Jean-Marie Favreau Date: Sat, 1 Mar 2025 16:42:49 +0100 Subject: [PATCH] docker-compose suivant ce qui est disponible --- Makefile | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index a6cef7d..3d3e4b5 100644 --- a/Makefile +++ b/Makefile @@ -6,6 +6,7 @@ PROJECTNAME ?= agenda_culturel APP_NAME := $(PROJECTNAME) BACKEND_APP_NAME := $(APP_NAME)-backend +DOCKERCOMPOSE=$(shell if command -v docker-compose; then echo "docker-compose"; else echo "docker compose"; fi) define HELP Manage $(PROJECTNAME). Usage: @@ -72,34 +73,34 @@ build-translations: "python3 manage.py compilemessages" build-dev: - DOCKER_BUILDKIT=1 COMPOSE_DOCKER_CLI_BUILD=1 docker compose -f docker-compose.yml up --build -d + DOCKER_BUILDKIT=1 COMPOSE_DOCKER_CLI_BUILD=1 $(DOCKERCOMPOSE) -f docker-compose.yml up --build -d build-dev-log: - DOCKER_BUILDKIT=1 COMPOSE_DOCKER_CLI_BUILD=1 docker compose -f docker-compose.yml up --build + DOCKER_BUILDKIT=1 COMPOSE_DOCKER_CLI_BUILD=1 $(DOCKERCOMPOSE) -f docker-compose.yml up --build build-prod: - DOCKER_BUILDKIT=1 COMPOSE_DOCKER_CLI_BUILD=1 docker compose -f docker-compose.prod.yml up --build -d + DOCKER_BUILDKIT=1 COMPOSE_DOCKER_CLI_BUILD=1 $(DOCKERCOMPOSE) -f docker-compose.prod.yml up --build -d build-prod-log: - DOCKER_BUILDKIT=1 COMPOSE_DOCKER_CLI_BUILD=1 docker compose -f docker-compose.prod.yml up --build + DOCKER_BUILDKIT=1 COMPOSE_DOCKER_CLI_BUILD=1 $(DOCKERCOMPOSE) -f docker-compose.prod.yml up --build stop-dev: - @docker compose -f docker-compose.yml down + @$(DOCKERCOMPOSE) -f docker-compose.yml down stop-prod: - @docker compose -f docker-compose.prod.yml up + @$(DOCKERCOMPOSE) -f docker-compose.prod.yml up up-dev: #use up-dev to attach a running environment and have an access to the logs - @docker compose -f docker-compose.yml up + @$(DOCKERCOMPOSE) -f docker-compose.yml up up-prod: - @docker compose -f docker-compose.prod.yml down + @$(DOCKERCOMPOSE) -f docker-compose.prod.yml down restart-backend-prod: - docker compose -f docker compose.prod.yml restart backend + $(DOCKERCOMPOSE) -f docker-compose.prod.yml restart backend prod-restart: - DOCKER_BUILDKIT=1 COMPOSE_DOCKER_CLI_BUILD=1 docker compose -f docker-compose.prod.yml restart + DOCKER_BUILDKIT=1 COMPOSE_DOCKER_CLI_BUILD=1 $(DOCKERCOMPOSE) -f docker-compose.prod.yml restart all: help