From 0098d79df4ed2780c154ce5b213dc79fe8749b15 Mon Sep 17 00:00:00 2001
From: Greg Lin <glin@rstudio.com>
Date: Wed, 12 May 2021 17:09:26 -0500
Subject: [PATCH] Fix AWS CLI installation on openSUSE 42

AWS CLI v1 is no longer supported on openSUSE 42's Python 2.7/3.4
---
 builder/Dockerfile.opensuse-42 | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/builder/Dockerfile.opensuse-42 b/builder/Dockerfile.opensuse-42
index f7f9435..27aa035 100644
--- a/builder/Dockerfile.opensuse-42
+++ b/builder/Dockerfile.opensuse-42
@@ -35,8 +35,6 @@ RUN zypper --non-interactive --gpg-auto-import-keys -n install \
     pcre2-devel \
     perl \
     perl-macros \
-    python \
-    python-pip \
     readline-devel \
     rpm-build \
     ruby \
@@ -64,7 +62,10 @@ RUN zypper --non-interactive --gpg-auto-import-keys -n install \
     zlib-devel \
     && zypper clean
 
-RUN pip install awscli
+RUN curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip" && \
+    unzip awscliv2.zip && \
+    ./aws/install && \
+    rm -rf aws awscliv2.zip
 
 # Pin fpm for compatibility with Ruby < 2.3
 RUN gem install ffi:1.12.2 fpm:1.11.0 && \