From 8441b6728b14523ecbe6fbbd895405670036c6c6 Mon Sep 17 00:00:00 2001
From: James Robinson <70377025+JamesPRobinson@users.noreply.github.com>
Date: Wed, 4 Dec 2024 15:32:45 +0000
Subject: [PATCH 1/5] Update node 16 -> 18

---
 Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index ea12a4dc40..5c9a72cdd4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:16-alpine AS builder
+FROM node:18-alpine AS builder
 WORKDIR /app
 COPY dataworkspace/dataworkspace/static/js .
 RUN npm ci --include=dev
@@ -121,4 +121,4 @@ FROM base AS live
 
 CMD ["/dataworkspace/start.sh"]
 
-USER django
\ No newline at end of file
+USER django

From 3f0224a6a6714e1a30db22c614ca5ef64b0d73fb Mon Sep 17 00:00:00 2001
From: James Robinson <70377025+JamesPRobinson@users.noreply.github.com>
Date: Wed, 4 Dec 2024 16:25:53 +0000
Subject: [PATCH 2/5] add engine

---
 dataworkspace/dataworkspace/static/js/package.json | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/dataworkspace/dataworkspace/static/js/package.json b/dataworkspace/dataworkspace/static/js/package.json
index 4590996d6b..50c88ba9af 100644
--- a/dataworkspace/dataworkspace/static/js/package.json
+++ b/dataworkspace/dataworkspace/static/js/package.json
@@ -15,6 +15,9 @@
   "resolutions": {
     "cross-spawn": " 7.0.6"
   },
+  "engines": {
+    "node": "18"
+  },
   "dependencies": {
     "aws-sdk": "^2.1193.0",
     "ckeditor5": "^43.1.1",

From 7d53cdd7582ab275a690ad0837f40ddac0913624 Mon Sep 17 00:00:00 2001
From: James Robinson <70377025+JamesPRobinson@users.noreply.github.com>
Date: Wed, 4 Dec 2024 16:26:30 +0000
Subject: [PATCH 3/5] Update package.json

---
 package.json | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/package.json b/package.json
index 9883518a62..0c8e6b5a4c 100644
--- a/package.json
+++ b/package.json
@@ -37,6 +37,9 @@
   "bugs": {
     "url": "https://github.com/uktrade/data-workspace/issues"
   },
+  "engines": {
+    "node": "18"
+  },
   "homepage": "https://github.com/uktrade/data-workspace#readme",
   "devDependencies": {
     "@testing-library/cypress": "^10.0.1",

From 6cc509dc63e68bc46b413514a44321bc3948a6d8 Mon Sep 17 00:00:00 2001
From: James Robinson <70377025+JamesPRobinson@users.noreply.github.com>
Date: Wed, 4 Dec 2024 16:28:32 +0000
Subject: [PATCH 4/5] Update config.yml

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index bc122d4d83..61bf94157d 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -4,7 +4,7 @@ jobs:
   docker-test-unit-js:
     working_directory: ~/repo/dataworkspace/dataworkspace/static/js
     docker:
-      - image: cimg/node:16.20
+      - image: cimg/node:18
     steps:
       - checkout:
           path: ~/repo

From 8c7fca3782e66e34be0033c3852266d20399a256 Mon Sep 17 00:00:00 2001
From: James Robinson <70377025+JamesPRobinson@users.noreply.github.com>
Date: Wed, 4 Dec 2024 17:19:03 +0000
Subject: [PATCH 5/5] Update config.yml

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 61bf94157d..d62108c376 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -4,7 +4,7 @@ jobs:
   docker-test-unit-js:
     working_directory: ~/repo/dataworkspace/dataworkspace/static/js
     docker:
-      - image: cimg/node:18
+      - image: cimg/node:18.20.4
     steps:
       - checkout:
           path: ~/repo