From d906070b81b30a7b57ce4ba362e5eb12d6a4f733 Mon Sep 17 00:00:00 2001 From: Arve Knudsen Date: Thu, 29 Oct 2020 08:45:38 +0100 Subject: [PATCH 1/3] Upgrade Windows Dockerfiles to Git v2.29.1.windows.1 Signed-off-by: Arve Knudsen --- docker/Dockerfile.windows.1803 | 2 +- docker/Dockerfile.windows.1809 | 2 +- docker/Dockerfile.windows.1903 | 2 +- docker/Dockerfile.windows.1909 | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docker/Dockerfile.windows.1803 b/docker/Dockerfile.windows.1803 index cbd58a7..07277c2 100644 --- a/docker/Dockerfile.windows.1803 +++ b/docker/Dockerfile.windows.1803 @@ -4,7 +4,7 @@ FROM mcr.microsoft.com/windows/servercore:1803 AS git SHELL ["powershell.exe", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 ; ` - Invoke-WebRequest -UseBasicParsing https://github.com/git-for-windows/git/releases/download/v2.21.0.windows.1/MinGit-2.21.0-64-bit.zip -OutFile git.zip; ` + Invoke-WebRequest -UseBasicParsing https://github.com/git-for-windows/git/releases/download/v2.29.1.windows.1/MinGit-2.29.1-64-bit.zip -OutFile git.zip; ` Expand-Archive git.zip -DestinationPath C:\git; FROM mcr.microsoft.com/powershell:nanoserver-1803 diff --git a/docker/Dockerfile.windows.1809 b/docker/Dockerfile.windows.1809 index 936400d..8ba2618 100644 --- a/docker/Dockerfile.windows.1809 +++ b/docker/Dockerfile.windows.1809 @@ -4,7 +4,7 @@ FROM mcr.microsoft.com/windows/servercore:1809 AS git SHELL ["powershell.exe", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 ; ` - Invoke-WebRequest -UseBasicParsing https://github.com/git-for-windows/git/releases/download/v2.21.0.windows.1/MinGit-2.21.0-64-bit.zip -OutFile git.zip; ` + Invoke-WebRequest -UseBasicParsing https://github.com/git-for-windows/git/releases/download/v2.29.1.windows.1/MinGit-2.29.1-64-bit.zip -OutFile git.zip; ` Expand-Archive git.zip -DestinationPath C:\git; FROM mcr.microsoft.com/powershell:nanoserver-1809 diff --git a/docker/Dockerfile.windows.1903 b/docker/Dockerfile.windows.1903 index 71982da..9a08567 100644 --- a/docker/Dockerfile.windows.1903 +++ b/docker/Dockerfile.windows.1903 @@ -4,7 +4,7 @@ FROM mcr.microsoft.com/windows/servercore:1903 AS git SHELL ["powershell.exe", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 ; ` - Invoke-WebRequest -UseBasicParsing https://github.com/git-for-windows/git/releases/download/v2.21.0.windows.1/MinGit-2.21.0-64-bit.zip -OutFile git.zip; ` + Invoke-WebRequest -UseBasicParsing https://github.com/git-for-windows/git/releases/download/v2.29.1.windows.1/MinGit-2.29.1-64-bit.zip -OutFile git.zip; ` Expand-Archive git.zip -DestinationPath C:\git; FROM mcr.microsoft.com/powershell:nanoserver-1903 diff --git a/docker/Dockerfile.windows.1909 b/docker/Dockerfile.windows.1909 index 7e53708..c714228 100644 --- a/docker/Dockerfile.windows.1909 +++ b/docker/Dockerfile.windows.1909 @@ -4,7 +4,7 @@ FROM mcr.microsoft.com/windows/servercore:1909 AS git SHELL ["powershell.exe", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 ; ` - Invoke-WebRequest -UseBasicParsing https://github.com/git-for-windows/git/releases/download/v2.21.0.windows.1/MinGit-2.21.0-64-bit.zip -OutFile git.zip; ` + Invoke-WebRequest -UseBasicParsing https://github.com/git-for-windows/git/releases/download/v2.29.1.windows.1/MinGit-2.29.1-64-bit.zip -OutFile git.zip; ` Expand-Archive git.zip -DestinationPath C:\git; FROM mcr.microsoft.com/powershell:nanoserver-1909 From 6e7d1217f6773a8df355c9375884d95c5d1bf578 Mon Sep 17 00:00:00 2001 From: Arve Knudsen Date: Thu, 29 Oct 2020 08:51:08 +0100 Subject: [PATCH 2/3] Upgrade Linux Dockerfiles to Git v2.26.2 Signed-off-by: Arve Knudsen --- docker/Dockerfile.linux.amd64 | 4 ++-- docker/Dockerfile.linux.arm | 4 ++-- docker/Dockerfile.linux.arm6 | 4 ++-- docker/Dockerfile.linux.arm64 | 4 ++-- docker/Dockerfile.linux.arm7 | 4 ++-- docker/Dockerfile.linux.arm8 | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/docker/Dockerfile.linux.amd64 b/docker/Dockerfile.linux.amd64 index 2858df3..9b31bd9 100644 --- a/docker/Dockerfile.linux.amd64 +++ b/docker/Dockerfile.linux.amd64 @@ -1,5 +1,5 @@ -FROM alpine:3.7 -RUN apk add --no-cache ca-certificates git git-lfs openssh curl perl +FROM alpine:3.12 +RUN apk add --no-cache ca-certificates git=2.26.2-r0 git-lfs=2.11.0-r0 openssh curl perl ADD posix/* /usr/local/bin/ ENTRYPOINT ["/usr/local/bin/clone"] diff --git a/docker/Dockerfile.linux.arm b/docker/Dockerfile.linux.arm index a32fa35..22fb0ef 100644 --- a/docker/Dockerfile.linux.arm +++ b/docker/Dockerfile.linux.arm @@ -1,5 +1,5 @@ -FROM arm32v6/alpine:3.7 -RUN apk add --no-cache ca-certificates git git-lfs openssh curl perl +FROM arm32v6/alpine:3.12 +RUN apk add --no-cache ca-certificates git=2.26.2-r0 git-lfs=2.11.0-r0 openssh curl perl ADD posix/* /usr/local/bin/ ENTRYPOINT ["/usr/local/bin/clone"] diff --git a/docker/Dockerfile.linux.arm6 b/docker/Dockerfile.linux.arm6 index a32fa35..22fb0ef 100644 --- a/docker/Dockerfile.linux.arm6 +++ b/docker/Dockerfile.linux.arm6 @@ -1,5 +1,5 @@ -FROM arm32v6/alpine:3.7 -RUN apk add --no-cache ca-certificates git git-lfs openssh curl perl +FROM arm32v6/alpine:3.12 +RUN apk add --no-cache ca-certificates git=2.26.2-r0 git-lfs=2.11.0-r0 openssh curl perl ADD posix/* /usr/local/bin/ ENTRYPOINT ["/usr/local/bin/clone"] diff --git a/docker/Dockerfile.linux.arm64 b/docker/Dockerfile.linux.arm64 index 5ea1800..7108cd7 100644 --- a/docker/Dockerfile.linux.arm64 +++ b/docker/Dockerfile.linux.arm64 @@ -1,5 +1,5 @@ -FROM arm64v8/alpine:3.7 -RUN apk add --no-cache ca-certificates git git-lfs openssh curl perl +FROM arm64v8/alpine:3.12 +RUN apk add --no-cache ca-certificates git=2.26.2-r0 git-lfs=2.11.0-r0 openssh curl perl ADD posix/* /usr/local/bin/ ENTRYPOINT ["/usr/local/bin/clone"] diff --git a/docker/Dockerfile.linux.arm7 b/docker/Dockerfile.linux.arm7 index a32fa35..22fb0ef 100644 --- a/docker/Dockerfile.linux.arm7 +++ b/docker/Dockerfile.linux.arm7 @@ -1,5 +1,5 @@ -FROM arm32v6/alpine:3.7 -RUN apk add --no-cache ca-certificates git git-lfs openssh curl perl +FROM arm32v6/alpine:3.12 +RUN apk add --no-cache ca-certificates git=2.26.2-r0 git-lfs=2.11.0-r0 openssh curl perl ADD posix/* /usr/local/bin/ ENTRYPOINT ["/usr/local/bin/clone"] diff --git a/docker/Dockerfile.linux.arm8 b/docker/Dockerfile.linux.arm8 index 5ea1800..7108cd7 100644 --- a/docker/Dockerfile.linux.arm8 +++ b/docker/Dockerfile.linux.arm8 @@ -1,5 +1,5 @@ -FROM arm64v8/alpine:3.7 -RUN apk add --no-cache ca-certificates git git-lfs openssh curl perl +FROM arm64v8/alpine:3.12 +RUN apk add --no-cache ca-certificates git=2.26.2-r0 git-lfs=2.11.0-r0 openssh curl perl ADD posix/* /usr/local/bin/ ENTRYPOINT ["/usr/local/bin/clone"] From 5088a32f2d3cbbc638fb3fdc1600b0ef6fce31d9 Mon Sep 17 00:00:00 2001 From: Arve Knudsen Date: Thu, 8 Apr 2021 09:37:26 +0200 Subject: [PATCH 3/3] Upgrade Git on Windows Signed-off-by: Arve Knudsen --- docker/Dockerfile.windows.1803 | 2 +- docker/Dockerfile.windows.1809 | 2 +- docker/Dockerfile.windows.1903 | 2 +- docker/Dockerfile.windows.1909 | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docker/Dockerfile.windows.1803 b/docker/Dockerfile.windows.1803 index 07277c2..ec6b832 100644 --- a/docker/Dockerfile.windows.1803 +++ b/docker/Dockerfile.windows.1803 @@ -4,7 +4,7 @@ FROM mcr.microsoft.com/windows/servercore:1803 AS git SHELL ["powershell.exe", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 ; ` - Invoke-WebRequest -UseBasicParsing https://github.com/git-for-windows/git/releases/download/v2.29.1.windows.1/MinGit-2.29.1-64-bit.zip -OutFile git.zip; ` + Invoke-WebRequest -UseBasicParsing https://github.com/git-for-windows/git/releases/download/v2.31.1.windows.1/MinGit-2.31.1-64-bit.zip -OutFile git.zip; ` Expand-Archive git.zip -DestinationPath C:\git; FROM mcr.microsoft.com/powershell:nanoserver-1803 diff --git a/docker/Dockerfile.windows.1809 b/docker/Dockerfile.windows.1809 index 8ba2618..5d68aa3 100644 --- a/docker/Dockerfile.windows.1809 +++ b/docker/Dockerfile.windows.1809 @@ -4,7 +4,7 @@ FROM mcr.microsoft.com/windows/servercore:1809 AS git SHELL ["powershell.exe", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 ; ` - Invoke-WebRequest -UseBasicParsing https://github.com/git-for-windows/git/releases/download/v2.29.1.windows.1/MinGit-2.29.1-64-bit.zip -OutFile git.zip; ` + Invoke-WebRequest -UseBasicParsing https://github.com/git-for-windows/git/releases/download/v2.31.1.windows.1/MinGit-2.31.1-64-bit.zip -OutFile git.zip; ` Expand-Archive git.zip -DestinationPath C:\git; FROM mcr.microsoft.com/powershell:nanoserver-1809 diff --git a/docker/Dockerfile.windows.1903 b/docker/Dockerfile.windows.1903 index 9a08567..b5ee283 100644 --- a/docker/Dockerfile.windows.1903 +++ b/docker/Dockerfile.windows.1903 @@ -4,7 +4,7 @@ FROM mcr.microsoft.com/windows/servercore:1903 AS git SHELL ["powershell.exe", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 ; ` - Invoke-WebRequest -UseBasicParsing https://github.com/git-for-windows/git/releases/download/v2.29.1.windows.1/MinGit-2.29.1-64-bit.zip -OutFile git.zip; ` + Invoke-WebRequest -UseBasicParsing https://github.com/git-for-windows/git/releases/download/v2.31.1.windows.1/MinGit-2.31.1-64-bit.zip -OutFile git.zip; ` Expand-Archive git.zip -DestinationPath C:\git; FROM mcr.microsoft.com/powershell:nanoserver-1903 diff --git a/docker/Dockerfile.windows.1909 b/docker/Dockerfile.windows.1909 index c714228..6330dd0 100644 --- a/docker/Dockerfile.windows.1909 +++ b/docker/Dockerfile.windows.1909 @@ -4,7 +4,7 @@ FROM mcr.microsoft.com/windows/servercore:1909 AS git SHELL ["powershell.exe", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 ; ` - Invoke-WebRequest -UseBasicParsing https://github.com/git-for-windows/git/releases/download/v2.29.1.windows.1/MinGit-2.29.1-64-bit.zip -OutFile git.zip; ` + Invoke-WebRequest -UseBasicParsing https://github.com/git-for-windows/git/releases/download/v2.31.1.windows.1/MinGit-2.31.1-64-bit.zip -OutFile git.zip; ` Expand-Archive git.zip -DestinationPath C:\git; FROM mcr.microsoft.com/powershell:nanoserver-1909