From 35f96ce621b289ed34ecc15bec6ed4147bb5203c Mon Sep 17 00:00:00 2001 From: Tobias Gesellchen Date: Mon, 28 Feb 2022 21:19:28 +0100 Subject: [PATCH] Use windows/nanoserver:ltsc2022 as base image --- .../java/de/gesellix/docker/registry/DockerRegistry.java | 5 ++++- registry-windows/Dockerfile | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/lib/src/main/java/de/gesellix/docker/registry/DockerRegistry.java b/lib/src/main/java/de/gesellix/docker/registry/DockerRegistry.java index 39999b1..edb4e16 100644 --- a/lib/src/main/java/de/gesellix/docker/registry/DockerRegistry.java +++ b/lib/src/main/java/de/gesellix/docker/registry/DockerRegistry.java @@ -36,7 +36,10 @@ public DockerRegistry() { this.imageApi = new ImageApi(dockerClientConfig); if (LocalDocker.isNativeWindows()) { - imageNameWithTag = "gesellix/registry:2.7.1-windows"; + imageNameWithTag = "gesellix/registry:2.7.1-windows-ltsc2022"; +// imageNameWithTag = "gesellix/registry:2.7.1-windows-ltsc2019"; +// imageNameWithTag = "gesellix/registry:2.7.1-windows-1809"; +// imageNameWithTag = "gesellix/registry:2.7.1-windows"; } else { imageNameWithTag = "registry:2.8"; diff --git a/registry-windows/Dockerfile b/registry-windows/Dockerfile index 1084042..e10e075 100644 --- a/registry-windows/Dockerfile +++ b/registry-windows/Dockerfile @@ -13,7 +13,9 @@ RUN mkdir src\github.com\docker ; \ git checkout -q $env:DISTRIBUTION_VERSION ; \ go build -o registry.exe cmd/registry/main.go -FROM mcr.microsoft.com/windows/nanoserver:1809 +FROM mcr.microsoft.com/windows/nanoserver:ltsc2022 +#FROM mcr.microsoft.com/windows/servercore:ltsc2019 +#FROM mcr.microsoft.com/windows/nanoserver:1809 #FROM mcr.microsoft.com/windows/nanoserver:sac2016 EXPOSE 5000