From 10048aa27eaf36304165b8ac1e9f61377a598b5b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 Sep 2024 14:59:07 +0200 Subject: [PATCH 1/2] build(deps): bump docker/build-push-action from 6.8.0 to 6.9.0 (#1730) Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 6.8.0 to 6.9.0. - [Release notes](https://github.com/docker/build-push-action/releases) - [Commits](https://github.com/docker/build-push-action/compare/v6.8.0...v6.9.0) --- updated-dependencies: - dependency-name: docker/build-push-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/component-build-images.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/component-build-images.yml b/.github/workflows/component-build-images.yml index 03ed4d52cd..1b76ddf611 100644 --- a/.github/workflows/component-build-images.yml +++ b/.github/workflows/component-build-images.yml @@ -162,7 +162,7 @@ jobs: max-parallelism = 2 - name: Matrix Build and push demo images if: steps.check_changes.outputs.skip == 'false' - uses: docker/build-push-action@v6.8.0 + uses: docker/build-push-action@v6.9.0 with: context: ${{ matrix.file_tag.context }} file: ${{ matrix.file_tag.file }} From a1cfe470c6c1e412865b351e473060b66674b2fb Mon Sep 17 00:00:00 2001 From: Roger Coll Date: Mon, 7 Oct 2024 09:14:17 +0200 Subject: [PATCH 2/2] fix: mount host filesystem as bind rslave mount (#1728) * fix: mount host filesystem as bind rslave mount * chore: add changelog entry --------- Co-authored-by: Juliano Costa --- CHANGELOG.md | 2 ++ docker-compose.minimal.yml | 2 +- docker-compose.yml | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0906b9a361..0256ebf0cd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,8 @@ the release. * [accountingservice] bump OpenTelemetry .NET Automatic Instrumentation to 1.8.0 together with other dependencies ([#1727](https://github.com/open-telemetry/opentelemetry-demo/pull/1727)) +* [chore] Fix binding for host's volume mount + ([#1728](https://github.com/open-telemetry/opentelemetry-demo/pull/1728)) ## 1.11.1 diff --git a/docker-compose.minimal.yml b/docker-compose.minimal.yml index f10ad9470a..68fe04d93e 100644 --- a/docker-compose.minimal.yml +++ b/docker-compose.minimal.yml @@ -585,7 +585,7 @@ services: command: [ "--config=/etc/otelcol-config.yml", "--config=/etc/otelcol-config-extras.yml" ] user: 0:0 volumes: - - ${HOST_FILESYSTEM}:/hostfs:ro + - ${HOST_FILESYSTEM}:/hostfs:ro,rslave - ${DOCKER_SOCK}:/var/run/docker.sock:ro - ${OTEL_COLLECTOR_CONFIG}:/etc/otelcol-config.yml - ${OTEL_COLLECTOR_CONFIG_EXTRAS}:/etc/otelcol-config-extras.yml diff --git a/docker-compose.yml b/docker-compose.yml index ab38c239ae..33358b6f4a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -696,7 +696,7 @@ services: command: [ "--config=/etc/otelcol-config.yml", "--config=/etc/otelcol-config-extras.yml" ] user: 0:0 volumes: - - ${HOST_FILESYSTEM}:/hostfs:ro + - ${HOST_FILESYSTEM}:/hostfs:ro,rslave - ${DOCKER_SOCK}:/var/run/docker.sock:ro - ${OTEL_COLLECTOR_CONFIG}:/etc/otelcol-config.yml - ${OTEL_COLLECTOR_CONFIG_EXTRAS}:/etc/otelcol-config-extras.yml