From d4fc48b171df8c08e95cd37f299e1252f3571304 Mon Sep 17 00:00:00 2001 From: Yajith Dayarathna Date: Mon, 2 Sep 2024 13:42:59 +1200 Subject: [PATCH 1/4] update cli tool versions --- setup.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.sh b/setup.sh index 0344999..6e860d9 100755 --- a/setup.sh +++ b/setup.sh @@ -3,8 +3,8 @@ set -euo pipefail IFS=$'\n\t' PLATFORM=${1:-"linux"} ARCH=${2:-"amd64"} -DOCKER_VERSION="v24.0.9" -DOCKER_COMPOSE_VERSION="v2.26.1" +DOCKER_VERSION="v27.1.2" +DOCKER_COMPOSE_VERSION="v2.29.2" mkdir -p dist/ /usr/bin/env bash ./build/download_docker_binary.sh "$PLATFORM" "$ARCH" "$DOCKER_VERSION" From b34868c7b36a3b5061a0c6eac3277ad8843ac587 Mon Sep 17 00:00:00 2001 From: Yajith Dayarathna Date: Tue, 3 Sep 2024 15:30:54 +1200 Subject: [PATCH 2/4] updating mingit --- build/windows/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/windows/Dockerfile b/build/windows/Dockerfile index 085e47f..2a7b9d8 100644 --- a/build/windows/Dockerfile +++ b/build/windows/Dockerfile @@ -1,7 +1,7 @@ ARG OSVERSION FROM --platform=linux/amd64 gcr.io/k8s-staging-e2e-test-images/windows-servercore-cache:1.0-linux-amd64-${OSVERSION} as core FROM --platform=linux/amd64 alpine:3.13.0 as downloader -ENV GIT_VERSION 2.44.0 +ENV GIT_VERSION 2.45.2 ENV GIT_PATCH_VERSION 1 RUN mkdir mingit/ \ From 3c55d61fad471af4fb413cba11ee3a19562957c4 Mon Sep 17 00:00:00 2001 From: Yajith Dayarathna Date: Thu, 5 Sep 2024 11:03:01 +1200 Subject: [PATCH 3/4] Fix for CVE-2024-30105 --- build/windows/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/windows/Dockerfile b/build/windows/Dockerfile index 2a7b9d8..6968be4 100644 --- a/build/windows/Dockerfile +++ b/build/windows/Dockerfile @@ -1,7 +1,7 @@ ARG OSVERSION FROM --platform=linux/amd64 gcr.io/k8s-staging-e2e-test-images/windows-servercore-cache:1.0-linux-amd64-${OSVERSION} as core FROM --platform=linux/amd64 alpine:3.13.0 as downloader -ENV GIT_VERSION 2.45.2 +ENV GIT_VERSION 2.46.0 ENV GIT_PATCH_VERSION 1 RUN mkdir mingit/ \ From 354a94501e31dcb755ab1aec91e64b5757447a6c Mon Sep 17 00:00:00 2001 From: Yajith Dayarathna Date: Tue, 10 Sep 2024 16:01:32 +1200 Subject: [PATCH 4/4] bump go version 1.22.7 --- go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 23f03c7..d36b79c 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/portainer/compose-unpacker -go 1.22.6 +go 1.22.7 require ( github.com/alecthomas/kong v0.6.1