Skip to content
Snippets Groups Projects
Commit a9c663a2 authored by Arran Walker's avatar Arran Walker
Browse files

Merge branch 'windows-21h1' into 'master'

Add support for windows 21h1 / ltsc2022

See merge request !6
parents 002dab7d a47ccb05
No related branches found
No related tags found
1 merge request!6Add support for windows 21h1 / ltsc2022
Pipeline #525080243 passed
......@@ -70,6 +70,16 @@ test-build-windows20h2:
script:
- make build-windows WINDOWS_PLATFORMS=nanoserver-20h2
test-build-windows21h1:
stage: test
extends: .windows-dependencies
rules:
- if: $CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH
tags:
- windows-21h1
script:
- make build-windows WINDOWS_PLATFORMS=nanoserver-21h1
build-linux:
stage: build-push
extends: .linux-dependencies
......@@ -119,6 +129,18 @@ build-windows20h2:
- make build-windows WINDOWS_PLATFORMS=nanoserver-20h2
- make push
build-windows21h1:
stage: build-push
extends: .windows-dependencies
rules:
- if: $CI_COMMIT_TAG
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
tags:
- windows-21h1
script:
- make build-windows WINDOWS_PLATFORMS=nanoserver-21h1
- make push
push-multiarch:
stage: multiarch
rules:
......
FROM --platform=$BUILDPLATFORM golang:1.14-alpine AS builder
FROM --platform=$BUILDPLATFORM golang:1.16-alpine AS builder
ARG TARGETOS
ARG TARGETARCH
......
ARG TAG=1809
ARG GOLANG_TAG=${TAG}
FROM rancher/golang:1.14-windowsservercore-${GOLANG_TAG} AS builder
FROM rancher/golang:1.16-windowsservercore-${GOLANG_TAG} AS builder
WORKDIR C:/gopath/src/liveness
COPY . .
......
......@@ -13,6 +13,7 @@ LINUX_PLATFORMS += amd64
WINDOWS_PLATFORMS += nanoserver-1809
WINDOWS_PLATFORMS += nanoserver-2004
WINDOWS_PLATFORMS += nanoserver-20h2
WINDOWS_PLATFORMS += nanoserver-21h1
build-linux:
@ make $(foreach PLATFORM,$(LINUX_PLATFORMS),platform-linux-$(PLATFORM))
......@@ -29,6 +30,10 @@ platform-windows-nanoserver-20h2:
@ docker build -f Dockerfile.windows --build-arg=TAG=20h2 --build-arg=GOLANG_TAG=20H2 \
-t $(CI_REGISTRY_IMAGE):$(VERSION)-$(subst platform-windows-,,$@)-$(CI_COMMIT_SHORT_SHA) .
platform-windows-nanoserver-21h1:
@ docker build -f Dockerfile.windows --build-arg=TAG=ltsc2022 --build-arg=GOLANG_TAG=ltsc2022 \
-t $(CI_REGISTRY_IMAGE):$(VERSION)-$(subst platform-windows-,,$@)-$(CI_COMMIT_SHORT_SHA) .
platform-windows-%:
@ docker build -f Dockerfile.windows --build-arg=TAG=$(subst platform-windows-nanoserver-,,$@) --build-arg=GOLANG_TAG=$(subst platform-windows-nanoserver-,,$@) \
-t $(CI_REGISTRY_IMAGE):$(VERSION)-$(subst platform-windows-,,$@)-$(CI_COMMIT_SHORT_SHA) .
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment