From de2812c950e7bf350038b66f2d27e933cfe1159f Mon Sep 17 00:00:00 2001 From: nravada Date: Wed, 4 Mar 2026 12:19:12 +0530 Subject: [PATCH 1/4] feat: add Windows 2019 and Windows 2022 infrastructure bundle images (NR-528123) --- .github/workflows/build.yml | 42 ++++++++++++++- .github/workflows/nightly.yml | 50 +++++++++++++++++- .github/workflows/on-demand.yml | 52 ++++++++++++++++++- .github/workflows/release.yml | 92 +++++++++++++++++++++++++++++++-- Dockerfile.windows | 5 ++ docker-build-windows.sh | 45 ++++++++++++++++ 6 files changed, 278 insertions(+), 8 deletions(-) create mode 100644 Dockerfile.windows create mode 100755 docker-build-windows.sh diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c26445aa..08a78a4b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -38,7 +38,7 @@ jobs: - name: Check if CHANGELOG is valid uses: newrelic/release-toolkit/validate-markdown@v1 - + build-fips: name: Build fips and scan image runs-on: ubuntu-latest @@ -71,3 +71,43 @@ jobs: - name: Check if CHANGELOG is valid uses: newrelic/release-toolkit/validate-markdown@v1 + + build-windows-2019: + name: Build Windows 2019 image + runs-on: windows-2019 + env: + DOCKER_IMAGE: newrelic/infrastructure-bundle + DOCKER_IMAGE_TAG: ci + WINDOWS_VERSION: ltsc2019 + steps: + - uses: actions/checkout@v4 + - name: Switch to Windows containers + run: | + & "$Env:ProgramFiles\Docker\Docker\DockerCli.exe" -SwitchWindowsEngine + shell: pwsh + - uses: actions/setup-go@v5 + with: + go-version-file: go.mod + - name: Build Windows 2019 image + shell: bash + run: ./docker-build-windows.sh + + build-windows-2022: + name: Build Windows 2022 image + runs-on: windows-2022 + env: + DOCKER_IMAGE: newrelic/infrastructure-bundle + DOCKER_IMAGE_TAG: ci + WINDOWS_VERSION: ltsc2022 + steps: + - uses: actions/checkout@v4 + - name: Switch to Windows containers + run: | + & "$Env:ProgramFiles\Docker\Docker\DockerCli.exe" -SwitchWindowsEngine + shell: pwsh + - uses: actions/setup-go@v5 + with: + go-version-file: go.mod + - name: Build Windows 2022 image + shell: bash + run: ./docker-build-windows.sh diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 61432452..6ed5f721 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -30,7 +30,7 @@ jobs: setup_go: true go_version_file: go.mod trivy_scan: true - + nightly-fips: name: Nightly FIPS build uses: newrelic/coreint-automation/.github/workflows/reusable_nightly.yaml@v3 @@ -56,3 +56,51 @@ jobs: setup_go: true go_version_file: go.mod trivy_scan: true + + nightly-windows-2019: + name: Nightly Windows 2019 build + runs-on: windows-2019 + steps: + - uses: actions/checkout@v4 + - name: Switch to Windows containers + run: | + & "$Env:ProgramFiles\Docker\Docker\DockerCli.exe" -SwitchWindowsEngine + shell: pwsh + - uses: actions/setup-go@v5 + with: + go-version-file: go.mod + - uses: docker/login-action@v3 + with: + username: ${{ secrets.OHAI_DOCKER_HUB_ID }} + password: ${{ secrets.OHAI_DOCKER_HUB_PASSWORD }} + - name: Build and push nightly Windows 2019 image + shell: bash + env: + DOCKER_IMAGE: newrelic/infrastructure-bundle + DOCKER_IMAGE_TAG: nightly + WINDOWS_VERSION: ltsc2019 + run: ./docker-build-windows.sh --push + + nightly-windows-2022: + name: Nightly Windows 2022 build + runs-on: windows-2022 + steps: + - uses: actions/checkout@v4 + - name: Switch to Windows containers + run: | + & "$Env:ProgramFiles\Docker\Docker\DockerCli.exe" -SwitchWindowsEngine + shell: pwsh + - uses: actions/setup-go@v5 + with: + go-version-file: go.mod + - uses: docker/login-action@v3 + with: + username: ${{ secrets.OHAI_DOCKER_HUB_ID }} + password: ${{ secrets.OHAI_DOCKER_HUB_PASSWORD }} + - name: Build and push nightly Windows 2022 image + shell: bash + env: + DOCKER_IMAGE: newrelic/infrastructure-bundle + DOCKER_IMAGE_TAG: nightly + WINDOWS_VERSION: ltsc2022 + run: ./docker-build-windows.sh --push diff --git a/.github/workflows/on-demand.yml b/.github/workflows/on-demand.yml index bf2c34c0..091ed1be 100644 --- a/.github/workflows/on-demand.yml +++ b/.github/workflows/on-demand.yml @@ -47,7 +47,7 @@ jobs: password: ${{ secrets.OHAI_DOCKER_HUB_PASSWORD }} - name: Build and push docker image run: ./docker-build.sh . --push - + build-fips: name: Build fips and push image runs-on: ubuntu-latest @@ -92,3 +92,53 @@ jobs: password: ${{ secrets.OHAI_DOCKER_HUB_PASSWORD }} - name: Build and push docker image run: ./docker-build.sh . --push + + build-windows-2019: + name: Build and push Windows 2019 image + runs-on: windows-2019 + env: + DOCKER_IMAGE: newrelic/infrastructure-bundle + DOCKER_IMAGE_TAG: dev + AGENT_VERSION: ${{ github.event.inputs.agent_version }} + WINDOWS_VERSION: ltsc2019 + steps: + - uses: actions/checkout@v4 + - name: Switch to Windows containers + run: | + & "$Env:ProgramFiles\Docker\Docker\DockerCli.exe" -SwitchWindowsEngine + shell: pwsh + - uses: actions/setup-go@v5 + with: + go-version-file: go.mod + - uses: docker/login-action@v3 + with: + username: ${{ secrets.OHAI_DOCKER_HUB_ID }} + password: ${{ secrets.OHAI_DOCKER_HUB_PASSWORD }} + - name: Build and push Windows 2019 image + shell: bash + run: ./docker-build-windows.sh --push + + build-windows-2022: + name: Build and push Windows 2022 image + runs-on: windows-2022 + env: + DOCKER_IMAGE: newrelic/infrastructure-bundle + DOCKER_IMAGE_TAG: dev + AGENT_VERSION: ${{ github.event.inputs.agent_version }} + WINDOWS_VERSION: ltsc2022 + steps: + - uses: actions/checkout@v4 + - name: Switch to Windows containers + run: | + & "$Env:ProgramFiles\Docker\Docker\DockerCli.exe" -SwitchWindowsEngine + shell: pwsh + - uses: actions/setup-go@v5 + with: + go-version-file: go.mod + - uses: docker/login-action@v3 + with: + username: ${{ secrets.OHAI_DOCKER_HUB_ID }} + password: ${{ secrets.OHAI_DOCKER_HUB_PASSWORD }} + - name: Build and push Windows 2022 image + shell: bash + run: ./docker-build-windows.sh --push diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6341482a..f9941773 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -9,7 +9,7 @@ jobs: with: original_repo_name: 'newrelic/infrastructure-bundle' docker_image_name: 'newrelic/infrastructure-bundle' - + release_command_sh: | go run downloader.go ./docker-build.sh . --push @@ -17,7 +17,7 @@ jobs: export DOCKER_IMAGE_TAG=latest ./docker-build.sh . --push fi - + secrets: docker_username: ${{ secrets.OHAI_DOCKER_HUB_ID }} docker_password: ${{ secrets.OHAI_DOCKER_HUB_PASSWORD }} @@ -30,7 +30,7 @@ jobs: with: original_repo_name: 'newrelic/infrastructure-bundle' docker_image_name: 'newrelic/infrastructure-bundle-fips' - + release_command_sh: | go run downloader.go -bundle=bundle-fips.yml -outdir=out-fips export DOCKER_PLATFORMS=linux/amd64,linux/arm64 @@ -42,10 +42,92 @@ jobs: export DOCKER_IMAGE_TAG=latest ./docker-build.sh . --push fi - + secrets: docker_username: ${{ secrets.OHAI_DOCKER_HUB_ID }} docker_password: ${{ secrets.OHAI_DOCKER_HUB_PASSWORD }} bot_token: ${{ secrets.COREINT_BOT_TOKEN }} slack_channel: ${{ secrets.COREINT_SLACK_CHANNEL }} - slack_token: ${{ secrets.COREINT_SLACK_TOKEN }} \ No newline at end of file + slack_token: ${{ secrets.COREINT_SLACK_TOKEN }} + + container-release-windows-2019: + name: Release Windows 2019 image + runs-on: windows-2019 + steps: + - uses: actions/checkout@v4 + - name: Switch to Windows containers + run: | + & "$Env:ProgramFiles\Docker\Docker\DockerCli.exe" -SwitchWindowsEngine + shell: pwsh + - uses: actions/setup-go@v5 + with: + go-version-file: go.mod + - uses: docker/login-action@v3 + with: + username: ${{ secrets.OHAI_DOCKER_HUB_ID }} + password: ${{ secrets.OHAI_DOCKER_HUB_PASSWORD }} + - name: Set release tag + id: release_tag + shell: bash + run: | + TAG="${{ github.event.release.tag_name }}" + TAG="${TAG#v}" + if [[ "${{ github.event.release.prerelease }}" == "true" ]]; then + TAG="${TAG}-rc" + fi + echo "tag=${TAG}" >> $GITHUB_OUTPUT + - name: Build and push Windows 2019 image + shell: bash + env: + DOCKER_IMAGE: newrelic/infrastructure-bundle + DOCKER_IMAGE_TAG: ${{ steps.release_tag.outputs.tag }} + WINDOWS_VERSION: ltsc2019 + run: ./docker-build-windows.sh --push + - name: Push latest tag for Windows 2019 + if: ${{ github.event.release.prerelease == false }} + shell: bash + run: | + docker tag "newrelic/infrastructure-bundle:${{ steps.release_tag.outputs.tag }}-servercore-ltsc2019" \ + "newrelic/infrastructure-bundle:latest-servercore-ltsc2019" + docker push "newrelic/infrastructure-bundle:latest-servercore-ltsc2019" + + container-release-windows-2022: + name: Release Windows 2022 image + runs-on: windows-2022 + steps: + - uses: actions/checkout@v4 + - name: Switch to Windows containers + run: | + & "$Env:ProgramFiles\Docker\Docker\DockerCli.exe" -SwitchWindowsEngine + shell: pwsh + - uses: actions/setup-go@v5 + with: + go-version-file: go.mod + - uses: docker/login-action@v3 + with: + username: ${{ secrets.OHAI_DOCKER_HUB_ID }} + password: ${{ secrets.OHAI_DOCKER_HUB_PASSWORD }} + - name: Set release tag + id: release_tag + shell: bash + run: | + TAG="${{ github.event.release.tag_name }}" + TAG="${TAG#v}" + if [[ "${{ github.event.release.prerelease }}" == "true" ]]; then + TAG="${TAG}-rc" + fi + echo "tag=${TAG}" >> $GITHUB_OUTPUT + - name: Build and push Windows 2022 image + shell: bash + env: + DOCKER_IMAGE: newrelic/infrastructure-bundle + DOCKER_IMAGE_TAG: ${{ steps.release_tag.outputs.tag }} + WINDOWS_VERSION: ltsc2022 + run: ./docker-build-windows.sh --push + - name: Push latest tag for Windows 2022 + if: ${{ github.event.release.prerelease == false }} + shell: bash + run: | + docker tag "newrelic/infrastructure-bundle:${{ steps.release_tag.outputs.tag }}-servercore-ltsc2022" \ + "newrelic/infrastructure-bundle:latest-servercore-ltsc2022" + docker push "newrelic/infrastructure-bundle:latest-servercore-ltsc2022" diff --git a/Dockerfile.windows b/Dockerfile.windows new file mode 100644 index 00000000..4a0162c3 --- /dev/null +++ b/Dockerfile.windows @@ -0,0 +1,5 @@ +ARG agent_version=latest +ARG windows_version=ltsc2019 +ARG base_image_name=newrelic/infrastructure-windows + +FROM ${base_image_name}:${agent_version}-servercore-${windows_version} diff --git a/docker-build-windows.sh b/docker-build-windows.sh new file mode 100755 index 00000000..1749d8a8 --- /dev/null +++ b/docker-build-windows.sh @@ -0,0 +1,45 @@ +#!/usr/bin/env sh + +# Wrapper script for building Windows docker images. +# Windows containers do not support cross-compilation via buildx, +# so this uses plain `docker build` and must run on a Windows host +# with Docker switched to Windows containers mode. + +DOCKER_IMAGE=${DOCKER_IMAGE:-newrelic/infrastructure-bundle} +DOCKER_IMAGE_TAG=${DOCKER_IMAGE_TAG:-dev} +WINDOWS_VERSION=${WINDOWS_VERSION:-ltsc2019} +BASE_IMAGE_NAME=${BASE_IMAGE_NAME:-newrelic/infrastructure-windows} + +echo "base_image_name $BASE_IMAGE_NAME\n" + +# Get default AGENT_VERSION from downloader.go +if [ -z "$AGENT_VERSION" ]; then + AGENT_VERSION=$(go run ./downloader.go -agent-version) + if [ -z "$AGENT_VERSION" ]; then + echo "Could not get agent version from downloader.go" >&2 + exit 1 + fi +fi + +echo "Building Windows image for ${WINDOWS_VERSION} with agent_version=${AGENT_VERSION}" + +# Parse --push from args since plain `docker build` does not support it (unlike buildx) +PUSH=false +for arg in "$@"; do + if [ "$arg" = "--push" ]; then + PUSH=true + fi +done + +FULL_TAG="${DOCKER_IMAGE}:${DOCKER_IMAGE_TAG}-servercore-${WINDOWS_VERSION}" + +docker build \ + --build-arg agent_version="${AGENT_VERSION}" \ + --build-arg windows_version="${WINDOWS_VERSION}" \ + --build-arg base_image_name="${BASE_IMAGE_NAME}" \ + -t "${FULL_TAG}" \ + -f Dockerfile.windows . + +if [ "$PUSH" = "true" ]; then + docker push "${FULL_TAG}" +fi From 79c89ff4d7fde51d189d6472e602b7988dbfffc9 Mon Sep 17 00:00:00 2001 From: nravada Date: Wed, 4 Mar 2026 12:33:59 +0530 Subject: [PATCH 2/4] fix: replace DockerCli.exe with daemon reconfiguration for Windows containers (NR-528123) --- .github/workflows/build.yml | 18 ++++++++++++++++-- .github/workflows/nightly.yml | 18 ++++++++++++++++-- .github/workflows/on-demand.yml | 18 ++++++++++++++++-- .github/workflows/release.yml | 18 ++++++++++++++++-- 4 files changed, 64 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 08a78a4b..cb81b245 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -83,7 +83,14 @@ jobs: - uses: actions/checkout@v4 - name: Switch to Windows containers run: | - & "$Env:ProgramFiles\Docker\Docker\DockerCli.exe" -SwitchWindowsEngine + Stop-Service docker -Force + $configPath = "$env:ProgramData\docker\config\daemon.json" + if (-not (Test-Path (Split-Path $configPath))) { + New-Item -ItemType Directory -Force -Path (Split-Path $configPath) | Out-Null + } + Set-Content -Path $configPath -Value '{"experimental":true}' + Start-Service docker + Start-Sleep 5 shell: pwsh - uses: actions/setup-go@v5 with: @@ -103,7 +110,14 @@ jobs: - uses: actions/checkout@v4 - name: Switch to Windows containers run: | - & "$Env:ProgramFiles\Docker\Docker\DockerCli.exe" -SwitchWindowsEngine + Stop-Service docker -Force + $configPath = "$env:ProgramData\docker\config\daemon.json" + if (-not (Test-Path (Split-Path $configPath))) { + New-Item -ItemType Directory -Force -Path (Split-Path $configPath) | Out-Null + } + Set-Content -Path $configPath -Value '{"experimental":true}' + Start-Service docker + Start-Sleep 5 shell: pwsh - uses: actions/setup-go@v5 with: diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 6ed5f721..3a8221e5 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -64,7 +64,14 @@ jobs: - uses: actions/checkout@v4 - name: Switch to Windows containers run: | - & "$Env:ProgramFiles\Docker\Docker\DockerCli.exe" -SwitchWindowsEngine + Stop-Service docker -Force + $configPath = "$env:ProgramData\docker\config\daemon.json" + if (-not (Test-Path (Split-Path $configPath))) { + New-Item -ItemType Directory -Force -Path (Split-Path $configPath) | Out-Null + } + Set-Content -Path $configPath -Value '{"experimental":true}' + Start-Service docker + Start-Sleep 5 shell: pwsh - uses: actions/setup-go@v5 with: @@ -88,7 +95,14 @@ jobs: - uses: actions/checkout@v4 - name: Switch to Windows containers run: | - & "$Env:ProgramFiles\Docker\Docker\DockerCli.exe" -SwitchWindowsEngine + Stop-Service docker -Force + $configPath = "$env:ProgramData\docker\config\daemon.json" + if (-not (Test-Path (Split-Path $configPath))) { + New-Item -ItemType Directory -Force -Path (Split-Path $configPath) | Out-Null + } + Set-Content -Path $configPath -Value '{"experimental":true}' + Start-Service docker + Start-Sleep 5 shell: pwsh - uses: actions/setup-go@v5 with: diff --git a/.github/workflows/on-demand.yml b/.github/workflows/on-demand.yml index 091ed1be..eb84285c 100644 --- a/.github/workflows/on-demand.yml +++ b/.github/workflows/on-demand.yml @@ -105,7 +105,14 @@ jobs: - uses: actions/checkout@v4 - name: Switch to Windows containers run: | - & "$Env:ProgramFiles\Docker\Docker\DockerCli.exe" -SwitchWindowsEngine + Stop-Service docker -Force + $configPath = "$env:ProgramData\docker\config\daemon.json" + if (-not (Test-Path (Split-Path $configPath))) { + New-Item -ItemType Directory -Force -Path (Split-Path $configPath) | Out-Null + } + Set-Content -Path $configPath -Value '{"experimental":true}' + Start-Service docker + Start-Sleep 5 shell: pwsh - uses: actions/setup-go@v5 with: @@ -130,7 +137,14 @@ jobs: - uses: actions/checkout@v4 - name: Switch to Windows containers run: | - & "$Env:ProgramFiles\Docker\Docker\DockerCli.exe" -SwitchWindowsEngine + Stop-Service docker -Force + $configPath = "$env:ProgramData\docker\config\daemon.json" + if (-not (Test-Path (Split-Path $configPath))) { + New-Item -ItemType Directory -Force -Path (Split-Path $configPath) | Out-Null + } + Set-Content -Path $configPath -Value '{"experimental":true}' + Start-Service docker + Start-Sleep 5 shell: pwsh - uses: actions/setup-go@v5 with: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f9941773..1f8ea095 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -57,7 +57,14 @@ jobs: - uses: actions/checkout@v4 - name: Switch to Windows containers run: | - & "$Env:ProgramFiles\Docker\Docker\DockerCli.exe" -SwitchWindowsEngine + Stop-Service docker -Force + $configPath = "$env:ProgramData\docker\config\daemon.json" + if (-not (Test-Path (Split-Path $configPath))) { + New-Item -ItemType Directory -Force -Path (Split-Path $configPath) | Out-Null + } + Set-Content -Path $configPath -Value '{"experimental":true}' + Start-Service docker + Start-Sleep 5 shell: pwsh - uses: actions/setup-go@v5 with: @@ -98,7 +105,14 @@ jobs: - uses: actions/checkout@v4 - name: Switch to Windows containers run: | - & "$Env:ProgramFiles\Docker\Docker\DockerCli.exe" -SwitchWindowsEngine + Stop-Service docker -Force + $configPath = "$env:ProgramData\docker\config\daemon.json" + if (-not (Test-Path (Split-Path $configPath))) { + New-Item -ItemType Directory -Force -Path (Split-Path $configPath) | Out-Null + } + Set-Content -Path $configPath -Value '{"experimental":true}' + Start-Service docker + Start-Sleep 5 shell: pwsh - uses: actions/setup-go@v5 with: From fa6ba641ab36fc4bbcaed235647ac122f9b5e98a Mon Sep 17 00:00:00 2001 From: nravada Date: Wed, 4 Mar 2026 13:19:45 +0530 Subject: [PATCH 3/4] fix: base image tag (NR-528123) --- Dockerfile.windows | 5 ++--- docker-build-windows.sh | 6 ++++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Dockerfile.windows b/Dockerfile.windows index 4a0162c3..641ecd11 100644 --- a/Dockerfile.windows +++ b/Dockerfile.windows @@ -1,5 +1,4 @@ -ARG agent_version=latest -ARG windows_version=ltsc2019 +ARG base_image_tag=latest ARG base_image_name=newrelic/infrastructure-windows -FROM ${base_image_name}:${agent_version}-servercore-${windows_version} +FROM ${base_image_name}:${base_image_tag} diff --git a/docker-build-windows.sh b/docker-build-windows.sh index 1749d8a8..45bbd204 100755 --- a/docker-build-windows.sh +++ b/docker-build-windows.sh @@ -21,6 +21,9 @@ if [ -z "$AGENT_VERSION" ]; then fi fi +# Base image tag format: {version}-{windows_version} e.g. 1.72.6-ltsc2019 +BASE_IMAGE_TAG="${AGENT_VERSION}-${WINDOWS_VERSION}" + echo "Building Windows image for ${WINDOWS_VERSION} with agent_version=${AGENT_VERSION}" # Parse --push from args since plain `docker build` does not support it (unlike buildx) @@ -34,8 +37,7 @@ done FULL_TAG="${DOCKER_IMAGE}:${DOCKER_IMAGE_TAG}-servercore-${WINDOWS_VERSION}" docker build \ - --build-arg agent_version="${AGENT_VERSION}" \ - --build-arg windows_version="${WINDOWS_VERSION}" \ + --build-arg base_image_tag="${BASE_IMAGE_TAG}" \ --build-arg base_image_name="${BASE_IMAGE_NAME}" \ -t "${FULL_TAG}" \ -f Dockerfile.windows . From 3615523ebcdddfa28589371d9fc90754276b5333 Mon Sep 17 00:00:00 2001 From: nravada Date: Wed, 4 Mar 2026 13:40:26 +0530 Subject: [PATCH 4/4] fix: build 2019 image on 2022 runner as 2019 runner depricated (NR-528123) --- .github/workflows/build.yml | 2 +- .github/workflows/nightly.yml | 2 +- .github/workflows/on-demand.yml | 2 +- .github/workflows/release.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index cb81b245..7144e3b2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -74,7 +74,7 @@ jobs: build-windows-2019: name: Build Windows 2019 image - runs-on: windows-2019 + runs-on: windows-2022 env: DOCKER_IMAGE: newrelic/infrastructure-bundle DOCKER_IMAGE_TAG: ci diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 3a8221e5..832502e6 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -59,7 +59,7 @@ jobs: nightly-windows-2019: name: Nightly Windows 2019 build - runs-on: windows-2019 + runs-on: windows-2022 steps: - uses: actions/checkout@v4 - name: Switch to Windows containers diff --git a/.github/workflows/on-demand.yml b/.github/workflows/on-demand.yml index eb84285c..36eb36e5 100644 --- a/.github/workflows/on-demand.yml +++ b/.github/workflows/on-demand.yml @@ -95,7 +95,7 @@ jobs: build-windows-2019: name: Build and push Windows 2019 image - runs-on: windows-2019 + runs-on: windows-2022 env: DOCKER_IMAGE: newrelic/infrastructure-bundle DOCKER_IMAGE_TAG: dev diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1f8ea095..69a436d5 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -52,7 +52,7 @@ jobs: container-release-windows-2019: name: Release Windows 2019 image - runs-on: windows-2019 + runs-on: windows-2022 steps: - uses: actions/checkout@v4 - name: Switch to Windows containers