From 0904331e8a4ef19c1e51d9445548994539fcc993 Mon Sep 17 00:00:00 2001 From: dotneft Date: Sat, 18 Sep 2021 04:08:26 +0300 Subject: [PATCH] Fix building Zabbix agent on Windows --- Dockerfiles/build-base/windows/Dockerfile.agent | 16 ++++++++-------- Dockerfiles/build-base/windows/Dockerfile.agent2 | 16 ++++++++-------- Dockerfiles/build-mysql/windows/Dockerfile.agent | 16 ++++++++-------- .../build-mysql/windows/Dockerfile.agent2 | 16 ++++++++-------- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/Dockerfiles/build-base/windows/Dockerfile.agent b/Dockerfiles/build-base/windows/Dockerfile.agent index b8254f6fa..2316b3e26 100644 --- a/Dockerfiles/build-base/windows/Dockerfile.agent +++ b/Dockerfiles/build-base/windows/Dockerfile.agent @@ -25,14 +25,14 @@ ENV BUILD_ARCH=$BUILD_ARCH CPU_MODEL=$CPU_MODEL ` PCRE_VERSION=$PCRE_VERSION OPENSSL_VERSION=$OPENSSL_VERSION LIBMODBUS_VERSION=$LIBMODBUS_VERSION ` GIT_URL=$GIT_URL NASM_URL=$NASM_URL PERL_URL=$PERL_URL LIBMODBUS_URL=$LIBMODBUS_URL PCRE_URL=$PCRE_URL OPENSSL_URL=$OPENSSL_URL -LABEL org.opencontainers.image.title="Zabbix agent build base for Windows" \ - org.opencontainers.image.authors="Alexey Pustovalov " \ - org.opencontainers.image.vendor="Zabbix LLC" \ - org.opencontainers.image.url="https://zabbix.com/" \ - org.opencontainers.image.description="Zabbix build base image contains all required packages to build Zabbix agent images" \ - org.opencontainers.image.licenses="GPL v2.0" \ - org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ - org.opencontainers.image.version="${ZBX_VERSION}" \ +LABEL org.opencontainers.image.title="Zabbix agent build base for Windows" ` + org.opencontainers.image.authors="Alexey Pustovalov " ` + org.opencontainers.image.vendor="Zabbix LLC" ` + org.opencontainers.image.url="https://zabbix.com/" ` + org.opencontainers.image.description="Zabbix build base image contains all required packages to build Zabbix agent images" ` + org.opencontainers.image.licenses="GPL v2.0" ` + org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" ` + org.opencontainers.image.version="${ZBX_VERSION}" ` org.opencontainers.image.source="${ZBX_SOURCES}" SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] diff --git a/Dockerfiles/build-base/windows/Dockerfile.agent2 b/Dockerfiles/build-base/windows/Dockerfile.agent2 index 7ef2b3feb..4067cb937 100644 --- a/Dockerfiles/build-base/windows/Dockerfile.agent2 +++ b/Dockerfiles/build-base/windows/Dockerfile.agent2 @@ -30,14 +30,14 @@ ENV BUILD_ARCH=$BUILD_ARCH CPU_MODEL=$CPU_MODEL ` GIT_URL=$GIT_URL MINGW_URL=$MINGW_URL CYGWIN_URL=$CYGWIN_URL GOLANG_URL=$GOLANG_URL SEVEN_ZIP_URL=$SEVEN_ZIP_URL ` PCRE_URL=$PCRE_URL OPENSSL_URL=$OPENSSL_URL -LABEL org.opencontainers.image.title="Zabbix agent 2 build base for Windows" \ - org.opencontainers.image.authors="Alexey Pustovalov " \ - org.opencontainers.image.vendor="Zabbix LLC" \ - org.opencontainers.image.url="https://zabbix.com/" \ - org.opencontainers.image.description="Zabbix build base image contains all required packages to build Zabbix agent 2 images" \ - org.opencontainers.image.licenses="GPL v2.0" \ - org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ - org.opencontainers.image.version="${ZBX_VERSION}" \ +LABEL org.opencontainers.image.title="Zabbix agent 2 build base for Windows" ` + org.opencontainers.image.authors="Alexey Pustovalov " ` + org.opencontainers.image.vendor="Zabbix LLC" ` + org.opencontainers.image.url="https://zabbix.com/" ` + org.opencontainers.image.description="Zabbix build base image contains all required packages to build Zabbix agent 2 images" ` + org.opencontainers.image.licenses="GPL v2.0" ` + org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" ` + org.opencontainers.image.version="${ZBX_VERSION}" ` org.opencontainers.image.source="${ZBX_SOURCES}" SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] diff --git a/Dockerfiles/build-mysql/windows/Dockerfile.agent b/Dockerfiles/build-mysql/windows/Dockerfile.agent index 90588ae9b..3b66ed6ae 100644 --- a/Dockerfiles/build-mysql/windows/Dockerfile.agent +++ b/Dockerfiles/build-mysql/windows/Dockerfile.agent @@ -13,14 +13,14 @@ ARG ZABBIX_VERSION_RC_NUM=2400 ARG ZBX_COMPONENT=all ENV ZBX_SOURCES=$ZBX_SOURCES MAJOR_VERSION=$MAJOR_VERSION ZBX_VERSION=$ZBX_VERSION ZABBIX_VERSION_RC_NUM=$ZABBIX_VERSION_RC_NUM -LABEL org.opencontainers.image.title="Zabbix agent build (Windows)" \ - org.opencontainers.image.authors="Alexey Pustovalov " \ - org.opencontainers.image.vendor="Zabbix LLC" \ - org.opencontainers.image.url="https://zabbix.com/" \ - org.opencontainers.image.description="Zabbix build for agent images based on Windows" \ - org.opencontainers.image.licenses="GPL v2.0" \ - org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ - org.opencontainers.image.version="${ZBX_VERSION}" \ +LABEL org.opencontainers.image.title="Zabbix agent build (Windows)" ` + org.opencontainers.image.authors="Alexey Pustovalov " ` + org.opencontainers.image.vendor="Zabbix LLC" ` + org.opencontainers.image.url="https://zabbix.com/" ` + org.opencontainers.image.description="Zabbix build for agent images based on Windows" ` + org.opencontainers.image.licenses="GPL v2.0" ` + org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" ` + org.opencontainers.image.version="${ZBX_VERSION}" ` org.opencontainers.image.source="${ZBX_SOURCES}" SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] diff --git a/Dockerfiles/build-mysql/windows/Dockerfile.agent2 b/Dockerfiles/build-mysql/windows/Dockerfile.agent2 index 69176f5b5..3585c431c 100644 --- a/Dockerfiles/build-mysql/windows/Dockerfile.agent2 +++ b/Dockerfiles/build-mysql/windows/Dockerfile.agent2 @@ -15,14 +15,14 @@ ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ARG ZBX_COMPONENT=all ENV ZBX_SOURCES=$ZBX_SOURCES MAJOR_VERSION=$MAJOR_VERSION ZBX_VERSION=$ZBX_VERSION -LABEL org.opencontainers.image.title="Zabbix agent 2 build (Windows)" \ - org.opencontainers.image.authors="Alexey Pustovalov " \ - org.opencontainers.image.vendor="Zabbix LLC" \ - org.opencontainers.image.url="https://zabbix.com/" \ - org.opencontainers.image.description="Zabbix build for agent 2 images based on Windows" \ - org.opencontainers.image.licenses="GPL v2.0" \ - org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ - org.opencontainers.image.version="${ZBX_VERSION}" \ +LABEL org.opencontainers.image.title="Zabbix agent 2 build (Windows)" ` + org.opencontainers.image.authors="Alexey Pustovalov " ` + org.opencontainers.image.vendor="Zabbix LLC" ` + org.opencontainers.image.url="https://zabbix.com/" ` + org.opencontainers.image.description="Zabbix build for agent 2 images based on Windows" ` + org.opencontainers.image.licenses="GPL v2.0" ` + org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" ` + org.opencontainers.image.version="${ZBX_VERSION}" ` org.opencontainers.image.source="${ZBX_SOURCES}" RUN Set-Location -Path $env:SystemDrive\.; `