ci: fix docker compose usage in tests (#154)

* ci: use modern docker compose cmd * test(integration): set container name for tomcat
newrelic · Oct 18, 2024 · 8eb6711 · 8eb6711
1 parent 90dbc00
commit 8eb6711
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -38,8 +38,8 @@ integration-test:
 	    echo "Error: missing required env-var: NRJMX_VERSION\n" ;\
         exit 1 ;\
 	fi
-	@docker-compose -f test/integration/docker-compose.yml up -d --build
-	@go test -v -tags=integration ./test/integration/. -count=1 ; (ret=$$?; docker-compose -f test/integration/docker-compose.yml down && exit $$ret)
+	@docker compose -f test/integration/docker-compose.yml up -d --build
+	@go test -v -tags=integration ./test/integration/. -count=1 ; (ret=$$?; docker compose -f test/integration/docker-compose.yml down && exit $$ret)
 
 # Include thematic Makefiles
 include $(CURDIR)/build/ci.mk

diff --git a/test/integration/docker-compose.yml b/test/integration/docker-compose.yml
@@ -2,6 +2,7 @@ version: '3.1'
 
 services:
   tomcat:
+    container_name: integration_tomcat_1
     image: tomcat:8.5-alpine
     environment:
       CATALINA_OPTS: |