From ad97a5b7a5a7a94bfd6ecdd27f47aa87dde289a5 Mon Sep 17 00:00:00 2001 From: Claudiu Belu Date: Sun, 13 Dec 2020 06:23:28 -0800 Subject: [PATCH] pause image: Adds 20H2 Windows OS Version base image A new Windows image has been released in the second half of 2020 with the tag 20H2. We are going to need a pause image for it as well. The image tag can be found here: https://hub.docker.com/_/microsoft-windows-nanoserver --- build/pause/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build/pause/Makefile b/build/pause/Makefile index 77557543cdb..a0a6ce42268 100644 --- a/build/pause/Makefile +++ b/build/pause/Makefile @@ -25,8 +25,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 -OSVERSION ?= 1809 1903 1909 2004 +# OS Version for the Windows images: 1809, 1903, 1909 2004, 20H2 +OSVERSION ?= 1809 1903 1909 2004 20H2 # The output type could either be docker (local), or registry. # If it is registry, it will also allow us to push the Windows images. @@ -36,7 +36,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 +ALL_OSVERSIONS.windows := 1809 1903 1909 2004 20H2 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}})