From 31c719a53e2c0dfdee7c9b480182d52f57ecdf29 Mon Sep 17 00:00:00 2001
From: Lauri Piispanen <lauri@piispanen.fi>
Date: Mon, 24 Jan 2022 23:25:47 +0200
Subject: [PATCH] install AWS CLI v2 directly from AWS

---
 Dockerfile.base | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Dockerfile.base b/Dockerfile.base
index 691a36aa..bbca2079 100644
--- a/Dockerfile.base
+++ b/Dockerfile.base
@@ -18,7 +18,6 @@ RUN echo en_US.UTF-8 UTF-8 >> /etc/locale.gen \
   && apt-key adv --keyserver keyserver.ubuntu.com --recv-keys ${GIT_CORE_PPA_KEY} \
   && apt-get update \
   && apt-get install -y --no-install-recommends \
-    awscli \
     curl \
     tar \
     unzip \
@@ -46,7 +45,9 @@ RUN echo en_US.UTF-8 UTF-8 >> /etc/locale.gen \
   && ( apt-get install -y --no-install-recommends git || apt-get install -t stable -y --no-install-recommends git || apt-get install -y --no-install-recommends git=1:2.33.1-0ppa1~ubuntu18.04.1 git-man=1:2.33.1-0ppa1~ubuntu18.04.1 ) \
   && ( [[ $(apt-cache search -n liblttng-ust0 | awk '{print $1}') == "liblttng-ust0" ]] && apt-get install -y --no-install-recommends liblttng-ust0 || : ) \
   && ( [[ $(apt-cache search -n liblttng-ust1 | awk '{print $1}') == "liblttng-ust1" ]] && apt-get install -y --no-install-recommends liblttng-ust1 || : ) \
-  && pip3 install --no-cache-dir awscliv2 \
+  && curl "https://awscli.amazonaws.com/awscli-exe-linux-$(uname -m).zip" -o "awscliv2.zip" \
+  && unzip awscliv2.zip -d /tmp/ \
+  && /tmp/aws/install \
   # Determine the Distro name (Debian, Ubuntu, etc)
   && distro=$(lsb_release -is | awk '{print tolower($0)}') \
   # Determine the Distro version (bullseye, xenial, etc)