From f86ae6a1ff994b2de7f9a1b091f511cc39106e7f Mon Sep 17 00:00:00 2001
From: Andrew Hemming <andrew.hemming@redrockconsulting.co.uk>
Date: Mon, 15 Jan 2024 11:27:44 +0000
Subject: [PATCH] Use Alpine image and bump PyYaml version

---
 docker-aws/Dockerfile.http | 8 +++++---
 docker-aws/Dockerfile.wsgi | 6 ++++--
 requirements-dev.txt       | 2 +-
 requirements.txt           | 2 +-
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/docker-aws/Dockerfile.http b/docker-aws/Dockerfile.http
index 9e20888d3..5cf5a4526 100644
--- a/docker-aws/Dockerfile.http
+++ b/docker-aws/Dockerfile.http
@@ -1,5 +1,7 @@
 # Base builds are defined in https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-aws-docker-base
-FROM digitalmarketplace/dmp-http-buildstatic:1.0.0 as buildstatic
+FROM 473251818902.dkr.ecr.eu-west-2.amazonaws.com/dmp-base-http-buildstatic:latest as buildstatic
+COPY . .
+RUN ./scripts/build.sh
 
-FROM digitalmarketplace/dmp-http-frontend:1.0.0
-COPY --from=buildstatic ${APP_DIR}/app/static ${APP_DIR}/static
\ No newline at end of file
+FROM 473251818902.dkr.ecr.eu-west-2.amazonaws.com/dmp-base-http-frontend:latest
+COPY --from=buildstatic ${APP_DIR}/app/static ${APP_DIR}/static
diff --git a/docker-aws/Dockerfile.wsgi b/docker-aws/Dockerfile.wsgi
index 0c5c0b209..14c975972 100644
--- a/docker-aws/Dockerfile.wsgi
+++ b/docker-aws/Dockerfile.wsgi
@@ -1,7 +1,9 @@
 # Base builds are defined in https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-aws-docker-base
-FROM digitalmarketplace/dmp-http-buildstatic:1.0.0 as buildstatic
+FROM 473251818902.dkr.ecr.eu-west-2.amazonaws.com/dmp-base-http-buildstatic:latest as buildstatic
+COPY . ${APP_DIR}
+RUN ./scripts/build.sh
 
-FROM digitalmarketplace/dmp-wsgi:1.0.0
+FROM 473251818902.dkr.ecr.eu-west-2.amazonaws.com/dmp-base-wsgi:latest
 COPY --from=buildstatic ${APP_DIR}/node_modules/digitalmarketplace-govuk-frontend ${APP_DIR}/node_modules/digitalmarketplace-govuk-frontend
 COPY --from=buildstatic ${APP_DIR}/node_modules/govuk-frontend ${APP_DIR}/node_modules/govuk-frontend
 COPY --from=buildstatic ${APP_DIR}/app/content ${APP_DIR}/app/content
diff --git a/requirements-dev.txt b/requirements-dev.txt
index 20c904db1..e809a791c 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -66,7 +66,7 @@ python-dateutil==2.8.1
     #   freezegun
 python-dotenv==0.10.3
     # via -r requirements-dev.in
-pyyaml==5.4.1
+pyyaml==6.0.1
     # via
     #   -c requirements.txt
     #   watchdog
diff --git a/requirements.txt b/requirements.txt
index d628a8b9d..0827dd26a 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -110,7 +110,7 @@ python-json-logger==0.1.11
     # via digitalmarketplace-utils
 pytz==2019.3
     # via digitalmarketplace-utils
-pyyaml==5.4.1
+pyyaml==6.0.1
     # via digitalmarketplace-content-loader
 redis==3.5.3
     # via digitalmarketplace-utils