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

Merge branch 'ajwalker/fix-docker-windows' into 'master'

Fix docker windows builds

See merge request !7
parents 2acfbea1 e553e22f
No related branches found
No related tags found
No related merge requests found
Pipeline #870241709 failed
image: docker:19.03.12
image: docker:23.0.6
variables:
DOCKER_TLS_CERTDIR: "/certs"
DOCKER_CLI_EXPERIMENTAL: enabled
services:
- name: docker:19.03.12-dind
- name: docker:23.0.6-dind
command: ["--experimental"]
stages:
......@@ -20,12 +20,14 @@ include:
before_script:
- apk add --no-cache make
- mkdir -p $HOME/.docker/cli-plugins/
- wget -O $HOME/.docker/cli-plugins/docker-buildx https://github.com/docker/buildx/releases/download/v0.4.1/buildx-v0.4.1.linux-amd64
- wget -O $HOME/.docker/cli-plugins/docker-buildx https://github.com/docker/buildx/releases/download/v0.10.4/buildx-v0.10.4.linux-amd64
- chmod a+x $HOME/.docker/cli-plugins/docker-buildx
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
.windows-dependencies:
before_script:
- Set-MpPreference -DisableRealtimeMonitoring $true
- start-service docker
- choco install -y make
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
......@@ -40,7 +42,7 @@ test-build-linux:
script:
- make build-linux
test-build-windows1803:
test-build-windows1809:
stage: test
extends: .windows-dependencies
rules:
......@@ -50,27 +52,7 @@ test-build-windows1803:
script:
- make build-windows WINDOWS_PLATFORMS=nanoserver-1809
test-build-windows2004:
stage: test
extends: .windows-dependencies
rules:
- if: $CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH
tags:
- windows-2004
script:
- make build-windows WINDOWS_PLATFORMS=nanoserver-2004
test-build-windows20h2:
stage: test
extends: .windows-dependencies
rules:
- if: $CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH
tags:
- windows-20h2
script:
- make build-windows WINDOWS_PLATFORMS=nanoserver-20h2
test-build-windows21h1:
test-build-windows21h2:
stage: test
extends: .windows-dependencies
rules:
......@@ -78,7 +60,7 @@ test-build-windows21h1:
tags:
- windows-21h1
script:
- make build-windows WINDOWS_PLATFORMS=nanoserver-21h1
- make build-windows WINDOWS_PLATFORMS=nanoserver-21h2
build-linux:
stage: build-push
......@@ -105,30 +87,6 @@ build-windows1809:
- make build-windows WINDOWS_PLATFORMS=nanoserver-1809
- make push
build-windows2004:
stage: build-push
extends: .windows-dependencies
rules:
- if: $CI_COMMIT_TAG
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
tags:
- windows-2004
script:
- make build-windows WINDOWS_PLATFORMS=nanoserver-2004
- make push
build-windows20h2:
stage: build-push
extends: .windows-dependencies
rules:
- if: $CI_COMMIT_TAG
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
tags:
- windows-20h2
script:
- make build-windows WINDOWS_PLATFORMS=nanoserver-20h2
- make push
build-windows21h1:
stage: build-push
extends: .windows-dependencies
......
......@@ -11,9 +11,7 @@ LINUX_PLATFORMS += amd64
LINUX_PLATFORMS += arm64-v8
WINDOWS_PLATFORMS += nanoserver-1809
WINDOWS_PLATFORMS += nanoserver-2004
WINDOWS_PLATFORMS += nanoserver-20h2
WINDOWS_PLATFORMS += nanoserver-21h1
WINDOWS_PLATFORMS += nanoserver-21h2
build-linux:
@ make $(foreach PLATFORM,$(LINUX_PLATFORMS),platform-linux-$(PLATFORM))
......
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