Merge branch 'main' into features

jaegertracing · Jan 26, 2025 · 0646152 · 0646152
2 parents bfc6cac + 88e819e
commit 0646152
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/docker-compose/monitor/Makefile b/docker-compose/monitor/Makefile
@@ -18,12 +18,12 @@ build: clean-jaeger
 # starts up the system required for SPM using the latest otel image and a development jaeger image.
 # Note: the jaeger "dev" image can be built with "make build".
 .PHONY: dev
-dev: export JAEGER_IMAGE_TAG = dev
+dev: export JAEGER_VERSION = dev
 dev: 
 	docker compose up $(DOCKER_COMPOSE_ARGS)
 
 .PHONY: dev-v1
-dev-v1: export JAEGER_IMAGE_TAG = dev
+dev-v1: export JAEGER_VERSION = dev
 dev-v1: export BINARY = all-in-one
 dev-v1: build
 	docker compose -f docker-compose-v1.yml up $(DOCKER_COMPOSE_ARGS)

diff --git a/docker-compose/monitor/README.md b/docker-compose/monitor/README.md
@@ -92,13 +92,13 @@ make clean-all
 To use an official published image of Jaeger, specify the version via environment variable:
 
 ```shell
-JAEGER_IMAGE_TAG=2.0.0 docker compose -f docker-compose.yml up
+JAEGER_VERSION=2.0.0 docker compose -f docker-compose.yml up
 ```
 
 or for Jaeger v1:
 
 ```shell
-JAEGER_IMAGE_TAG=1.62.0 docker compose -f docker-compose-v1.yml up  
+JAEGER_VERSION=1.62.0 docker compose -f docker-compose-v1.yml up  
 ```
 
 ## Development

diff --git a/docker-compose/monitor/docker-compose-v1.yml b/docker-compose/monitor/docker-compose-v1.yml
@@ -2,7 +2,7 @@ services:
   jaeger:
     networks:
       - backend
-    image: jaegertracing/all-in-one:${JAEGER_IMAGE_TAG:-latest}
+    image: jaegertracing/all-in-one:${JAEGER_VERSION:-latest}
     volumes:
       - "./jaeger-ui.json:/etc/jaeger/jaeger-ui.json"
     command: --query.ui-config /etc/jaeger/jaeger-ui.json

diff --git a/docker-compose/monitor/docker-compose.yml b/docker-compose/monitor/docker-compose.yml
@@ -3,8 +3,8 @@ services:
     networks:
       backend:
         # This is the host name used in Prometheus scrape configuration.
-        aliases: [spm_metrics_source]
-    image: jaegertracing/jaeger:${JAEGER_IMAGE_TAG:-latest}
+        aliases: [ spm_metrics_source ]
+    image: jaegertracing/jaeger:${JAEGER_VERSION:-latest}
     volumes:
       - "./jaeger-ui.json:/etc/jaeger/jaeger-ui.json" # Do we need this for v2 ? Seems to be running without this.
       - "../../cmd/jaeger/config-spm.yaml:/etc/jaeger/config.yml"

diff --git a/docker-compose/tail-sampling/Makefile b/docker-compose/tail-sampling/Makefile
@@ -16,7 +16,7 @@ build: clean-jaeger
 		cmd/$(BINARY)
 
 .PHONY: dev
-dev: export JAEGER_IMAGE_TAG = dev
+dev: export JAEGER_VERSION = dev
 dev: build 
 	docker compose -f docker-compose.yml up $(DOCKER_COMPOSE_ARGS)
 

diff --git a/docker-compose/tail-sampling/docker-compose.yml b/docker-compose/tail-sampling/docker-compose.yml
@@ -2,7 +2,7 @@ services:
   jaeger:
     networks:
       backend:
-    image: jaegertracing/jaeger:${JAEGER_IMAGE_TAG:-latest}
+    image: jaegertracing/jaeger:${JAEGER_VERSION:-latest}
     volumes:
       - "./jaeger-v2-config.yml:/etc/jaeger/config.yml"
     command: ["--config", "/etc/jaeger/config.yml"]