From ff95b55a81c007b72c0c5cd148606c79abd4cb10 Mon Sep 17 00:00:00 2001
From: Mischa Taylor <taylor@linux.com>
Date: Sun, 19 Nov 2023 09:46:39 -0500
Subject: [PATCH] Pass through version argument

---
 .github/workflows/ci.yml | 2 +-
 aws-cli/Containerfile    | 8 +++++---
 aws-cli/docker-bake.hcl  | 3 +++
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 5d6d442..17c829d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -79,7 +79,7 @@ jobs:
 
       - name: Get the image name
         if: github.event_name != 'pull_request'
-        id: image_description
+        id: image_name
         run: |
           echo "image_name=$(docker buildx bake --print 2> /dev/null | jq -r '.target.release.labels."org.opencontainers.image.title"')" >> $GITHUB_ENV
 
diff --git a/aws-cli/Containerfile b/aws-cli/Containerfile
index 7c0c92a..7e9b7b8 100644
--- a/aws-cli/Containerfile
+++ b/aws-cli/Containerfile
@@ -1,6 +1,8 @@
 ARG CONTAINER_REGISTRY=docker.io
 FROM $CONTAINER_REGISTRY/amazonlinux:2 as installer
 
+ARG AWS_CLI_VERSION=2.13.28
+
 COPY aws-cli.key /tmp/aws-cli/aws-cli.key
 
 RUN yum update -y \
@@ -9,13 +11,13 @@ RUN yum update -y \
   && arch="$(arch)" \
   && case "${arch##*-}" in \
     x86_64) \
-      AWS_CLI_URL='https://awscli.amazonaws.com/awscli-exe-linux-x86_64-2.13.28.zip' \
+      AWS_CLI_URL='https://awscli.amazonaws.com/awscli-exe-linux-x86_64-${AWS_CLI_VERISON}.zip' \
       ;; \
     aarch64) \
-      AWS_CLI_URL='https://awscli.amazonaws.com/awscli-exe-linux-aarch64-2.13.28.zip' \
+      AWS_CLI_URL='https://awscli.amazonaws.com/awscli-exe-linux-aarch64-${AWS_CLI_VERISON}.zip' \
       ;; \
     armv7l) \
-      AWS_CLI_URL='https://awscli.amazonaws.com/awscli-exe-linux-armv7l-2.13.28.zip' \
+      AWS_CLI_URL='https://awscli.amazonaws.com/awscli-exe-linux-armv7l-${AWS_CLI_VERISON}.zip' \
       ;; \
     *) echo "unsupported architecture"; exit 1 ;; \
     esac \
diff --git a/aws-cli/docker-bake.hcl b/aws-cli/docker-bake.hcl
index 6ddf1ab..4d16d83 100644
--- a/aws-cli/docker-bake.hcl
+++ b/aws-cli/docker-bake.hcl
@@ -16,6 +16,9 @@ variable "LOCAL_PLATFORM" {
 }
 
 target "_common" {
+  args = {
+    AWS_CLI_VERSION = ${VERSION}
+  }
   dockerfile = "Containerfile"
   tags = [
     "${CONTAINER_REGISTRY}/${IMAGE_NAME}:${VERSION}",