[PRM-227] Replaced aws-cli pip3 install with APK install

Author: AndyFlintAnswerDigital

services/ehr-out-service/Dockerfile

@@ -21,16 +21,9 @@ COPY --from=builder /usr/local/bin/node /usr/local/bin
 COPY --from=builder /app /app
 
 RUN apk update && \
-    apk add --no-cache bash tini && \
+    apk add --no-cache bash tini aws-cli && \
     rm -rf /var/cache/apk/*
 
-RUN apk add --no-cache \
-        python3 \
-        py3-pip \
-    && pip3 install --upgrade pip \
-    && pip3 install \
-        awscli \
-    && rm -rf /var/cache/apk/*
 
 COPY build/                   /app/build
 

services/ehr-repo/Dockerfile

@@ -22,20 +22,15 @@ COPY --from=builder /app /app
 
 # install python native requirements (again, as per builder)
 # add root CA from deductions team to trusted certificates
+
+# TODO PRM-223 OR PRM-225 (can't remember and jira is broken) - Rip out Tini, hasn't been updated since 2020
+
 RUN apk update && \
     apk -u list && \
     apk upgrade &&  \
-    apk add --no-cache openssl ca-certificates bash tini && \
+    apk add --no-cache openssl ca-certificates bash tini aws-cli && \
     rm -rf /var/cache/apk/*
 
-RUN apk add --no-cache \
-        python3 \
-        py3-pip \
-    && pip3 install --upgrade pip \
-    && pip3 install \
-        awscli \
-    && rm -rf /var/cache/apk/*
-
 COPY build/                   /app/build
 
 COPY scripts/load-api-keys.sh      /app/scripts/load-api-keys.sh

services/gp2gp-messenger/Dockerfile

@@ -3,7 +3,7 @@ FROM node:24-alpine3.23 AS builder
 RUN apk update && \
     apk -u list && \
     apk upgrade && \
-    rm -rf /var/cache/apk/* \
+    rm -rf /var/cache/apk/*
 
 COPY package*.json /app/
 
@@ -22,12 +22,7 @@ COPY --from=builder /usr/local/bin/node /usr/local/bin
 COPY --from=builder /app /app
 
 RUN apk update && apk add openssl ca-certificates git && rm -rf /var/cache/apk/*
-RUN apk add --no-cache \
-        python3 \
-        py3-pip \
-    && pip3 install --upgrade pip \
-    && pip3 install \
-        awscli \
+RUN apk add --no-cache aws-cli \
     && rm -rf /var/cache/apk/*