Skip to content

Commit b0c9530

Browse files
Migrate to docker compose v2 (#5503)
1 parent 9b24675 commit b0c9530

File tree

6 files changed

+13
-13
lines changed

6 files changed

+13
-13
lines changed

.github/workflows/ci.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,8 @@ jobs:
115115
version: [ net6.0, net7.0, net8.0 ]
116116
steps:
117117
- uses: actions/checkout@v4
118-
- name: Run OTLP Exporter docker-compose
119-
run: docker-compose --file=test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/IntegrationTest/docker-compose.yml --file=build/docker-compose.${{ matrix.version }}.yml --project-directory=. up --exit-code-from=tests --build
118+
- name: Run OTLP Exporter docker compose
119+
run: docker compose --file=test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/IntegrationTest/docker-compose.yml --file=build/docker-compose.${{ matrix.version }}.yml --project-directory=. up --exit-code-from=tests --build
120120

121121
w3c-trace-context-integration-test:
122122
needs: detect-changes
@@ -133,8 +133,8 @@ jobs:
133133
version: [ net6.0, net7.0 ]
134134
steps:
135135
- uses: actions/checkout@v4
136-
- name: Run W3C Trace Context docker-compose
137-
run: docker-compose --file=test/OpenTelemetry.Instrumentation.W3cTraceContext.Tests/docker-compose.yml --file=build/docker-compose.${{ matrix.version }}.yml --project-directory=. up --exit-code-from=tests --build
136+
- name: Run W3C Trace Context docker compose
137+
run: docker compose --file=test/OpenTelemetry.Instrumentation.W3cTraceContext.Tests/docker-compose.yml --file=build/docker-compose.${{ matrix.version }}.yml --project-directory=. up --exit-code-from=tests --build
138138

139139
validate-packages:
140140
needs: detect-changes

docs/metrics/exemplars/README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ Prometheus, traces to Tempo.
2020

2121
All these components except the test app require additional configuration to
2222
enable Exemplar feature. To make it easy for users, these components are
23-
pre-configured to enable Exemplars, and a docker-compose is provided to spun
24-
them all up, in the required configurations.
23+
pre-configured to enable Exemplars, and a docker compose file is provided to
24+
spun them all up, in the required configurations.
2525

2626
## Pre-requisite
2727

@@ -36,7 +36,7 @@ spins all of them with the correct configurations to support Exemplars.
3636
Navigate to current directory and run the following:
3737

3838
```sh
39-
docker-compose up -d
39+
docker compose up -d
4040
```
4141

4242
If the above step succeeds, all dependencies would be spun up and ready now. To

examples/MicroserviceExample/README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,14 @@ dotnet run --project WorkerService
3131
```
3232

3333
Instead of running the projects individually, if you are using Docker Desktop,
34-
a `docker-compose` file is provided. This makes standing up the Zipkin and
34+
a `docker compose` file is provided. This makes standing up the Zipkin and
3535
RabbitMQ dependencies easy, as well as starting both applications.
3636

37-
To run the example using `docker-compose`, run the following from this
37+
To run the example using `docker compose`, run the following from this
3838
directory:
3939

4040
```shell
41-
docker-compose up --build
41+
docker compose up --build
4242
```
4343

4444
With everything running:

test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/IntegrationTest/docker-compose.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Starts an OpenTelemetry Collector and then runs the OTLP exporter integration tests.
22
# This should be run from the root of the repo:
3-
# docker-compose --file=test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/IntegrationTest/docker-compose.yml --project-directory=. up --exit-code-from=tests --build
3+
# docker compose --file=test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/IntegrationTest/docker-compose.yml --project-directory=. up --exit-code-from=tests --build
44

55
version: '3.7'
66

test/OpenTelemetry.Instrumentation.W3cTraceContext.Tests/W3CTraceContextTests.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public class W3CTraceContextTests : IDisposable
1818
{
1919
/*
2020
To run the tests, invoke docker-compose.yml from the root of the repo:
21-
opentelemetry>docker-compose --file=test/OpenTelemetry.Instrumentation.W3cTraceContext.Tests/docker-compose.yml --project-directory=. up --exit-code-from=tests --build
21+
opentelemetry>docker compose --file=test/OpenTelemetry.Instrumentation.W3cTraceContext.Tests/docker-compose.yml --project-directory=. up --exit-code-from=tests --build
2222
*/
2323
private const string W3cTraceContextEnvVarName = "OTEL_W3CTRACECONTEXT";
2424
private static readonly Version AspNetCoreHostingVersion = typeof(Microsoft.AspNetCore.Hosting.Builder.IApplicationBuilderFactory).Assembly.GetName().Version;

test/OpenTelemetry.Instrumentation.W3cTraceContext.Tests/docker-compose.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Start a container and then run OpenTelemetry W3C Trace Context tests.
22
# This should be run from the root of the repo:
3-
# opentelemetry>docker-compose --file=test/OpenTelemetry.Instrumentation.W3cTraceContext.Tests/docker-compose.yml --project-directory=. up --exit-code-from=tests --build
3+
# opentelemetry>docker compose --file=test/OpenTelemetry.Instrumentation.W3cTraceContext.Tests/docker-compose.yml --project-directory=. up --exit-code-from=tests --build
44
version: '3.7'
55

66
services:

0 commit comments

Comments
 (0)