github
/
portainer
mirror of https://github.com/portainer/portainer
1
0
Fork 0
Code Issues Releases Wiki Activity

fix(mingit): remove mingit BE-12245 (#1177)

pull/12074/merge
andres-portainer 2025-09-10 15:01:12 -03:00 committed by GitHub
parent a59815264d
commit 5418a0bee6
4 changed files with 2 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
binary-version.json
View File

@ -1,4 +1,3 @@
{ {
"docker": "v28.3.0", "docker": "v28.3.0"
"mingit": "2.49.0.1"
} }

13
build/download_binaries.sh
View File

@ -7,11 +7,10 @@ ARCH=${2:-"amd64"}
BINARY_VERSION_FILE="./binary-version.json" BINARY_VERSION_FILE="./binary-version.json"
dockerVersion=$(jq -r '.docker' < "${BINARY_VERSION_FILE}") dockerVersion=$(jq -r '.docker' < "${BINARY_VERSION_FILE}")
mingitVersion=$(jq -r '.mingit' < "${BINARY_VERSION_FILE}")
mkdir -p dist mkdir -p dist
echo "Checking and downloading binaries for docker ${dockerVersion}, and mingit ${mingitVersion} (Windows only)" echo "Checking and downloading binaries for docker ${dockerVersion}"
# Determine the binary file names based on the platform # Determine the binary file names based on the platform
dockerBinary="dist/docker" dockerBinary="dist/docker"
@ -27,13 +26,3 @@ if [ ! -f "$dockerBinary" ]; then
else else
echo "Docker binary already exists, skipping download." echo "Docker binary already exists, skipping download."
fi fi
# Check and download mingit binary only for Windows
if [ "$PLATFORM" == "windows" ]; then
if [ ! -f "dist/mingit" ]; then
echo "Downloading mingit binary..."
/usr/bin/env bash ./build/download_mingit_binary.sh "$PLATFORM" "$ARCH" "$mingitVersion"
else
echo "Mingit binary already exists, skipping download."
fi
fi

18
build/download_mingit_binary.sh
View File

@ -1,18 +0,0 @@
#!/usr/bin/env bash
set -euo pipefail
if [[ $# -ne 3 ]]; then
echo "Illegal number of parameters" >&2
exit 1
fi
PLATFORM=$1
MINGIT_VERSION=$3
if [[ ${PLATFORM} == "windows" ]]; then
GIT_VERSION=$(echo $MINGIT_VERSION | cut -d "." -f 1-3)
GIT_PATCH_VERSION=$(echo $MINGIT_VERSION | cut -d "." -f 4)
wget --tries=3 --waitretry=30 --quiet "https://github.com/git-for-windows/git/releases/download/v$GIT_VERSION.windows.$GIT_PATCH_VERSION/MinGit-$GIT_VERSION-busybox-64-bit.zip"
unzip "MinGit-$GIT_VERSION-busybox-64-bit.zip" -d dist/mingit
fi

2
build/windows/Dockerfile
View File

@ -2,13 +2,11 @@ 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 gcr.io/k8s-staging-e2e-test-images/windows-servercore-cache:1.0-linux-amd64-${OSVERSION} as core
FROM mcr.microsoft.com/windows/nanoserver:${OSVERSION} as production FROM mcr.microsoft.com/windows/nanoserver:${OSVERSION} as production
ENV PATH "C:\mingit\cmd;C:\Windows\system32;C:\Windows;"
COPY --from=core /Windows/System32/netapi32.dll /Windows/System32/netapi32.dll COPY --from=core /Windows/System32/netapi32.dll /Windows/System32/netapi32.dll
USER ContainerAdministrator USER ContainerAdministrator
COPY dist/mingit/ mingit/
COPY dist/docker.exe / COPY dist/docker.exe /
COPY dist/mustache-templates /mustache-templates/ COPY dist/mustache-templates /mustache-templates/
COPY dist/portainer.exe / COPY dist/portainer.exe /