From d2440a2f3e0c29dd151cc0a291d08c0f14cbc4bc Mon Sep 17 00:00:00 2001 From: Curtis Robert Date: Thu, 4 Apr 2024 07:33:45 -0700 Subject: [PATCH] [chore][CI/CD] Fix build-examples (#32156) **Description:** GitHub runners are being upgraded to docker v2. This requires `docker compose` to be used instead of `docker-compose`. I'm not aware of any other requirements for updating `build-examples` at this time. **Link to tracking Issue:** Resolves https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/32138 **Testing:** Working locally, github runners won't run on updated code until merged into main AFAIK, unfortunately. Co-authored-by: Antoine Toulme --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 2591f9a33e4a3..124b2641e5a13 100644 --- a/Makefile +++ b/Makefile @@ -347,9 +347,9 @@ otel-from-lib: .PHONY: build-examples build-examples: - docker-compose -f examples/demo/docker-compose.yaml build - cd examples/secure-tracing/certs && $(MAKE) clean && $(MAKE) all && docker-compose -f ../docker-compose.yaml build - docker-compose -f exporter/splunkhecexporter/example/docker-compose.yml build + docker compose -f examples/demo/docker-compose.yaml build + cd examples/secure-tracing/certs && $(MAKE) clean && $(MAKE) all && docker compose -f ../docker-compose.yaml build + docker compose -f exporter/splunkhecexporter/example/docker-compose.yml build .PHONY: deb-rpm-package %-package: ARCH ?= amd64