Merge branch 'main' into edit-copy-features

Author: matthijsln

.github/workflows/test-and-deploy.yml

@@ -1,7 +1,7 @@
 name: 'Test and deploy'
 
 env: # Keep this in sync with Dockerfile version
-  NODE_VERSION: "22.21.0"
+  NODE_VERSION: "22.21.1"
 
 concurrency:
   group: ${{ github.workflow }}-${{ ( github.ref == 'refs/heads/main' || github.ref == 'refs/heads/release' ) && format('ci-main-{0}', github.sha) || format('ci-main-{0}', github.ref) }}

Dockerfile

@@ -2,7 +2,7 @@ ARG VERSION=snapshot
 ARG API_VERSION=snapshot
 
 # Note when updating this version also update the version in the workflow files
-FROM node:22.21.0 AS builder
+FROM node:22.21.1 AS builder
 
 ARG BASE_HREF=/
 

ci/tailormap-embed-test/Dockerfile

@@ -1,4 +1,4 @@
-FROM nginx:1.29.2-alpine
+FROM nginx:1.29.3-alpine
 
 COPY entrypoint.sh /docker-entrypoint.d
 COPY index.html /usr/share/nginx/html

docker-compose.yml

@@ -58,14 +58,14 @@ services:
 
   db:
     container_name: ${COMPOSE_PROJECT_NAME}-db
-    image: postgis/postgis:17-3.5-alpine
+    image: postgis/postgis:18-3.6-alpine
     environment:
       POSTGRES_PASSWORD: ${TAILORMAP_DB_PASSWORD:-tailormap}
       POSTGRES_USER: tailormap
       POSTGRES_DB: tailormap
       PGUSER: postgres # for pg_isready
     volumes:
-      - db:/var/lib/postgresql/data
+      - db:/var/lib/postgresql
     healthcheck:
       test: 'pg_isready -U tailormap'
     restart: unless-stopped
@@ -124,7 +124,7 @@ services:
 
   prometheus:
     container_name: ${COMPOSE_PROJECT_NAME}-prometheus
-    image: prom/prometheus:v3.7.2
+    image: prom/prometheus:v3.7.3
     profiles:
       - prometheus
     environment: