diff --git a/.github/workflows/component-build-images.yml b/.github/workflows/component-build-images.yml index 25aebff10e..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.7.0 + uses: docker/build-push-action@v6.9.0 with: context: ${{ matrix.file_tag.context }} file: ${{ matrix.file_tag.file }} diff --git a/CHANGELOG.md b/CHANGELOG.md index f18c123900..f7da2e247f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,11 @@ the release. ([#1709](https://github.com/open-telemetry/opentelemetry-demo/pull/1709)) * [chore] Move dependencies control to .env file ([#1715](https://github.com/open-telemetry/opentelemetry-demo/pull/1715)) +* [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 e8821148e6..0c63bd0bae 100644 --- a/docker-compose.minimal.yml +++ b/docker-compose.minimal.yml @@ -587,7 +587,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 e086e634dd..20b520fca6 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -702,7 +702,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/src/accountingservice/AccountingService.csproj b/src/accountingservice/AccountingService.csproj index 3a26192587..5b1ac99a68 100644 --- a/src/accountingservice/AccountingService.csproj +++ b/src/accountingservice/AccountingService.csproj @@ -9,15 +9,15 @@ - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + +