From 8b8284469bbaea9b2bed990b328f3d83e6347cd2 Mon Sep 17 00:00:00 2001 From: Gabor Bella Date: Thu, 5 Sep 2024 15:12:30 +0200 Subject: [PATCH] Add "docker compose" support --- Makefile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index acd1f4d5a..e84240306 100644 --- a/Makefile +++ b/Makefile @@ -3,6 +3,7 @@ DOCKER_COMPOSE_FILE=_tests/integration/local_docker_test_environment/docker-compose.yml SRC_DIR_IN_GOPATH=/bitrise/src +DOCKERCOMPOSE=$(shell which docker-compose 2> /dev/null || echo '') docker-test: setup-test-environment docker exec -it bitrise-main-container bash -c "export INTEGRATION_TEST_BINARY_PATH=\$$PWD/bitrise-cli; go test ./_tests/integration -tags linux_only" @@ -11,4 +12,8 @@ setup-test-environment: build-main-container docker exec -it bitrise-main-container bash -c "go build -o bitrise-cli" build-main-container: - docker-compose -f $(DOCKER_COMPOSE_FILE) up --build -d + @if [ "$$DOCKERCOMPOSE" ]; then \ + docker-compose -f $(DOCKER_COMPOSE_FILE) up --build -d; \ + else \ + docker compose -f $(DOCKER_COMPOSE_FILE) up --build -d; \ + fi