From 5a4f914ac388e4978947c2e96441f7be3f1f9e81 Mon Sep 17 00:00:00 2001
From: jbpenrath <jb.penrath@gmail.com>
Date: Thu, 24 Oct 2024 12:10:51 +0200
Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A7(docker)=20upgrade=20node=20images?=
 =?UTF-8?q?=20to=20latest=2018=20version?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Upgrade all node images to use the latest 18 version.
---
 .circleci/config.yml            | 12 ++++++------
 Dockerfile                      |  2 +-
 docker/images/admin/Dockerfile  |  5 +----
 src/frontend/admin/package.json |  2 +-
 src/mail/package.json           |  2 +-
 5 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 07e160d74..40dff9365 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -244,7 +244,7 @@ jobs:
   # ---- mail jobs ----
   build-mails:
     docker:
-      - image: cimg/node:18.18
+      - image: cimg/node:18.20
         auth:
           username: $DOCKER_HUB_USER
           password: $DOCKER_HUB_PASSWORD
@@ -275,7 +275,7 @@ jobs:
   # ---- frontend admin jobs ----
   build-test-front-admin:
     docker:
-      - image: cimg/node:18.18
+      - image: cimg/node:18.20
         auth:
           username: $DOCKER_HUB_USER
           password: $DOCKER_HUB_PASSWORD
@@ -323,7 +323,7 @@ jobs:
 
   lint-front-admin:
     docker:
-      - image: cimg/node:18.18
+      - image: cimg/node:18.20
         auth:
           username: $DOCKER_HUB_USER
           password: $DOCKER_HUB_PASSWORD
@@ -341,7 +341,7 @@ jobs:
 
   test-front-admin:
     docker:
-      - image: cimg/node:18.18
+      - image: cimg/node:18.20
         auth:
           username: $DOCKER_HUB_USER
           password: $DOCKER_HUB_PASSWORD
@@ -362,7 +362,7 @@ jobs:
 
   test-e2e-front-admin:
     docker:
-      - image: cimg/node:18.18
+      - image: cimg/node:18.20
         auth:
           username: $DOCKER_HUB_USER
           password: $DOCKER_HUB_PASSWORD
@@ -390,7 +390,7 @@ jobs:
 
   test-playwright-ct-front-admin:
     docker:
-      - image: cimg/node:18.18
+      - image: cimg/node:18.20
         auth:
           username: $DOCKER_HUB_USER
           password: $DOCKER_HUB_PASSWORD
diff --git a/Dockerfile b/Dockerfile
index ecce8f873..3ad5b129f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -24,7 +24,7 @@ RUN mkdir /install && \
 
 
 # ---- mails ----
-FROM node:16 AS mail-builder
+FROM node:18.20-slim AS mail-builder
 
 COPY ./src/mail /mail/app
 
diff --git a/docker/images/admin/Dockerfile b/docker/images/admin/Dockerfile
index ad6a41971..ec31bb13b 100644
--- a/docker/images/admin/Dockerfile
+++ b/docker/images/admin/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:18.19-slim as builder
+FROM node:18.20-slim as builder
 
 WORKDIR /app
 
@@ -14,6 +14,3 @@ FROM nginxinc/nginx-unprivileged:1.25 as production
 
 COPY docker/files/admin/etc/nginx/conf.d/default.conf /etc/nginx/conf.d/default.conf
 COPY --from=builder /app/out /app/admin
-
-
-
diff --git a/src/frontend/admin/package.json b/src/frontend/admin/package.json
index ede4208d2..fdf6192ee 100644
--- a/src/frontend/admin/package.json
+++ b/src/frontend/admin/package.json
@@ -109,6 +109,6 @@
     "workerDirectory": "public"
   },
   "volta": {
-    "node": "18.18.2"
+    "node": "18.20.4"
   }
 }
diff --git a/src/mail/package.json b/src/mail/package.json
index 575670c80..8a0e95500 100644
--- a/src/mail/package.json
+++ b/src/mail/package.json
@@ -14,7 +14,7 @@
     "build": "yarn build-mjml-to-html; yarn build-html-to-plain-text;"
   },
   "volta": {
-    "node": "16.15.1"
+    "node": "18.20.4"
   },
   "repository": "https://github.com/openfun/joanie",
   "author": "France Université Numérique",