From 7aec67da543862476bda5081869d2e25b2f367a8 Mon Sep 17 00:00:00 2001 From: Vaishali Kirtikumar Nile <80026547+VAISHALI-NILE@users.noreply.github.com> Date: Thu, 3 Aug 2023 13:20:51 +0530 Subject: [PATCH 1/5] Update docker-compose.minimal.yml --- docker-compose.minimal.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/docker-compose.minimal.yml b/docker-compose.minimal.yml index 4b143e9508..1ac3dfa9ee 100644 --- a/docker-compose.minimal.yml +++ b/docker-compose.minimal.yml @@ -500,9 +500,14 @@ services: logging: *logging # OpenTelemetry Collector - otelcol: - image: otel/opentelemetry-collector-contrib:0.76.1 + otelcol: + image: ${IMAGE_NAME}:${IMAGE_VERSION}-otelcol container_name: otel-col + build: + context: ./ + dockerfile: ./src/otelcollector/Dockerfile + cache_from: + - ${IMAGE_NAME}:${IMAGE_VERSION}-otelcol deploy: resources: limits: @@ -521,7 +526,6 @@ services: depends_on: - jaeger logging: *logging - # Prometheus prometheus: image: quay.io/prometheus/prometheus:v2.43.0 From fa35e61b7cec37028fcfb23d56e59cda3bcedeb7 Mon Sep 17 00:00:00 2001 From: Vaishali Kirtikumar Nile <80026547+VAISHALI-NILE@users.noreply.github.com> Date: Thu, 3 Aug 2023 13:34:11 +0530 Subject: [PATCH 2/5] Update docker-compose.minimal.yml Co-authored-by: Juliano Costa --- docker-compose.minimal.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.minimal.yml b/docker-compose.minimal.yml index 1ac3dfa9ee..00dcd6678c 100644 --- a/docker-compose.minimal.yml +++ b/docker-compose.minimal.yml @@ -500,7 +500,7 @@ services: logging: *logging # OpenTelemetry Collector - otelcol: + otelcol: image: ${IMAGE_NAME}:${IMAGE_VERSION}-otelcol container_name: otel-col build: From d87a3b85e0955a6fe5df0ec2168f513d5538e2a1 Mon Sep 17 00:00:00 2001 From: Vaishali Kirtikumar Nile <80026547+VAISHALI-NILE@users.noreply.github.com> Date: Thu, 3 Aug 2023 14:07:34 +0530 Subject: [PATCH 3/5] Update docker-compose.minimal.yml --- docker-compose.minimal.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker-compose.minimal.yml b/docker-compose.minimal.yml index 00dcd6678c..cda989bfba 100644 --- a/docker-compose.minimal.yml +++ b/docker-compose.minimal.yml @@ -526,6 +526,7 @@ services: depends_on: - jaeger logging: *logging + # Prometheus prometheus: image: quay.io/prometheus/prometheus:v2.43.0 From 494508fcfd44cbb3b83249ab8c497b51fbbcd867 Mon Sep 17 00:00:00 2001 From: Vaishali Kirtikumar Nile <80026547+VAISHALI-NILE@users.noreply.github.com> Date: Thu, 3 Aug 2023 14:21:22 +0530 Subject: [PATCH 4/5] Update docker-compose.minimal.yml --- docker-compose.minimal.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.minimal.yml b/docker-compose.minimal.yml index cda989bfba..6cfe3859d0 100644 --- a/docker-compose.minimal.yml +++ b/docker-compose.minimal.yml @@ -498,7 +498,7 @@ services: ports: - "${GRAFANA_SERVICE_PORT}" logging: *logging - + # OpenTelemetry Collector otelcol: image: ${IMAGE_NAME}:${IMAGE_VERSION}-otelcol From e9a5dbefc07becc5a963c6be5d87ce807bd1e1d4 Mon Sep 17 00:00:00 2001 From: Juliano Costa Date: Thu, 3 Aug 2023 11:42:34 +0200 Subject: [PATCH 5/5] Remove spaces --- docker-compose.minimal.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.minimal.yml b/docker-compose.minimal.yml index 6cfe3859d0..b0d2c0a883 100644 --- a/docker-compose.minimal.yml +++ b/docker-compose.minimal.yml @@ -498,7 +498,7 @@ services: ports: - "${GRAFANA_SERVICE_PORT}" logging: *logging - + # OpenTelemetry Collector otelcol: image: ${IMAGE_NAME}:${IMAGE_VERSION}-otelcol @@ -526,7 +526,7 @@ services: depends_on: - jaeger logging: *logging - + # Prometheus prometheus: image: quay.io/prometheus/prometheus:v2.43.0