Merge pull request #151 from wunderio/feature/awscli-update

Updated aws cli in silta-cicd images
wunderio · Feb 6, 2024 · 2a6a482 · 2a6a482
2 parents 61848aa + 0f597fc
commit 2a6a482
Show file tree

Hide file tree

Showing 20 changed files with 128 additions and 108 deletions.
diff --git a/silta-cicd/circleci-php7.2-node14-composer1/Dockerfile b/silta-cicd/circleci-php7.2-node14-composer1/Dockerfile
@@ -25,13 +25,14 @@ RUN echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] https://packages.
   && sudo apt-get install apt-transport-https ca-certificates \
   && curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | sudo apt-key --keyring /usr/share/keyrings/cloud.google.gpg add - \
   && sudo apt-get update && sudo apt-get install google-cloud-sdk-gke-gcloud-auth-plugin kubectl \
-  && sudo apt-get clean
-
-# Install AWS cli and aws-iam-authenticator
-RUN sudo apt install -y awscli git python3 \
-  && curl -o /tmp/aws-iam-authenticator https://amazon-eks.s3.us-west-2.amazonaws.com/1.18.9/2020-11-02/bin/linux/amd64/aws-iam-authenticator \
-  && chmod +x /tmp/aws-iam-authenticator \ 
-  && sudo mv /tmp/aws-iam-authenticator /bin/aws-iam-authenticator
+  && sudo apt install -y git python3 \
+  && sudo apt-get install -y unzip curl \
+  && sudo apt-get clean \
+  && sudo curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip" \
+  && sudo  unzip awscliv2.zip \
+  && sudo ./aws/install \
+  && sudo  rm -rf awscliv2.zip \
+  && sudo  rm -rf ./aws
 
 # Install Helm 3
 ENV HELM_VERSION v3.13.3

diff --git a/silta-cicd/circleci-php7.3-node12-composer1/Dockerfile b/silta-cicd/circleci-php7.3-node12-composer1/Dockerfile
@@ -20,13 +20,14 @@ RUN echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] https://packages.
   && sudo apt-get install apt-transport-https ca-certificates \
   && curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | sudo apt-key --keyring /usr/share/keyrings/cloud.google.gpg add - \
   && sudo apt-get update && sudo apt-get install google-cloud-sdk-gke-gcloud-auth-plugin kubectl \
-  && sudo apt-get clean
-
-# Install AWS cli and aws-iam-authenticator
-RUN sudo apt install -y awscli git python3 \
-  && curl -o /tmp/aws-iam-authenticator https://amazon-eks.s3.us-west-2.amazonaws.com/1.18.9/2020-11-02/bin/linux/amd64/aws-iam-authenticator \
-  && chmod +x /tmp/aws-iam-authenticator \ 
-  && sudo mv /tmp/aws-iam-authenticator /bin/aws-iam-authenticator
+  && sudo apt install -y git python3 \
+  && sudo apt-get install -y unzip curl \
+  && sudo apt-get clean \
+  && sudo curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip" \
+  && sudo  unzip awscliv2.zip \
+  && sudo ./aws/install \
+  && sudo  rm -rf awscliv2.zip \
+  && sudo  rm -rf ./aws
 
 # Install Helm 3
 ENV HELM_VERSION v3.13.3

diff --git a/silta-cicd/circleci-php7.3-node14-composer1/Dockerfile b/silta-cicd/circleci-php7.3-node14-composer1/Dockerfile
@@ -25,13 +25,14 @@ RUN echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] https://packages.
   && sudo apt-get install apt-transport-https ca-certificates \
   && curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | sudo apt-key --keyring /usr/share/keyrings/cloud.google.gpg add - \
   && sudo apt-get update && sudo apt-get install google-cloud-sdk-gke-gcloud-auth-plugin kubectl \
