Skip to content

Commit

Permalink
Replace JAEGER_IMAGE_TAG with JAEGER_VERSION (#6614)
Browse files Browse the repository at this point in the history
## Which problem is this PR solving?
- Resolves #6612 

## Description of the changes
- 

## How was this change tested?
- 

## Checklist
- [ ] I have read
https://github.com/jaegertracing/jaeger/blob/master/CONTRIBUTING_GUIDELINES.md
- [ ] I have signed all commits
- [ ] I have added unit tests for the new functionality
- [ ] I have run lint and test steps successfully
  - for `jaeger`: `make lint test`
  - for `jaeger-ui`: `npm run lint` and `npm run test`

Signed-off-by: cs-308-2023 <adityaruhela2003@gmail.com>
  • Loading branch information
ADI-ROXX authored Jan 26, 2025
1 parent 6d4d7c4 commit 88e819e
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions docker-compose/monitor/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions docker-compose/monitor/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docker-compose/monitor/docker-compose-v1.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions docker-compose/monitor/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion docker-compose/tail-sampling/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion docker-compose/tail-sampling/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand Down

0 comments on commit 88e819e

Please sign in to comment.