From 6ac627271d6d7e5ad5c0ecd669d5db6896a6024e Mon Sep 17 00:00:00 2001 From: Nicolas Belovoskey Date: Wed, 18 Aug 2021 13:56:42 -0700 Subject: [PATCH 1/2] Added Windows Server 2022 --- build/pause/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/pause/Makefile b/build/pause/Makefile index ebc872f0890..e0ec9559705 100644 --- a/build/pause/Makefile +++ b/build/pause/Makefile @@ -24,8 +24,8 @@ REV = $(shell git describe --contains --always --match='v*') ARCH ?= amd64 # Operating systems supported: linux, windows OS ?= linux -# OS Version for the Windows images: 1809, 1903, 1909 2004, 20H2 -OSVERSION ?= 1809 1903 1909 2004 20H2 +# OS Version for the Windows images: 1809, 1903, 1909 2004, 20H2, ltsc2022 +OSVERSION ?= 1809 1903 1909 2004 20H2 ltsc2022 # The output type could either be docker (local), or registry. # If it is registry, it will also allow us to push the Windows images. From 95b0f2a775174cce38205c12c2925914ef4197d2 Mon Sep 17 00:00:00 2001 From: Nicolas Belovoskey Date: Wed, 18 Aug 2021 14:16:03 -0700 Subject: [PATCH 2/2] Added Windows Server 2022 tag to all OS versions --- build/pause/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/pause/Makefile b/build/pause/Makefile index e0ec9559705..80e616d2210 100644 --- a/build/pause/Makefile +++ b/build/pause/Makefile @@ -35,7 +35,7 @@ ALL_OS = linux windows ALL_ARCH.linux = amd64 arm arm64 ppc64le s390x ALL_OS_ARCH.linux = $(foreach arch, ${ALL_ARCH.linux}, linux-$(arch)) ALL_ARCH.windows = amd64 -ALL_OSVERSIONS.windows := 1809 1903 1909 2004 20H2 +ALL_OSVERSIONS.windows := 1809 1903 1909 2004 20H2 ltsc2022 ALL_OS_ARCH.windows = $(foreach arch, $(ALL_ARCH.windows), $(foreach osversion, ${ALL_OSVERSIONS.windows}, windows-$(arch)-${osversion})) ALL_OS_ARCH = $(foreach os, $(ALL_OS), ${ALL_OS_ARCH.${os}})