-  && sudo apt-get clean
-
-# Install AWS cli and aws-iam-authenticator
-RUN sudo apt install -y awscli git python3 \
-  && curl -o /tmp/aws-iam-authenticator https://amazon-eks.s3.us-west-2.amazonaws.com/1.18.9/2020-11-02/bin/linux/amd64/aws-iam-authenticator \
-  && chmod +x /tmp/aws-iam-authenticator \ 
-  && sudo mv /tmp/aws-iam-authenticator /bin/aws-iam-authenticator
+  && sudo apt install -y git python3 \
+  && sudo apt-get install -y unzip curl \
+  && sudo apt-get clean \
+  && sudo curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip" \
+  && sudo  unzip awscliv2.zip \
+  && sudo ./aws/install \
+  && sudo  rm -rf awscliv2.zip \
+  && sudo  rm -rf ./aws
 
 # Install Helm 3
 ENV HELM_VERSION v3.13.3

diff --git a/silta-cicd/circleci-php7.3-node14-composer1/TAGS b/silta-cicd/circleci-php7.3-node14-composer1/TAGS
@@ -1,3 +1,3 @@
 circleci-php7.3-node14-composer1-v1
-circleci-php7.3-node14-composer1-v1.2
-circleci-php7.3-node14-composer1-v1.2.0
+circleci-php7.3-node14-composer1-v1.3
+circleci-php7.3-node14-composer1-v1.3.0
diff --git a/silta-cicd/circleci-php7.3-node14-composer2/Dockerfile b/silta-cicd/circleci-php7.3-node14-composer2/Dockerfile
@@ -20,13 +20,14 @@ RUN echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] https://packages.
   && sudo apt-get install apt-transport-https ca-certificates \
   && curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | sudo apt-key --keyring /usr/share/keyrings/cloud.google.gpg add - \
   && sudo apt-get update && sudo apt-get install google-cloud-sdk-gke-gcloud-auth-plugin kubectl \
-  && sudo apt-get clean
-
-# Install AWS cli and aws-iam-authenticator
-RUN sudo apt install -y awscli git python3 \
-  && curl -o /tmp/aws-iam-authenticator https://amazon-eks.s3.us-west-2.amazonaws.com/1.18.9/2020-11-02/bin/linux/amd64/aws-iam-authenticator \
-  && chmod +x /tmp/aws-iam-authenticator \ 
-  && sudo mv /tmp/aws-iam-authenticator /bin/aws-iam-authenticator
+  && sudo apt install -y git python3 \
+  && sudo apt-get install -y unzip curl \
+  && sudo apt-get clean \
+  && sudo curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip" \
+  && sudo  unzip awscliv2.zip \
+  && sudo ./aws/install \
+  && sudo  rm -rf awscliv2.zip \
+  && sudo  rm -rf ./aws
 
 # Install Helm 3
 ENV HELM_VERSION v3.13.3

diff --git a/silta-cicd/circleci-php7.3-node14-composer2/TAGS b/silta-cicd/circleci-php7.3-node14-composer2/TAGS
@@ -1,3 +1,3 @@
 circleci-php7.3-node14-composer2-v1
-circleci-php7.3-node14-composer2-v1.2
-circleci-php7.3-node14-composer2-v1.2.0
+circleci-php7.3-node14-composer2-v1.3
+circleci-php7.3-node14-composer2-v1.3.0
diff --git a/silta-cicd/circleci-php7.4-node14-composer1/Dockerfile b/silta-cicd/circleci-php7.4-node14-composer1/Dockerfile
@@ -25,13 +25,14 @@ RUN echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] https://packages.
   && sudo apt-get install apt-transport-https ca-certificates \
   && curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | sudo apt-key --keyring /usr/share/keyrings/cloud.google.gpg add - \
   && sudo apt-get update && sudo apt-get install google-cloud-sdk-gke-gcloud-auth-plugin kubectl \
