From bc019f5b7597c4cb7ec5a77ab1709e632a085752 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= Date: Tue, 4 Feb 2025 12:14:39 +0100 Subject: [PATCH] fix test compose commants, add ps MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jörn Friedrich Dreyer --- tests/acceptance/docker/Makefile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tests/acceptance/docker/Makefile b/tests/acceptance/docker/Makefile index cb4e936676..3574286c8a 100644 --- a/tests/acceptance/docker/Makefile +++ b/tests/acceptance/docker/Makefile @@ -236,6 +236,12 @@ show-test-logs: ## show logs of test COMPOSE_FILE=$(COMPOSE_FILE) \ docker compose logs --no-log-prefix -f acceptance-tests | less +.PHONY: ps +ps: ## show docker status + @COMPOSE_PROJECT_NAME=$(COMPOSE_PROJECT_NAME) \ + COMPOSE_FILE=$(COMPOSE_FILE) \ + docker compose ps + $(OC_WRAPPER): @if [ "$(WITH_WRAPPER)" == "true" ]; then \ $(MAKE) --no-print-directory -C ../../ocwrapper build \ @@ -286,7 +292,7 @@ clean: clean-docker-container clean-docker-volumes clean-dev-docker-image clean- start-server: ## build and start server @echo "Build and start server..." COMPOSE_FILE=$(COMPOSE_FILE) \ - COMPOSE_PROJECT_NAME=opencloud \ + COMPOSE_PROJECT_NAME=$(COMPOSE_PROJECT_NAME) \ OC_IMAGE_TAG=dev \ WITH_WRAPPER=$(WITH_WRAPPER) \ TEST_SOURCE=opencloud \