From 00bd66e3bfdf00f4800b1bf4a3aa2ba855402a36 Mon Sep 17 00:00:00 2001
From: andres-portainer <andres-portainer@users.noreply.github.com>
Date: Thu, 18 Apr 2024 10:56:00 -0300
Subject: [PATCH 1/2] fix(mingit): upgrade to v2.44.0.1 EE-7023

---
 build/windows/Dockerfile | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/build/windows/Dockerfile b/build/windows/Dockerfile
index fe4420e..63bf42a 100644
--- a/build/windows/Dockerfile
+++ b/build/windows/Dockerfile
@@ -2,10 +2,8 @@ ARG GIT_COMMIT=unspecified
 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.30.0
-ENV GIT_PATCH_VERSION 2
-
-
+ENV GIT_VERSION 2.44.0
+ENV GIT_PATCH_VERSION 1
 
 RUN mkdir mingit/ \
   && wget https://github.com/git-for-windows/git/releases/download/v$GIT_VERSION.windows.$GIT_PATCH_VERSION/MinGit-$GIT_VERSION.$GIT_PATCH_VERSION-busybox-64-bit.zip \
@@ -22,4 +20,4 @@ USER ContainerAdministrator
 LABEL git_commit=$GIT_COMMIT
 
 COPY dist /app/
-ENTRYPOINT ["C:/app/portainer-updater.exe"]
\ No newline at end of file
+ENTRYPOINT ["C:/app/portainer-updater.exe"]

From 6bc831d6385c3166b8928d25f753fc4beca6b24d Mon Sep 17 00:00:00 2001
From: andres-portainer <andres-portainer@users.noreply.github.com>
Date: Thu, 18 Apr 2024 15:21:18 -0300
Subject: [PATCH 2/2] Fix the mingit binary downloading process.

---
 build/windows/Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build/windows/Dockerfile b/build/windows/Dockerfile
index 63bf42a..f7269a0 100644
--- a/build/windows/Dockerfile
+++ b/build/windows/Dockerfile
@@ -6,8 +6,8 @@ ENV GIT_VERSION 2.44.0
 ENV GIT_PATCH_VERSION 1
 
 RUN mkdir mingit/ \
-  && wget https://github.com/git-for-windows/git/releases/download/v$GIT_VERSION.windows.$GIT_PATCH_VERSION/MinGit-$GIT_VERSION.$GIT_PATCH_VERSION-busybox-64-bit.zip \
-  && unzip MinGit-$GIT_VERSION.$GIT_PATCH_VERSION-busybox-64-bit.zip -d mingit/
+  && wget 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 mingit/
 
 FROM mcr.microsoft.com/windows/nanoserver:${OSVERSION}
 ENV PATH "C:\mingit\cmd;C:\app;C:\Windows\system32;C:\Windows;"