-  && sudo apt-get clean
-
-# Install AWS cli and aws-iam-authenticator
-RUN sudo apt install -y awscli git python3 \
-  && curl -o /tmp/aws-iam-authenticator https://amazon-eks.s3.us-west-2.amazonaws.com/1.18.9/2020-11-02/bin/linux/amd64/aws-iam-authenticator \
-  && chmod +x /tmp/aws-iam-authenticator \ 
-  && sudo mv /tmp/aws-iam-authenticator /bin/aws-iam-authenticator
+  && sudo apt install -y git python3 \
+  && sudo apt-get install -y unzip curl \
+  && sudo apt-get clean \
+  && sudo curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip" \
+  && sudo  unzip awscliv2.zip \
+  && sudo ./aws/install \
+  && sudo  rm -rf awscliv2.zip \
+  && sudo  rm -rf ./aws
 
 # Install Helm 3
 ENV HELM_VERSION v3.13.3

diff --git a/silta-cicd/circleci-php7.4-node14-composer1/TAGS b/silta-cicd/circleci-php7.4-node14-composer1/TAGS
@@ -1,3 +1,3 @@
 circleci-php7.4-node14-composer1-v1
-circleci-php7.4-node14-composer1-v1.2
-circleci-php7.4-node14-composer1-v1.2.0
+circleci-php7.4-node14-composer1-v1.3
+circleci-php7.4-node14-composer1-v1.3.0
diff --git a/silta-cicd/circleci-php7.4-node14-composer2/Dockerfile b/silta-cicd/circleci-php7.4-node14-composer2/Dockerfile
@@ -20,13 +20,14 @@ RUN echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] https://packages.
   && sudo apt-get install apt-transport-https ca-certificates \
   && curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | sudo apt-key --keyring /usr/share/keyrings/cloud.google.gpg add - \
   && sudo apt-get update && sudo apt-get install google-cloud-sdk-gke-gcloud-auth-plugin kubectl \
-  && sudo apt-get clean
-
-# Install AWS cli and aws-iam-authenticator
-RUN sudo apt install -y awscli git python3 \
-  && curl -o /tmp/aws-iam-authenticator https://amazon-eks.s3.us-west-2.amazonaws.com/1.18.9/2020-11-02/bin/linux/amd64/aws-iam-authenticator \
-  && chmod +x /tmp/aws-iam-authenticator \ 
-  && sudo mv /tmp/aws-iam-authenticator /bin/aws-iam-authenticator
+  && sudo apt install -y git python3 \
+  && sudo apt-get install -y unzip curl \
+  && sudo apt-get clean \
+  && sudo curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip" \
+  && sudo  unzip awscliv2.zip \
+  && sudo ./aws/install \
+  && sudo  rm -rf awscliv2.zip \
+  && sudo  rm -rf ./aws
 
 # Install Helm 3
 ENV HELM_VERSION v3.13.3

diff --git a/silta-cicd/circleci-php7.4-node14-composer2/TAGS b/silta-cicd/circleci-php7.4-node14-composer2/TAGS
@@ -1,3 +1,3 @@
 circleci-php7.4-node14-composer2-v1
-circleci-php7.4-node14-composer2-v1.2
-circleci-php7.4-node14-composer2-v1.2.0
+circleci-php7.4-node14-composer2-v1.3
+circleci-php7.4-node14-composer2-v1.3.0
diff --git a/silta-cicd/circleci-php7.4-node16-composer1/Dockerfile b/silta-cicd/circleci-php7.4-node16-composer1/Dockerfile
@@ -25,13 +25,14 @@ RUN echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] https://packages.
   && sudo apt-get install apt-transport-https ca-certificates \
   && curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | sudo apt-key --keyring /usr/share/keyrings/cloud.google.gpg add - \
   && sudo apt-get update && sudo apt-get install google-cloud-sdk-gke-gcloud-auth-plugin kubectl \
