Merge branch 'main' into dependabot/go_modules/github.com/elastic/apm…

…-aggregation-1.0.2
elastic · Aug 2, 2024 · eea81ef · eea81ef
2 parents feb78f6 + 7aeb1f5
commit eea81ef
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -63,7 +63,7 @@ jobs:
         with:
           go-version-file: systemtest/go.mod
           cache: true
-      - run: docker-compose up -d
+      - run: docker compose up -d
       - env:
           GOTESTFLAGS: "-v -json"
           OUTPUT_JSON_FILE: "build/TEST-go-system_tests.out.json"

diff --git a/systemtest/containers.go b/systemtest/containers.go
@@ -68,7 +68,7 @@ func init() {
 // development and testing. Use docker-compose to stop services as necessary.
 func StartStackContainers() error {
 	cmd := exec.Command(
-		"docker-compose", "-f", "../docker-compose.yml",
+		"docker", "compose", "-f", "../docker-compose.yml",
 		"up", "-d", "elasticsearch", "kibana",
 	)
 	cmd.Stdout = os.Stdout

diff --git a/testing/stack-monitoring.sh b/testing/stack-monitoring.sh
@@ -8,9 +8,9 @@ GITROOT=$(git rev-parse --show-toplevel)
 if [[ ! -z $(docker ps --filter=name=${CONTAINER_NAME} --format='{{.Names}}') ]]; then
     docker rm -f ${CONTAINER_NAME}
 fi
-curl -s localhost:5601 > /dev/null && docker-compose --profile=monitoring down || true
+curl -s localhost:5601 > /dev/null && docker compose --profile=monitoring down || true
 
-docker-compose up -d
+docker compose up -d
 cd ${GITROOT}/systemtest/cmd/runapm
 go run main.go -keep -name ${CONTAINER_NAME} -var expvar_enabled=true -d -f
 cd -
@@ -20,6 +20,6 @@ docker cp ${GITROOT}/testing/docker/apm-server/agent-monitoring.sh ${CONTAINER_N
 docker exec apm-server /agent-monitoring.sh
 docker restart apm-server
 sed "s/CONTAINER_NAME/${CONTAINER_NAME}/" ${GITROOT}/testing/docker/metricbeat/apm-server.yml.tpl > ${GITROOT}/testing/docker/metricbeat/apm-server.yml
-docker-compose --profile monitoring up -d
+docker compose --profile monitoring up -d
 
 echo "export ELASTIC_APM_SERVER_URL=http://127.0.0.1:$(docker inspect ${CONTAINER_NAME} --format='{{range $p, $conf := .NetworkSettings.Ports}}{{(index $conf 0).HostPort}}{{end}}')"