Merge remote-tracking branch 'origin/master' into main-jh

ci_files/variables.yml

@@ -46,7 +46,7 @@ variables:
   CA_PKG_VERSION: "20220614-r0"
   CFSSL_VERSION: "1.6.1"
   CFSSL_CHECKSUM_SHA256: "89e600cd5203a025f8b47c6cd5abb9a74b06e3c7f7f7dd3f5b2a00975b15a491"
-  AWSCLI_VERSION: "1.35.18"
+  AWSCLI_VERSION: "1.35.20"
   S3CMD_VERSION: "2.4.0"
   GM_VERSION: "1.3.36"
   GM_CHECKSUM_SHA256: "5d5b3fde759cdfc307aaf21df9ebd8c752e3f088bb051dd5df8aac7ba7338f46"

gitlab-toolbox/Dockerfile

@@ -13,7 +13,7 @@ FROM --platform=$TARGETPLATFORM ${GITALY_IMAGE} AS gitaly
 FROM --platform=$TARGETPLATFORM ${FROM_IMAGE}:${TAG}
 
 ARG TARGETARCH
-ARG AWSCLI_VERSION="1.35.18"
+ARG AWSCLI_VERSION="1.35.20"
 ARG S3CMD_VERSION="2.4.0"
 ARG GSUTIL_VERSION="5.31"
 ARG AZCOPY_STATIC_URL="https://azcopyvnext.azureedge.net/releases/release-10.26.0-20240731/azcopy_linux_${TARGETARCH}_10.26.0.tar.gz"

gitlab-toolbox/Dockerfile.build.ubi

@@ -3,7 +3,7 @@ ARG BUILD_IMAGE=
 FROM ${BUILD_IMAGE}
 
 ARG TARGETARCH
-ARG AWSCLI_VERSION=1.35.18
+ARG AWSCLI_VERSION=1.35.20
 ARG S3CMD_VERSION=2.4.0
 ARG GSUTIL_VERSION=5.31
 ARG AZCOPY_STATIC_URL="https://azcopyvnext.azureedge.net/releases/release-10.26.0-20240731/azcopy_linux_${TARGETARCH}_10.26.0.tar.gz"