Merge branch 'main' into dotnetUpdateBuilder

open-telemetry · Jul 18, 2023 · e2eccde · e2eccde
2 parents 1b1a2a1 + f174613
commit e2eccde
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -51,6 +51,8 @@ release.
   ([#938](https://github.com/open-telemetry/opentelemetry-demo/pull/938))
 * [shippingservice] Update Rust dependencies and add TelemetryResourceDetector
   ([#972](https://github.com/open-telemetry/opentelemetry-demo/pull/972))
+* Update frontendproxy's env for minimal
+  ([#983](https://github.com/open-telemetry/opentelemetry-demo/pull/983))
 
 ## 1.4.0
 

diff --git a/docker-compose.minimal.yml b/docker-compose.minimal.yml
@@ -254,7 +254,8 @@ services:
       - JAEGER_SERVICE_PORT
       - JAEGER_SERVICE_HOST
       - OTEL_COLLECTOR_HOST
-      - OTEL_COLLECTOR_PORT
+      - OTEL_COLLECTOR_PORT_GRPC
+      - OTEL_COLLECTOR_PORT_HTTP
       - ENVOY_PORT
     depends_on:
       frontend: