Feat: Add AWS CLI

#16
clemlesne · May 10, 2023 · 10b2baa · 10b2baa
1 parent f837b4c
commit 10b2baa
Show file tree

Hide file tree

Showing 7 changed files with 54 additions and 0 deletions.
diff --git a/.github/workflows/pipeline.yaml b/.github/workflows/pipeline.yaml
@@ -37,6 +37,8 @@ env:
   AZURE_CLI_VERSION: 2.48.1
   # https://github.com/stedolan/jq/releases
   JQ_VERSION: 1.6
+  # https://github.com/aws/aws-cli/releases
+  AWS_CLI_VERSION: 2.11.18
   # https://github.com/git-for-windows/git/releases
   GIT_VERSION_WIN: 2.40.1
   # https://github.com/facebook/zstd/releases
@@ -259,6 +261,7 @@ jobs:
         uses: docker/build-push-action@v4.0.0
         with:
           build-args: |
+            "AWS_CLI_VERSION=${{ env.AWS_CLI_VERSION }}"
             "AZP_AGENT_VERSION=${{ env.AZP_AGENT_VERSION }}"
             "AZURE_CLI_VERSION=${{ env.AZURE_CLI_VERSION }}"
             "BUILDKIT_VERSION=${{ env.BUILDKIT_VERSION }}"
@@ -372,6 +375,7 @@ jobs:
         run: |
           $params = @(
             # Required build arguments
+            "--build-arg", "AWS_CLI_VERSION=${{ env.AWS_CLI_VERSION }}",
             "--build-arg", "AZP_AGENT_VERSION=${{ env.AZP_AGENT_VERSION }}",
             "--build-arg", "AZURE_CLI_VERSION=${{ env.AZURE_CLI_VERSION }}",
             "--build-arg", "GIT_VERSION=${{ env.GIT_VERSION_WIN }}",

diff --git a/src/docker/Dockerfile-bullseye b/src/docker/Dockerfile-bullseye
@@ -101,6 +101,15 @@ RUN python3 -m pip \
     && az version \
     && az upgrade --yes
 
+# Install AWS CLI, then verify installation
+ARG AWS_CLI_VERSION
+ENV AWS_CLI_VERSION ${AWS_CLI_VERSION}
+RUN curl -LsSf https://awscli.amazonaws.com/awscli-exe-linux-$(ARCH_X64=x86_64 ARCH_ARM64=aarch64 bash arch.sh).zip -o awscli.zip \
+    && unzip awscli.zip \
+    && ./aws/install \
+    && rm -rf awscli.zip aws \
+    && aws --version
+
 # Install Powershell, then verify installation
 ARG POWERSHELL_VERSION
 ENV POWERSHELL_VERSION ${POWERSHELL_VERSION}

diff --git a/src/docker/Dockerfile-focal b/src/docker/Dockerfile-focal
@@ -100,6 +100,15 @@ RUN python3 -m pip \
     && az version \
     && az upgrade --yes
 
+# Install AWS CLI, then verify installation
+ARG AWS_CLI_VERSION
+ENV AWS_CLI_VERSION ${AWS_CLI_VERSION}
+RUN curl -LsSf https://awscli.amazonaws.com/awscli-exe-linux-$(ARCH_X64=x86_64 ARCH_ARM64=aarch64 bash arch.sh).zip -o awscli.zip \
+    && unzip awscli.zip \
+    && ./aws/install \
+    && rm -rf awscli.zip aws \
+    && aws --version
+
 # Install Powershell, then verify installation
 ARG POWERSHELL_VERSION
 ENV POWERSHELL_VERSION ${POWERSHELL_VERSION}

diff --git a/src/docker/Dockerfile-jammy b/src/docker/Dockerfile-jammy
@@ -108,6 +108,15 @@ RUN python3 -m pip \
     && az version \
     && az upgrade --yes
 
+# Install AWS CLI, then verify installation
+ARG AWS_CLI_VERSION
+ENV AWS_CLI_VERSION ${AWS_CLI_VERSION}
+RUN curl -LsSf https://awscli.amazonaws.com/awscli-exe-linux-$(ARCH_X64=x86_64 ARCH_ARM64=aarch64 bash arch.sh).zip -o awscli.zip \
+    && unzip awscli.zip \
+    && ./aws/install \
+    && rm -rf awscli.zip aws \
+    && aws --version
+
 # Install Powershell, then verify installation
 ARG POWERSHELL_VERSION
 ENV POWERSHELL_VERSION ${POWERSHELL_VERSION}

diff --git a/src/docker/Dockerfile-ubi8 b/src/docker/Dockerfile-ubi8
@@ -99,6 +99,15 @@ RUN python3 -m pip \
     && az version \
     && az upgrade --yes
 
+# Install AWS CLI, then verify installation
+ARG AWS_CLI_VERSION
+ENV AWS_CLI_VERSION ${AWS_CLI_VERSION}
+RUN curl -LsSf https://awscli.amazonaws.com/awscli-exe-linux-$(ARCH_X64=x86_64 ARCH_ARM64=aarch64 bash arch.sh).zip -o awscli.zip \
+    && unzip awscli.zip \
+    && ./aws/install \
+    && rm -rf awscli.zip aws \
+    && aws --version
+
 # Install Powershell, then verify installation
 ARG POWERSHELL_VERSION
 ENV POWERSHELL_VERSION ${POWERSHELL_VERSION}

diff --git a/src/docker/Dockerfile-win-ltsc2019 b/src/docker/Dockerfile-win-ltsc2019
@@ -50,6 +50,13 @@ RUN python -m pip \
     ; az version \
     ; az upgrade --yes
 
+# Install AWS CLI, then verify installation
+ARG AWS_CLI_VERSION
+ENV AWS_CLI_VERSION ${AWS_CLI_VERSION}
+RUN Invoke-WebRequest -Uri https://awscli.amazonaws.com/AWSCLIV2-$($Env:AWS_CLI_VERSION).msi -OutFile awscli.msi \
+    ; Start-Process msiexec.exe -Wait -ArgumentList '/I awscli.msi /qn /norestart' \
+    ; Remove-Item awscli.msi \
+    ; aws --version
 
 # Install Powershell, then verify installation
 ARG POWERSHELL_VERSION

diff --git a/src/docker/Dockerfile-win-ltsc2022 b/src/docker/Dockerfile-win-ltsc2022
@@ -50,6 +50,13 @@ RUN python -m pip \
     ; az version \
     ; az upgrade --yes
 
+# Install AWS CLI, then verify installation
+ARG AWS_CLI_VERSION
+ENV AWS_CLI_VERSION ${AWS_CLI_VERSION}
+RUN Invoke-WebRequest -Uri https://awscli.amazonaws.com/AWSCLIV2-$($Env:AWS_CLI_VERSION).msi -OutFile awscli.msi \
+    ; Start-Process msiexec.exe -Wait -ArgumentList '/I awscli.msi /qn /norestart' \
+    ; Remove-Item awscli.msi \
+    ; aws --version
 
 # Install Powershell, then verify installation
 ARG POWERSHELL_VERSION