Skip to content

Commit 74df043

Browse files
authored
Merge pull request #1774 from aramase/aramase/f/ltsc_2025
feat: add build for windows ltsc2025
2 parents 755f939 + bf7e77e commit 74df043

File tree

3 files changed

+4
-2
lines changed

3 files changed

+4
-2
lines changed

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,14 +64,14 @@ ALL_OS = linux windows
6464
ALL_ARCH_linux ?= amd64 arm64
6565
ALL_OS_ARCH_linux = $(foreach arch, ${ALL_ARCH_linux}, linux-$(arch))
6666
ALL_ARCH_windows = amd64
67-
ALL_OSVERSIONS_windows := 1809 ltsc2022
67+
ALL_OSVERSIONS_windows := 1809 ltsc2022 ltsc2025
6868
ALL_OS_ARCH_windows = $(foreach arch, $(ALL_ARCH_windows), $(foreach osversion, ${ALL_OSVERSIONS_windows}, windows-${osversion}-${arch}))
6969
ALL_OS_ARCH = $(foreach os, $(ALL_OS), ${ALL_OS_ARCH_${os}})
7070

7171
# The current context of image building
7272
# The architecture of the image
7373
ARCH ?= amd64
74-
# OS Version for the Windows images: 1809, ltsc2022
74+
# OS Version for the Windows images: 1809, ltsc2022, ltsc2025
7575
OSVERSION ?= 1809
7676
# Output type of docker buildx build
7777
OUTPUT_TYPE ?= registry

docker/BASEIMAGE

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@ linux/amd64=registry.k8s.io/build-image/debian-base:bookworm-v1.0.4
22
linux/arm64=registry.k8s.io/build-image/debian-base:bookworm-v1.0.4
33
windows/amd64/1809=mcr.microsoft.com/windows/nanoserver:1809
44
windows/amd64/ltsc2022=mcr.microsoft.com/windows/nanoserver:ltsc2022
5+
windows/amd64/ltsc2025=mcr.microsoft.com/windows/nanoserver:ltsc2025

docker/BASEIMAGE_CORE

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
windows/amd64/1809=gcr.io/k8s-staging-e2e-test-images/windows-servercore-cache:1.0-linux-amd64-1809
22
windows/amd64/ltsc2022=gcr.io/k8s-staging-e2e-test-images/windows-servercore-cache:1.0-linux-amd64-ltsc2022
3+
windows/amd64/ltsc2025=gcr.io/k8s-staging-e2e-test-images/windows-servercore-cache:1.0-linux-amd64-ltsc2025

0 commit comments

Comments
 (0)