From 7cd3a9de54cc67c4600b6fca792fb967e878bb7c Mon Sep 17 00:00:00 2001
From: Jason <jason.mcintosh@armory.io>
Date: Wed, 23 Aug 2023 09:24:19 -0500
Subject: [PATCH] =?UTF-8?q?chore(upgrades):=20Upgrade=20Ubuntu=20to=20late?=
 =?UTF-8?q?st=20release=20and=20fixes=20aws=20cli=20i=E2=80=A6=20(#5996)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore(upgrades): Upgrade Ubuntu to latest release and fixes aws cli installer to match slim version

* fix(typo): Fix removing pip had a typo
---
 Dockerfile.ubuntu | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/Dockerfile.ubuntu b/Dockerfile.ubuntu
index 1fdf030cda2..019b0e97b73 100644
--- a/Dockerfile.ubuntu
+++ b/Dockerfile.ubuntu
@@ -1,8 +1,10 @@
-FROM ubuntu:bionic
+FROM ubuntu:jammy
 LABEL maintainer="sig-platform@spinnaker.io"
 ARG TARGETARCH
 ENV GOOGLE_CLOUD_SDK_VERSION=412.0.0
 ENV PATH "$PATH:/opt/google-cloud-sdk/bin/"
+ENV AWS_CLI_VERSION=1.22
+ENV AWS_CLI_S3_CMD=2.0.2
 
 RUN apt-get update && apt-get install -y curl gnupg && \
   curl -s https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key add - && \
@@ -13,13 +15,16 @@ RUN apt-get update && apt-get install -y curl gnupg && \
   openjdk-11-jre-headless \
   wget \
   kubectl \
-  python-pip \
+  python3-pip \
   python3 \
   git \
   openssh-client && \
-  pip install awscli==1.18.152 --upgrade && \
   rm -rf ~/.config/gcloud
 
+# AWS CLI
+RUN pip install --upgrade  --no-build-isolation awscli==${AWS_CLI_VERSION} s3cmd==${AWS_CLI_S3_CMD} python-magic \
+  && apt remove -y python3-pip
+
 RUN curl -o  /usr/local/bin/aws-iam-authenticator https://amazon-eks.s3.us-west-2.amazonaws.com/1.16.8/2020-04-16/bin/linux/${TARGETARCH}/aws-iam-authenticator && \
   chmod +x /usr/local/bin/aws-iam-authenticator && \
   ln -s    /usr/local/bin/aws-iam-authenticator /usr/local/bin/heptio-authenticator-aws