From 79ea928ef70003259da17127566a35031fe946d2 Mon Sep 17 00:00:00 2001
From: Daniele Monti <62102073+Monska85@users.noreply.github.com>
Date: Wed, 3 Jul 2024 12:42:52 +0200
Subject: [PATCH] feat(upgrade): upgrade AWS cli version to 2.17.7 and add
 support for alpine 3.20

---
 .github/workflows/docker-publish.yml | 12 +++++-----
 Dockerfile                           |  6 ++---
 Makefile                             | 34 ++++++++++++++--------------
 README.md                            |  2 +-
 4 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index a67f731..0fa0558 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -19,10 +19,10 @@ jobs:
       matrix:
         tag:
           # To keep the number of builds low, we only keep the latest two versions of the AWS CLI
+          - 2.17.7-3.11.9-3.20
+          - 2.17.7-3.11.9-3.19
+          - 2.16.7-3.11.9-3.20
           - 2.16.7-3.11.9-3.19
-          - 2.16.7-3.11.9-3.18
-          - 2.15.42-3.11.9-3.19
-          - 2.15.42-3.11.9-3.18
     steps:
       - uses: actions/checkout@v4
 
@@ -69,10 +69,10 @@ jobs:
       matrix:
         tag:
           # To keep the number of builds low, we only keep the latest two versions of the AWS CLI
+          - 2.17.7-3.11.9-3.20
+          - 2.17.7-3.11.9-3.19
+          - 2.16.7-3.11.9-3.20
           - 2.16.7-3.11.9-3.19
-          - 2.16.7-3.11.9-3.18
-          - 2.15.42-3.11.9-3.19
-          - 2.15.42-3.11.9-3.18
     steps:
       - uses: actions/checkout@v4
 
diff --git a/Dockerfile b/Dockerfile
index 4598370..4ecd747 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,13 +1,13 @@
 ARG PYTHON_VERSION=3.11.9
-ARG ALPINE_VERSION=3.19
+ARG ALPINE_VERSION=3.20
 
 FROM python:${PYTHON_VERSION}-alpine${ALPINE_VERSION} as builder
 
 ARG AUTHOR
 ARG PYTHON_VERSION=3.11.9
-ARG ALPINE_VERSION=3.19
+ARG ALPINE_VERSION=3.20
 ARG IMAGE_NAME=spark-alpine-aws-cli
-ARG AWS_CLI_VERSION=2.16.7
+ARG AWS_CLI_VERSION=2.17.7
 
 # Build process
 # If you want to see the AWS CLI v2 documentation, remember to go to the `v2` branch.
diff --git a/Makefile b/Makefile
index 179ce02..4e8c609 100644
--- a/Makefile
+++ b/Makefile
@@ -1,31 +1,31 @@
 AUTHOR ?= sparkfabrik
 IMAGE_NAME ?= docker-alpine-aws-cli
 PLATFORM ?= "linux/amd64"
-LATEST_VERSION ?= 2.16.7-alpine3.19
+LATEST_VERSION ?= 2.17.7-alpine3.20
 
-build: build-2.16.7-3.19
+build: build-2.17.7-3.20
 
 # To keep the number of builds low, we only keep the latest two versions of the AWS CLI
+build-2.17.7-3.20: AWS_CLI_VERSION="2.17.7"
+build-2.17.7-3.20: PYTHON_VERSION="3.11.9"
+build-2.17.7-3.20: ALPINE_VERSION="3.20"
+build-2.17.7-3.20: build-template
+
+build-2.17.7-3.19: AWS_CLI_VERSION="2.17.7"
+build-2.17.7-3.19: PYTHON_VERSION="3.11.9"
+build-2.17.7-3.19: ALPINE_VERSION="3.19"
+build-2.17.7-3.19: build-template
+
+build-2.16.7-3.20: AWS_CLI_VERSION="2.16.7"
+build-2.16.7-3.20: PYTHON_VERSION="3.11.9"
+build-2.16.7-3.20: ALPINE_VERSION="3.20"
+build-2.16.7-3.20: build-template
+
 build-2.16.7-3.19: AWS_CLI_VERSION="2.16.7"
 build-2.16.7-3.19: PYTHON_VERSION="3.11.9"
 build-2.16.7-3.19: ALPINE_VERSION="3.19"
 build-2.16.7-3.19: build-template
 
-build-2.16.7-3.18: AWS_CLI_VERSION="2.16.7"
-build-2.16.7-3.18: PYTHON_VERSION="3.11.9"
-build-2.16.7-3.18: ALPINE_VERSION="3.18"
-build-2.16.7-3.18: build-template
-
-build-2.15.42-3.19: AWS_CLI_VERSION="2.15.42"
-build-2.15.42-3.19: PYTHON_VERSION="3.11.9"
-build-2.15.42-3.19: ALPINE_VERSION="3.19"
-build-2.15.42-3.19: build-template
-
-build-2.15.42-3.18: AWS_CLI_VERSION="2.15.42"
-build-2.15.42-3.18: PYTHON_VERSION="3.11.9"
-build-2.15.42-3.18: ALPINE_VERSION="3.18"
-build-2.15.42-3.18: build-template
-
 build-template:
 	docker buildx build --load . \
 		--platform "$(PLATFORM)" \
diff --git a/README.md b/README.md
index d2fc915..6736e40 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@ Docker image for AWS-CLI v2 on Alpine Linux.
 You can import the compiled binary created in this image in your Alpine Linux image.
 
 ```bash
-FROM ghcr.io/sparkfabrik/docker-alpine-aws-cli:2.16.7-alpine3.19 as awscli
+FROM ghcr.io/sparkfabrik/docker-alpine-aws-cli:2.17.7-alpine3.20 as awscli
 
 FROM alpine:3.19
 # Install AWS CLI v2 using the binary builded in the awscli stage