-  && sudo apt-get clean
-
-# Install AWS cli and aws-iam-authenticator
-RUN sudo apt install -y awscli git python3 \
-  && curl -o /tmp/aws-iam-authenticator https://amazon-eks.s3.us-west-2.amazonaws.com/1.18.9/2020-11-02/bin/linux/amd64/aws-iam-authenticator \
-  && chmod +x /tmp/aws-iam-authenticator \
-  && sudo mv /tmp/aws-iam-authenticator /bin/aws-iam-authenticator
+  && sudo apt install -y git python3 \
+  && sudo apt-get install -y unzip curl \
+  && sudo apt-get clean \
+  && sudo curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip" \
+  && sudo  unzip awscliv2.zip \
+  && sudo ./aws/install \
+  && sudo  rm -rf awscliv2.zip \
+  && sudo  rm -rf ./aws
 
 # Install Helm 3
 ENV HELM_VERSION v3.13.3

diff --git a/silta-cicd/circleci-php7.4-node16-composer1/TAGS b/silta-cicd/circleci-php7.4-node16-composer1/TAGS
@@ -1,3 +1,3 @@
 circleci-php7.4-node16-composer1-v1
-circleci-php7.4-node16-composer1-v1.2
-circleci-php7.4-node16-composer1-v1.2.0
+circleci-php7.4-node16-composer1-v1.3
+circleci-php7.4-node16-composer1-v1.3.0
diff --git a/silta-cicd/circleci-php8.0-node14-composer2/Dockerfile b/silta-cicd/circleci-php8.0-node14-composer2/Dockerfile
@@ -19,13 +19,14 @@ RUN echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] https://packages.
   && sudo apt-get install apt-transport-https ca-certificates \
   && curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | sudo apt-key --keyring /usr/share/keyrings/cloud.google.gpg add - \
   && sudo apt-get update && sudo apt-get install google-cloud-sdk-gke-gcloud-auth-plugin kubectl \
-  && sudo apt-get clean
-
-# Install AWS cli and aws-iam-authenticator
-RUN sudo apt install -y awscli git python3 \
-  && curl -o /tmp/aws-iam-authenticator https://amazon-eks.s3.us-west-2.amazonaws.com/1.18.9/2020-11-02/bin/linux/amd64/aws-iam-authenticator \
-  && chmod +x /tmp/aws-iam-authenticator \ 
-  && sudo mv /tmp/aws-iam-authenticator /bin/aws-iam-authenticator
+  && sudo apt install -y git python3 \
+  && sudo apt-get install -y unzip curl \
+  && sudo apt-get clean \
+  && sudo curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip" \
+  && sudo  unzip awscliv2.zip \
+  && sudo ./aws/install \
+  && sudo  rm -rf awscliv2.zip \
+  && sudo  rm -rf ./aws
 
 # Install Helm 3
 ENV HELM_VERSION v3.13.3

diff --git a/silta-cicd/circleci-php8.0-node14-composer2/TAGS b/silta-cicd/circleci-php8.0-node14-composer2/TAGS
@@ -1,3 +1,3 @@
 circleci-php8.0-node14-composer2-v1
-circleci-php8.0-node14-composer2-v1.2
-circleci-php8.0-node14-composer2-v1.2.0
+circleci-php8.0-node14-composer2-v1.3
+circleci-php8.0-node14-composer2-v1.3.0
diff --git a/silta-cicd/circleci-php8.0-node16-composer2/Dockerfile b/silta-cicd/circleci-php8.0-node16-composer2/Dockerfile
@@ -6,28 +6,24 @@ ENV PATH="/home/circleci/.composer/vendor/bin:${PATH}"
 # Upgrade packages
 RUN sudo apt update && sudo apt upgrade && sudo apt clean
 
