diff --git a/.github/workflows/images_build_windows.yml b/.github/workflows/images_build_windows.yml index 45b70c0ba..9ac178483 100644 --- a/.github/workflows/images_build_windows.yml +++ b/.github/workflows/images_build_windows.yml @@ -35,8 +35,7 @@ env: IMAGES_PREFIX: "zabbix-" MSFT_BASE_BUILD_IMAGE: "mcr.microsoft.com/windows/servercore" - PWSH_BASE_IMAGE_NAME: "mcr.microsoft.com/powershell" - PWSH_BASE_IMAGE_PREFIX: "lts-nanoserver-" + OS_BASE_IMAGE_NAME: "mcr.microsoft.com/windows/nanoserver" BASE_IMAGE_NAME: "build-base" BASE_BUILD_IMAGE_NAME: "build-mysql" @@ -675,8 +674,7 @@ jobs: BASE_BUILD_OS_TAG: ${{ steps.base_os_tag.outputs.os_tag }} LABEL_REVISION: ${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.revision'] }} LABEL_CREATED: ${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.created'] }} - PWSH_BASE_IMAGE_NAME: ${{ env.PWSH_BASE_IMAGE_NAME }} - PWSH_BASE_IMAGE_PREFIX: ${{ env.PWSH_BASE_IMAGE_PREFIX }} + OS_BASE_IMAGE_NAME: ${{ env.OS_BASE_IMAGE_NAME }} AUTO_PUSH_IMAGES: ${{ env.AUTO_PUSH_IMAGES }} run: | echo "::group::Docker version" @@ -698,7 +696,7 @@ jobs: # PowerShell images based on LTSC 2019 and LTSC 2016 do not have "ltsc" prefix $os_tag_suffix=$Env:BASE_BUILD_OS_TAG $os_tag_suffix=$os_tag_suffix -replace "ltsc2019",'1809' - $base_image=$Env:PWSH_BASE_IMAGE_NAME + ':' + $Env:PWSH_BASE_IMAGE_PREFIX + $os_tag_suffix + $base_image=$Env:OS_BASE_IMAGE_NAME + ':' + $os_tag_suffix echo "::group::Image tags" echo "$Env:TAGS" diff --git a/Dockerfiles/agent/windows/Dockerfile b/Dockerfiles/agent/windows/Dockerfile index b92c5bc6c..2398e8879 100644 --- a/Dockerfiles/agent/windows/Dockerfile +++ b/Dockerfiles/agent/windows/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 # escape=` -ARG OS_BASE_IMAGE=mcr.microsoft.com/powershell:lts-nanoserver-ltsc2022 +ARG OS_BASE_IMAGE=mcr.microsoft.com/windows/nanoserver:ltsc2022 ARG MAJOR_VERSION=7.4 ARG ZBX_VERSION=${MAJOR_VERSION}