Skip to content

Commit

Permalink
update docker compose to v2 since v1 is removed from the runners
Browse files Browse the repository at this point in the history
Signed-off-by: Yuri Shkuro <[email protected]>
  • Loading branch information
yurishkuro committed Apr 2, 2024
1 parent ba0fd2b commit 14e4816
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 13 deletions.
11 changes: 5 additions & 6 deletions crossdock/rules.mk
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,15 @@ JAEGER_COLLECTOR_HC_PORT ?= 14269

.PHONY: crossdock
crossdock:
docker-compose -f $(JAEGER_COMPOSE_YAML) -f $(XDOCK_YAML) kill
docker-compose -f $(JAEGER_COMPOSE_YAML) -f $(XDOCK_YAML) rm -f test_driver
JAEGER_COLLECTOR_HC_PORT=${JAEGER_COLLECTOR_HC_PORT} docker-compose -f $(JAEGER_COMPOSE_YAML) -f $(XDOCK_YAML) run crossdock 2>&1 | tee run-crossdock.log
docker compose -f $(JAEGER_COMPOSE_YAML) -f $(XDOCK_YAML) kill
docker compose -f $(JAEGER_COMPOSE_YAML) -f $(XDOCK_YAML) rm -f test_driver
JAEGER_COLLECTOR_HC_PORT=${JAEGER_COLLECTOR_HC_PORT} docker compose -f $(JAEGER_COMPOSE_YAML) -f $(XDOCK_YAML) run crossdock 2>&1 | tee run-crossdock.log
grep 'Tests passed!' run-crossdock.log

.PHONE: crossdock-logs
crossdock-logs:
docker-compose -f $(JAEGER_COMPOSE_YAML) -f $(XDOCK_YAML) logs
docker compose -f $(JAEGER_COMPOSE_YAML) -f $(XDOCK_YAML) logs

.PHONE: crossdock-clean
crossdock-clean:
docker-compose -f $(JAEGER_COMPOSE_YAML) -f $(XDOCK_YAML) down

docker compose -f $(JAEGER_COMPOSE_YAML) -f $(XDOCK_YAML) down
2 changes: 1 addition & 1 deletion docker-compose/kafka/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Sample configuration with Kafka

This `docker-compose` environment provides a sample configuration of Jaeger depoyment utilizing collector-Kafka-injester pipeline. Storage is provided by the `jageer-remote-storage` service running memstore.
This `docker compose` environment provides a sample configuration of Jaeger depoyment utilizing collector-Kafka-injester pipeline. Storage is provided by the `jageer-remote-storage` service running memstore.

Jaeger UI can be accessed at http://localhost:16686/, as usual, and refreshing the screen should produce internal traces.

Expand Down
6 changes: 3 additions & 3 deletions examples/grafana-integration/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

This example combines the Hot R.O.D. demo application ([examples/hotrod/](../hotrod/)) with Grafana, Loki and Prometheus integration, to demonstrate logs, metrics and traces correlation.

## Running via `docker-compose`
## Running via `docker compose`

### Prerequisites

Expand All @@ -20,7 +20,7 @@ grafana/loki-docker-driver:latest \

### Run the services

`docker-compose up`
`docker compose up`

### Access the services
* HotROD application at http://localhost:8080
Expand Down Expand Up @@ -52,4 +52,4 @@ Additionally, there are graphs for each service, visualizing the rate of the req

### Clean up

`docker-compose down`
`docker compose down`
6 changes: 3 additions & 3 deletions examples/hotrod/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@ As of Jaeger v1.42.0 this application was upgraded to use the OpenTelemetry SDK

## Running

### Run everything via `docker-compose`
### Run everything via `docker compose`

* Download `docker-compose.yml` from https://github.com/jaegertracing/jaeger/blob/main/examples/hotrod/docker-compose.yml
* Optional: find the latest Jaeger version (see https://www.jaegertracing.io/download/) and pass it via environment variable `JAEGER_VERSION`. Otherwise `docker compose` will use the `latest` tag, which is fine for the first time you download the images, but once they are in your local registry the `latest` tag is never updated and you may be running stale (and possibly incompatible) verions of Jaeger and the HotROD app.
* Run Jaeger backend and HotROD demo, e.g.:
* `JAEGER_VERSION=1.52 docker-compose -f path-to-yml-file up`
* `JAEGER_VERSION=1.52 docker compose -f path-to-yml-file up`
* Access Jaeger UI at http://localhost:16686 and HotROD app at http://localhost:8080
* Shutdown / cleanup with `docker-compose -f path-to-yml-file down`
* Shutdown / cleanup with `docker compose -f path-to-yml-file down`

Alternatively, you can run each component separately as described below.

Expand Down

0 comments on commit 14e4816

Please sign in to comment.