-# Install drush
-ENV DRUSH_LAUNCHER_VERSION 0.9.1
-RUN sudo wget -q https://github.com/drush-ops/drush-launcher/releases/download/${DRUSH_LAUNCHER_VERSION}/drush.phar -O /usr/local/bin/drush \
-  && sudo chmod +x /usr/local/bin/drush
-
-# Install vim based on popular demand.
-RUN sudo apt-get update && sudo apt-get install vim && sudo apt-get clean
-
-# Add gcloud CLI and kubectl
-ENV GCLOUD_VERSION 392.0.0-0
-ENV USE_GKE_GCLOUD_AUTH_PLUGIN=True
 RUN echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] https://packages.cloud.google.com/apt cloud-sdk main" | sudo tee -a /etc/apt/sources.list.d/google-cloud-sdk.list \
   && sudo apt-get install apt-transport-https ca-certificates \
   && curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | sudo apt-key --keyring /usr/share/keyrings/cloud.google.gpg add - \
-  && sudo apt-get update && sudo apt-get install google-cloud-sdk-gke-gcloud-auth-plugin kubectl \
-  && sudo apt-get clean
+  && sudo apt-get update && sudo apt-get install kubectl
+
+# Install vim based on popular demand.
+RUN sudo apt-get install vim && sudo apt-get clean
+
+# Install AWS cli, aws-iam-authenticator, git, python
+RUN sudo apt install -y git python3 \
+  && sudo apt-get install -y unzip curl \
+  && sudo apt-get clean \
+  && sudo curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip" \
+  && sudo  unzip awscliv2.zip \
+  && sudo ./aws/install \
+  && sudo  rm -rf awscliv2.zip \
+  && sudo  rm -rf ./aws
 
-# Install AWS cli and aws-iam-authenticator
-RUN sudo apt install -y awscli git python3 \
-  && curl -o /tmp/aws-iam-authenticator https://amazon-eks.s3.us-west-2.amazonaws.com/1.18.9/2020-11-02/bin/linux/amd64/aws-iam-authenticator \
-  && chmod +x /tmp/aws-iam-authenticator \ 
-  && sudo mv /tmp/aws-iam-authenticator /bin/aws-iam-authenticator
 
 # Install Helm 3
 ENV HELM_VERSION v3.13.3

diff --git a/silta-cicd/circleci-php8.0-node16-composer2/TAGS b/silta-cicd/circleci-php8.0-node16-composer2/TAGS
@@ -1,3 +1,3 @@
 circleci-php8.0-node16-composer2-v1
-circleci-php8.0-node16-composer2-v1.2
-circleci-php8.0-node16-composer2-v1.2.0
+circleci-php8.0-node16-composer2-v1.3
+circleci-php8.0-node16-composer2-v1.3.0
diff --git a/silta-cicd/circleci-php8.1-node16-composer2/Dockerfile b/silta-cicd/circleci-php8.1-node16-composer2/Dockerfile
@@ -22,11 +22,15 @@ RUN echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] https://packages.
   && sudo apt-get update && sudo apt-get install google-cloud-sdk-gke-gcloud-auth-plugin kubectl \
   && sudo apt-get clean
 
-# Install AWS cli and aws-iam-authenticator
-RUN sudo apt install -y awscli git python3 \
-  && curl -o /tmp/aws-iam-authenticator https://amazon-eks.s3.us-west-2.amazonaws.com/1.18.9/2020-11-02/bin/linux/amd64/aws-iam-authenticator \
-  && chmod +x /tmp/aws-iam-authenticator \ 
-  && sudo mv /tmp/aws-iam-authenticator /bin/aws-iam-authenticator
+# Install AWS cli and aws-iam-authenticator, git, python
+RUN sudo apt install -y git python3 \
+  && sudo apt-get install -y unzip curl \
+  && sudo apt-get clean \
+  && sudo curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip" \
+  && sudo  unzip awscliv2.zip \
+  && sudo ./aws/install \
+  && sudo  rm -rf awscliv2.zip \
+  && sudo  rm -rf ./aws
 
 # Install Helm 3
 ENV HELM_VERSION v3.13.3

