Upgrade dependencies for v2024.3. (#838)

lognaturel · web-flow · commit 801ab503c74e · 2024-12-09T23:55:06.000-05:00
* Use node 22.12.0 Docker images

* Upgrade Enketo

* Fix dependency vulnerabilities

* Use pyxform 3.0.0
diff --git a/.github/workflows/test-nginx.yml b/.github/workflows/test-nginx.yml
@@ -16,7 +16,7 @@ jobs:
         submodules: recursive
     - uses: actions/setup-node@v4
       with:
-        node-version: 20.17.0
+        node-version: 22.12.0
     - run: cd test && npm i
     - run: cd test && ./run-tests.sh
 
diff --git a/client b/client
@@ -1 +1 @@
-Subproject commit 99b11a8cc7d30dbc03376f97ab345dc0d18c2a98
+Subproject commit 3fb0c22b1cbdc3a6004963afcc3847a82c09307d
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -108,7 +108,7 @@ services:
       options:
         max-file: "30"
   pyxform:
-    image: 'ghcr.io/getodk/pyxform-http:v2.1.1'
+    image: 'ghcr.io/getodk/pyxform-http:v3.0.0'
     restart: always
   secrets:
     volumes:
diff --git a/enketo.dockerfile b/enketo.dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/enketo/enketo:7.4.0
+FROM ghcr.io/enketo/enketo:7.5.0
 
 ENV ENKETO_SRC_DIR=/srv/src/enketo/packages/enketo-express
 WORKDIR ${ENKETO_SRC_DIR}
diff --git a/nginx.dockerfile b/nginx.dockerfile
@@ -1,4 +1,4 @@
-FROM node:20.17.0-slim AS intermediate
+FROM node:22.12.0-slim AS intermediate
 
 RUN apt-get update \
     && apt-get install -y --no-install-recommends \
diff --git a/secrets.dockerfile b/secrets.dockerfile
@@ -1,3 +1,3 @@
-FROM node:20.17.0-slim
+FROM node:22.12.0-slim
 
 COPY files/enketo/generate-secrets.sh ./
diff --git a/server b/server
@@ -1 +1 @@
-Subproject commit 63ca7881f6e6eb0b5c9051bf64448d802720f100
+Subproject commit b4754cf52bfa64b1ca841bc9ccb64a38726398e8
diff --git a/service.dockerfile b/service.dockerfile
@@ -1,4 +1,4 @@
-ARG node_version=20.17.0
+ARG node_version=22.12.0
 
 
 
diff --git a/test/mock-http-server/package-lock.json b/test/mock-http-server/package-lock.json

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM ghcr.io/enketo/enketo:7.4.0`
	`1`	`+FROM ghcr.io/enketo/enketo:7.5.0`
`2`	`2`
`3`	`3`	`ENV ENKETO_SRC_DIR=/srv/src/enketo/packages/enketo-express`
`4`	`4`	`WORKDIR ${ENKETO_SRC_DIR}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM node:20.17.0-slim AS intermediate`
	`1`	`+FROM node:22.12.0-slim AS intermediate`
`2`	`2`
`3`	`3`	`RUN apt-get update \`
`4`	`4`	`&& apt-get install -y --no-install-recommends \`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`		`-FROM node:20.17.0-slim`
	`1`	`+FROM node:22.12.0-slim`
`2`	`2`
`3`	`3`	`COPY files/enketo/generate-secrets.sh ./`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-ARG node_version=20.17.0`
	`1`	`+ARG node_version=22.12.0`
`2`	`2`
`3`	`3`
`4`	`4`