Skip to content

Commit e179686

Browse files
author
github-actions
committed
Merge remote-tracking branch 'upstream/main'
2 parents dac0185 + a1cfe47 commit e179686

File tree

3 files changed

+4
-2
lines changed

3 files changed

+4
-2
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ the release.
1616
* [accountingservice] bump OpenTelemetry .NET Automatic Instrumentation
1717
to 1.8.0 together with other dependencies
1818
([#1727](https://github.com/open-telemetry/opentelemetry-demo/pull/1727))
19+
* [chore] Fix binding for host's volume mount
20+
([#1728](https://github.com/open-telemetry/opentelemetry-demo/pull/1728))
1921

2022
## 1.11.1
2123

docker-compose.minimal.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -585,7 +585,7 @@ services:
585585
command: ["--config", "/etc/otelcol-config.yml", "--config", "/etc/otelcol-config-extras.yml" ]
586586
user: 0:0
587587
volumes:
588-
- ${HOST_FILESYSTEM}:/hostfs:ro
588+
- ${HOST_FILESYSTEM}:/hostfs:ro,rslave
589589
- ${DOCKER_SOCK}:/var/run/docker.sock:ro
590590
- ${OTEL_COLLECTOR_CONFIG}:/etc/otelcol-config.yml
591591
- ${OTEL_COLLECTOR_CONFIG_EXTRAS}:/etc/otelcol-config-extras.yml

docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -696,7 +696,7 @@ services:
696696
command: ["--config", "/etc/otelcol-config.yml", "--config", "/etc/otelcol-config-extras.yml" ]
697697
user: 0:0
698698
volumes:
699-
- ${HOST_FILESYSTEM}:/hostfs:ro
699+
- ${HOST_FILESYSTEM}:/hostfs:ro,rslave
700700
- ${DOCKER_SOCK}:/var/run/docker.sock:ro
701701
- ${OTEL_COLLECTOR_CONFIG}:/etc/otelcol-config.yml
702702
- ${OTEL_COLLECTOR_CONFIG_EXTRAS}:/etc/otelcol-config-extras.yml

0 commit comments

Comments
 (0)