diff --git a/silta-cicd/circleci-php8.1-node18-composer2/Dockerfile b/silta-cicd/circleci-php8.1-node18-composer2/Dockerfile
@@ -21,11 +21,15 @@ RUN echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] https://packages.
   && sudo apt-get update && sudo apt-get install google-cloud-sdk-gke-gcloud-auth-plugin kubectl \
   && sudo apt-get clean
 
-# Install AWS cli and aws-iam-authenticator
-RUN sudo apt install -y awscli git python3 \
-  && curl -o /tmp/aws-iam-authenticator https://amazon-eks.s3.us-west-2.amazonaws.com/1.18.9/2020-11-02/bin/linux/amd64/aws-iam-authenticator \
-  && chmod +x /tmp/aws-iam-authenticator \ 
-  && sudo mv /tmp/aws-iam-authenticator /bin/aws-iam-authenticator
+# Install AWS cli and aws-iam-authenticator,git, python
+RUN sudo apt install -y git python3 \
+  && sudo apt-get install -y unzip curl \
+  && sudo apt-get clean \
+  && sudo curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip" \
+  && sudo  unzip awscliv2.zip \
+  && sudo ./aws/install \
+  && sudo  rm -rf awscliv2.zip \
+  && sudo  rm -rf ./aws
 
 # Install Helm 3
 ENV HELM_VERSION v3.13.3

diff --git a/silta-cicd/circleci-php8.2-node18-composer2/Dockerfile b/silta-cicd/circleci-php8.2-node18-composer2/Dockerfile
@@ -21,11 +21,15 @@ RUN echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] https://packages.
   && sudo apt-get update && sudo apt-get install google-cloud-sdk-gke-gcloud-auth-plugin kubectl \
   && sudo apt-get clean
 
-# Install AWS cli and aws-iam-authenticator
-RUN sudo apt install -y awscli git python3 \
-  && curl -o /tmp/aws-iam-authenticator https://amazon-eks.s3.us-west-2.amazonaws.com/1.18.9/2020-11-02/bin/linux/amd64/aws-iam-authenticator \
-  && chmod +x /tmp/aws-iam-authenticator \ 
-  && sudo mv /tmp/aws-iam-authenticator /bin/aws-iam-authenticator
+# Install AWS cli and aws-iam-authenticator, git, python
+RUN sudo apt install -y git python3 \
+  && sudo apt-get install -y unzip curl \
+  && sudo apt-get clean \
+  && sudo curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip" \
+  && sudo  unzip awscliv2.zip \
+  && sudo ./aws/install \
+  && sudo  rm -rf awscliv2.zip \
+  && sudo  rm -rf ./aws
 
 # Install Helm 3
 ENV HELM_VERSION v3.13.3

diff --git a/silta-cicd/circleci-php8.2-node20-composer2/Dockerfile b/silta-cicd/circleci-php8.2-node20-composer2/Dockerfile
@@ -21,11 +21,15 @@ RUN echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] https://packages.
   && sudo apt-get update && sudo apt-get install google-cloud-sdk-gke-gcloud-auth-plugin kubectl \
   && sudo apt-get clean
 
-# Install AWS cli and aws-iam-authenticator
-RUN sudo apt install -y awscli git python3 \
-  && curl -o /tmp/aws-iam-authenticator https://amazon-eks.s3.us-west-2.amazonaws.com/1.18.9/2020-11-02/bin/linux/amd64/aws-iam-authenticator \
-  && chmod +x /tmp/aws-iam-authenticator \ 
-  && sudo mv /tmp/aws-iam-authenticator /bin/aws-iam-authenticator
+# Install AWS cli and aws-iam-authenticator, git, python
+RUN sudo apt install -y git python3 \
+  && sudo apt-get install -y unzip curl \
+  && sudo apt-get clean \
+  && sudo curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip" \
+  && sudo  unzip awscliv2.zip \
+  && sudo ./aws/install \
+  && sudo  rm -rf awscliv2.zip \
+  && sudo  rm -rf ./aws
 
 # Install Helm 3
 ENV HELM_VERSION v3.13.3