Merge branch 'main' into to-latest-99

# Conflicts: # apps/nextjs-app/package.json # apps/nextjs-app/src/components/banner/__tests__/__snapshots__/Banner.test.tsx.snap # apps/vite-app/package.json # packages/common-i18n/package.json # packages/core-lib/package.json # packages/db-main-prisma/package.json # packages/eslint-config-bases/package.json # packages/ts-utils/package.json # packages/ui-lib/package.json # yarn.lock
belgattitude · Oct 20, 2024 · 550ccf0 · 550ccf0
2 parents bd35b6e + 287035e
commit 550ccf0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -1,5 +1,5 @@
-ARG NODE_VERSION=20.16
-ARG ALPINE_VERSION=3.19
+ARG NODE_VERSION=20.18
+ARG ALPINE_VERSION=3.20
 
 #############################################################
 # Stage 1 - App extraction / pruning                        #

diff --git a/docker/docker-compose.db.yml b/docker/docker-compose.db.yml
@@ -3,7 +3,7 @@ name: nextjs-monorepo-example-db
 services:
   main-db:
     container_name: nextjs-monorepo-example-db
-    image: postgres:16.3-alpine3.18
+    image: postgres:17-alpine3.20
     ports:
       - target: 5432
         published: 5432