From d847e06297d1eb5582d8d8261e5a222b680c2216 Mon Sep 17 00:00:00 2001
From: Joe Fong <joe.fong1@nhs.net>
Date: Fri, 26 Jul 2024 12:03:54 +0100
Subject: [PATCH 1/3] bump up node version to 22.5, fix non-buildable
 Dockerfile

---
 image/Dockerfile | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/image/Dockerfile b/image/Dockerfile
index 8181574..b2e21aa 100644
--- a/image/Dockerfile
+++ b/image/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:20-alpine
+FROM node:22.5-alpine
 
 # Install common Dojo scripts
 ENV DOJO_VERSION=0.11.0
@@ -10,10 +10,7 @@ RUN echo "http://dl-cdn.alpinelinux.org/alpine/edge/community" >> /etc/apk/repos
   rm -r /tmp/dojo_git &&\
   echo 'dojo ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers
 
-ENV AWS_CLI_VERSION=2.15.12 BOTO3_VERSION=1.34.23
-RUN apk add --no-cache make python3 py3-pip curl groff &&\
-    python3 -m ensurepip --upgrade &&\
-    python3 -m pip install awscli==${AWS_CLI_VERSION} boto3==${BOTO3_VERSION}
+RUN apk add --no-cache make python3 py3-pip curl groff aws-cli
 
 # Install sequelize postgress native dependencies
 RUN apk add --no-cache postgresql-dev g++ make

From bd9f561c3aa7bcb1d4217cc3b97342f510a4e028 Mon Sep 17 00:00:00 2001
From: chrisbloe-nhse <151756494+chrisbloe-nhse@users.noreply.github.com>
Date: Mon, 5 Aug 2024 11:19:52 +0100
Subject: [PATCH 2/3] Upping github.com/kudulab/docker-ops version to 2.0.1

---
 tasks | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tasks b/tasks
index 137c3c3..f951bc1 100755
--- a/tasks
+++ b/tasks
@@ -2,7 +2,7 @@
 
 set -Eeuo pipefail
 
-DOCKER_OPS_VERSION="2.0.0"
+DOCKER_OPS_VERSION="2.0.1"
 DOCKER_OPS_FILE="ops/docker-ops-${DOCKER_OPS_VERSION}"
 AWS_REGION="eu-west-2"
 

From 6998e7e6d1ba12ce6bcceed57fa3095b038b6923 Mon Sep 17 00:00:00 2001
From: chrisbloe-nhse <151756494+chrisbloe-nhse@users.noreply.github.com>
Date: Mon, 5 Aug 2024 11:22:00 +0100
Subject: [PATCH 3/3] Upping nhsdev/deductions-infra-dojo to v24

---
 Dojofile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dojofile b/Dojofile
index 68f4a63..a731e3f 100644
--- a/Dojofile
+++ b/Dojofile
@@ -1 +1 @@
-DOJO_DOCKER_IMAGE="nhsdev/deductions-infra-dojo:22-d1e07974"
\ No newline at end of file
+DOJO_DOCKER_IMAGE="nhsdev/deductions-infra-dojo:24-47f9f50f"