From 6070a4202e4032841b12c97adc0396c74ad25381 Mon Sep 17 00:00:00 2001 From: JT Date: Tue, 26 May 2026 10:50:23 +1000 Subject: [PATCH 1/5] Basebones install of Chocolatey on a new container to test build process --- windows.ltsc2025/Dockerfile | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 windows.ltsc2025/Dockerfile diff --git a/windows.ltsc2025/Dockerfile b/windows.ltsc2025/Dockerfile new file mode 100644 index 0000000..a251c59 --- /dev/null +++ b/windows.ltsc2025/Dockerfile @@ -0,0 +1,11 @@ +# escape=` + +FROM mcr.microsoft.com/windows/servercore:ltsc2025 +SHELL ["powershell", "-Command"] + + +# Install Choco +RUN $ProgressPreference = 'SilentlyContinue'; ` + Set-ExecutionPolicy Bypass -Scope Process -Force; ` + [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; ` + iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1')) From 6fa1f229fce0da6b4e91f813ee0ad6355dd5354c Mon Sep 17 00:00:00 2001 From: JT Date: Tue, 26 May 2026 11:10:03 +1000 Subject: [PATCH 2/5] more dummy data --- docker-compose.build.yml | 7 +++++++ windows.ltsc2025/scripts/run-tests.ps1 | 13 +++++++++++++ 2 files changed, 20 insertions(+) create mode 100644 windows.ltsc2025/scripts/run-tests.ps1 diff --git a/docker-compose.build.yml b/docker-compose.build.yml index e71b772..b3d9e6d 100644 --- a/docker-compose.build.yml +++ b/docker-compose.build.yml @@ -52,3 +52,10 @@ services: - "./windows.ltsc2022:c:\\app" working_dir: "c:\\app" entrypoint: ["pwsh", "-file", "scripts/run-tests.ps1"] + windows.ltsc2025: + build: windows.ltsc2025 + image: docker.packages.octopushq.com/octopusdeploy/worker-tools:${BUILD_NUMBER?err}-windows.ltsc2025 + volumes: + - "./windows.ltsc2025:c:\\app" + working_dir: "c:\\app" + entrypoint: ["pwsh", "-file", "scripts/run-tests.ps1"] diff --git a/windows.ltsc2025/scripts/run-tests.ps1 b/windows.ltsc2025/scripts/run-tests.ps1 new file mode 100644 index 0000000..554b0ba --- /dev/null +++ b/windows.ltsc2025/scripts/run-tests.ps1 @@ -0,0 +1,13 @@ +Write-Output "##teamcity[blockOpened name='Pester tests']" + +try { + Install-Module -Name "Pester" -MinimumVersion "5.5.0" -Force + + Import-Module -Name "Pester" + + Write-Ouput "Nothing to see here, it's all fake, just to test the build process" + +} catch { + exit 1 +} +Write-Output "##teamcity[blockClosed name='Pester tests']" From c3e63a0b6104ebf13a6fd5043a9294cd080a95b0 Mon Sep 17 00:00:00 2001 From: JT Date: Tue, 26 May 2026 11:46:55 +1000 Subject: [PATCH 3/5] Create buld-win-2025.yaml --- .github/workflows/buld-win-2025.yaml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 .github/workflows/buld-win-2025.yaml diff --git a/.github/workflows/buld-win-2025.yaml b/.github/workflows/buld-win-2025.yaml new file mode 100644 index 0000000..c0d222e --- /dev/null +++ b/.github/workflows/buld-win-2025.yaml @@ -0,0 +1,16 @@ +name: Build Windows 2025 Docker Image + +on: + push: + branches: [ "prepare-windows-2025-image" ] + +jobs: + + build: + + runs-on: windows-latest + + steps: + - uses: actions/checkout@v4 + - name: Build the Docker image + run: docker build windows.ltsc2025 --file windows.ltsc2025/Dockerfile --tag worker-tools-windows-ltsc2025:$(date +%s) From 61cd8462a191ad4fbebbc2b8f41178aa7132625f Mon Sep 17 00:00:00 2001 From: JT Date: Tue, 26 May 2026 11:48:34 +1000 Subject: [PATCH 4/5] fix tag --- .github/workflows/buld-win-2025.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/buld-win-2025.yaml b/.github/workflows/buld-win-2025.yaml index c0d222e..e050e29 100644 --- a/.github/workflows/buld-win-2025.yaml +++ b/.github/workflows/buld-win-2025.yaml @@ -13,4 +13,4 @@ jobs: steps: - uses: actions/checkout@v4 - name: Build the Docker image - run: docker build windows.ltsc2025 --file windows.ltsc2025/Dockerfile --tag worker-tools-windows-ltsc2025:$(date +%s) + run: docker build windows.ltsc2025 --file windows.ltsc2025/Dockerfile --tag worker-tools-windows-ltsc2025:${{ github.run_number }} From d45bd3648550581aba7dc3208b1b20541faf820d Mon Sep 17 00:00:00 2001 From: JT Date: Tue, 26 May 2026 12:02:22 +1000 Subject: [PATCH 5/5] bump GHA because Github can't update their default tempaltes --- .github/workflows/buld-win-2025.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/buld-win-2025.yaml b/.github/workflows/buld-win-2025.yaml index e050e29..2e36087 100644 --- a/.github/workflows/buld-win-2025.yaml +++ b/.github/workflows/buld-win-2025.yaml @@ -11,6 +11,6 @@ jobs: runs-on: windows-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 - name: Build the Docker image run: docker build windows.ltsc2025 --file windows.ltsc2025/Dockerfile --tag worker-tools-windows-ltsc2025:${{ github.run_number }}