Skip to content

Commit

Permalink
Merge pull request #48 from portainer/2024-09-CVE
Browse files Browse the repository at this point in the history
2024-09-CVE
  • Loading branch information
yajith authored Sep 10, 2024
2 parents 0209218 + 354a945 commit 29fb586
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion build/windows/Dockerfile
Original file line number Diff line number Diff line change
@@ -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.46.0
ENV GIT_PATCH_VERSION 1

RUN mkdir mingit/ \
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit 29fb586

Please sign in to comment.