Merge branch 'main' into frontend-update-nodejs-to-latest-lts

julianocosta89 · Jul 15, 2024 · 415240e · 415240e
2 parents 5d81b05 + 8e0275e
commit 415240e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git 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.3.0
+        uses: docker/build-push-action@v6.4.0
         with:
           context: ${{ matrix.file_tag.context }}
           file: ${{ matrix.file_tag.file }}

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,6 +13,8 @@ the release.
   ([#1659](https://github.com/open-telemetry/opentelemetry-demo/pull/1659))
 * [otel-col] Set OTLP receiver endpoint to avoid breaking changes
   ([#1662](https://github.com/open-telemetry/opentelemetry-demo/pull/1662))
+* [accountingservice] increase memory to 120MB
+  ([#1666](https://github.com/open-telemetry/opentelemetry-demo/pull/1666))
 * [frontend] Update nodejs to latest LTS and bump dependencies
   ([#1670](https://github.com/open-telemetry/opentelemetry-demo/pull/1670))
 

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -29,7 +29,7 @@ services:
     deploy:
       resources:
         limits:
-          memory: 50M
+          memory: 120M
     restart: unless-stopped
     environment:
       - KAFKA_SERVICE_ADDR