From 80e3874a3d8e6030c5fb0b18095d8598f4ee8651 Mon Sep 17 00:00:00 2001 From: Chad Wilson Date: Fri, 27 Dec 2024 13:12:55 +0800 Subject: [PATCH] Revert "Try building on Windows Server Core 2025" This reverts commit eb56caf485d24de6e2dc9fc244600609434c5415. --- .github/workflows/docker-publish.yml | 4 ++-- README.md | 4 ++-- windowsservercore.Dockerfile | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index 7aa28b0..065ec44 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -178,7 +178,7 @@ jobs: pull: true windows: - runs-on: windows-2025 + runs-on: windows-2022 steps: - uses: actions/checkout@v4 @@ -192,7 +192,7 @@ jobs: images: ${{ env.REGISTRY_IMAGE }} flavor: | latest=false - prefix=windows2025- + prefix=windows2022- - name: Build and push id: build diff --git a/README.md b/README.md index cdc818b..f79587f 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ - `gocddev/gocd-dev-build:dind-` - `gocddev/gocd-dev-build:rhelcompat-9-` - `gocddev/gocd-dev-build:ubuntu-24-04-` -- `gocddev/gocd-dev-build:windows2025-` +- `gocddev/gocd-dev-build:windows2022-` To build a new version of the images, push a new version tag to this repository. @@ -12,7 +12,7 @@ To build a new version of the images, push a new version tag to this repository. - ```docker build . --pull -t gocddev/gocd-dev-build:dind-SNAPSHOT -f dind.Dockerfile``` - ```docker build . --pull -t gocddev/gocd-dev-build:rhelcompat-9-SNAPSHOT -f rhel-compat.Dockerfile``` - ```docker build . --pull -t gocddev/gocd-dev-build:ubuntu-24-04-SNAPSHOT -f ubuntu.Dockerfile``` -- ```docker build . --pull -t gocddev/gocd-dev-build:windows2025-SNAPSHOT -f windowsservercore.Dockerfile``` +- ```docker build . --pull -t gocddev/gocd-dev-build:windows2022-SNAPSHOT -f windowsservercore.Dockerfile``` # Publish diff --git a/windowsservercore.Dockerfile b/windowsservercore.Dockerfile index 4c5c090..28d5042 100644 --- a/windowsservercore.Dockerfile +++ b/windowsservercore.Dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/windows/servercore:ltsc2025 +FROM mcr.microsoft.com/windows/servercore:ltsc2022 LABEL org.opencontainers.image.authors="GoCD Team " # Shamelessly nabbed from https://github.com/gantrior/docker-chrome-windows