From 2fb1b6d17702e80c8519966911c668eb25e8aee0 Mon Sep 17 00:00:00 2001 From: Gonzalo Diaz Date: Wed, 14 Aug 2024 14:09:48 -0400 Subject: [PATCH] [REFACTOR] [CONFIG] [DOCKER] docker-compose calls replaced by new "docker compose". - Command not found: docker-compose after docker 4.32.0 update: https://stackoverflow.com/a/78788716/6366150 --- Makefile | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/Makefile b/Makefile index 6b5a0a0..5b25724 100644 --- a/Makefile +++ b/Makefile @@ -25,6 +25,7 @@ GRADLE=gradle # DOCKER BUILDKIT_PROGRESS=plain +DOCKER_COMPOSE=docker compose .MAIN: test .PHONY: all clean dependencies help list test outdated @@ -81,34 +82,34 @@ build: env --exclude-task checkstyleTest compose/build: env - docker-compose --profile lint build - docker-compose --profile testing build - docker-compose --profile production build + ${DOCKER_COMPOSE} --profile lint build + ${DOCKER_COMPOSE} --profile testing build + ${DOCKER_COMPOSE} --profile production build compose/rebuild: env - docker-compose --profile lint build --no-cache - docker-compose --profile testing build --no-cache - docker-compose --profile production build --no-cache + ${DOCKER_COMPOSE} --profile lint build --no-cache + ${DOCKER_COMPOSE} --profile testing build --no-cache + ${DOCKER_COMPOSE} --profile production build --no-cache compose/lint/markdown: compose/build - docker-compose --profile lint run --rm algorithm-exercises-java-lint make lint/markdown + ${DOCKER_COMPOSE} --profile lint run --rm algorithm-exercises-java-lint make lint/markdown compose/lint/yaml: compose/build - docker-compose --profile lint run --rm algorithm-exercises-java-lint make lint/yaml + ${DOCKER_COMPOSE} --profile lint run --rm algorithm-exercises-java-lint make lint/yaml compose/test/styling: compose/build - docker-compose --profile lint run --rm algorithm-exercises-java-lint make test/styling + ${DOCKER_COMPOSE} --profile lint run --rm algorithm-exercises-java-lint make test/styling compose/test/static: compose/build - docker-compose --profile lint run --rm algorithm-exercises-java-lint make test/static + ${DOCKER_COMPOSE} --profile lint run --rm algorithm-exercises-java-lint make test/static compose/lint: compose/lint/markdown compose/lint/yaml compose/test/styling compose/test/static compose/test: compose/build - docker-compose --profile testing run --rm algorithm-exercises-java-test make test + ${DOCKER_COMPOSE} --profile testing run --rm algorithm-exercises-java-test make test compose/run: compose/build - docker-compose --profile testing run --rm algorithm-exercises-java make run + ${DOCKER_COMPOSE} --profile testing run --rm algorithm-exercises-java make run all: env dependencies lint test run: