From 4b1f49e169365ab3e81840882922f50d14cb0ace Mon Sep 17 00:00:00 2001
From: Florian Schade <f.schade@icloud.com>
Date: Wed, 22 Jan 2025 16:24:36 +0100
Subject: [PATCH] fix: test makefiles

---
 tests/acceptance/docker/Makefile | 16 ++++++++--------
 tests/ocwrapper/Makefile         |  8 +++++---
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/tests/acceptance/docker/Makefile b/tests/acceptance/docker/Makefile
index 2fef78280..01a1ce62f 100644
--- a/tests/acceptance/docker/Makefile
+++ b/tests/acceptance/docker/Makefile
@@ -190,22 +190,22 @@ testSuite: $(OC_WRAPPER) build-dev-image clean-docker-container
 	@if [ -n "${START_CEPH}" ]; then \
 		COMPOSE_PROJECT_NAME=$(COMPOSE_PROJECT_NAME) \
 		COMPOSE_FILE=src/ceph.yml \
-		docker-compose run start_ceph; \
+		docker compose run start_ceph; \
 	fi; \
 	if [ "${START_EMAIL}" == "true" ]; then \
 		COMPOSE_PROJECT_NAME=$(COMPOSE_PROJECT_NAME) \
 		COMPOSE_FILE=src/email.yml \
-		docker-compose run start_email; \
+		docker compose run start_email; \
 	fi; \
 	if [ "${START_ANTIVIRUS}" == "true" ]; then \
     		COMPOSE_PROJECT_NAME=$(COMPOSE_PROJECT_NAME) \
     		COMPOSE_FILE=src/antivirus.yml \
-    		docker-compose run start_antivirus; \
+    		docker compose run start_antivirus; \
     fi; \
     if [ "${START_TIKA}" == "true" ]; then \
 			COMPOSE_PROJECT_NAME=$(COMPOSE_PROJECT_NAME) \
 			COMPOSE_FILE=src/tika.yml \
-			docker-compose run tika-service; \
+			docker compose run tika-service; \
     fi; \
 	COMPOSE_PROJECT_NAME=$(COMPOSE_PROJECT_NAME) \
 	COMPOSE_FILE=$(COMPOSE_FILE) \
@@ -221,13 +221,13 @@ testSuite: $(OC_WRAPPER) build-dev-image clean-docker-container
 	BEHAT_FEATURE=$(BEHAT_FEATURE) \
 	DIVIDE_INTO_NUM_PARTS=$(DIVIDE_INTO_NUM_PARTS) \
 	RUN_PART=$(RUN_PART) \
-	docker-compose up -d --build --force-recreate
+	docker compose up -d --build --force-recreate
 
 .PHONY: show-test-logs
 show-test-logs: ## show logs of test
 	@COMPOSE_PROJECT_NAME=$(COMPOSE_PROJECT_NAME) \
 	COMPOSE_FILE=$(COMPOSE_FILE) \
-	docker-compose logs --no-log-prefix -f acceptance-tests | less
+	docker compose logs --no-log-prefix -f acceptance-tests | less
 
 $(OC_WRAPPER):
 	@if [ "$(WITH_WRAPPER)" == "true" ]; then \
@@ -254,7 +254,7 @@ clean-docker-container: ## clean docker containers created during acceptance tes
 	RUN_PART="" \
 	STORAGE_DRIVER="" \
 	TEST_SOURCE="" \
-	docker-compose down --remove-orphans
+	docker compose down --remove-orphans
 
 .PHONY: clean-docker-volumes
 clean-docker-volumes: ## clean docker volumes created during acceptance tests
@@ -266,7 +266,7 @@ clean-docker-volumes: ## clean docker volumes created during acceptance tests
 	RUN_PART="" \
 	STORAGE_DRIVER="" \
 	TEST_SOURCE="" \
-	docker-compose down --remove-orphans -v
+	docker compose down --remove-orphans -v
 
 .PHONY: clean-files
 clean-files:
diff --git a/tests/ocwrapper/Makefile b/tests/ocwrapper/Makefile
index 8f8a6f133..45d24650b 100644
--- a/tests/ocwrapper/Makefile
+++ b/tests/ocwrapper/Makefile
@@ -1,6 +1,8 @@
-.PHONY: build
-
+GOOS := linux ## only linux is supported
 GOARCH := $(shell go env GOARCH)
 
+.PHONY: build
 build:
-	env GOOS=linux GOARCH=$(GOARCH) go build -o bin/ocwrapper
+	GOOS=$(GOOS) \
+	GOARCH=$(GOARCH) \
+	go build -o bin/ocwrapper