mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2025-12-30 08:50:49 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #160 from opencloud-eu/fix-test-compose-commands

Browse Source 
fix test compose commants, add ps
This commit is contained in:
Viktor Scharf
2025-02-04 12:15:54 +01:00
committed by GitHub
parent c7d73768e8 bc019f5b75
commit 6be94c63ca
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tests/acceptance/docker/Makefile
View File

@@ -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 \