extern/zabbix-docker
1
0
Fork 0
mirror of https://github.com/zabbix/zabbix-docker.git synced 2025-06-25 12:21:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

Updated build process for Zabbix agent (windows)

Browse Source
This commit is contained in:
Alexey Pustovalov 2024-05-22 17:30:01 +09:00
parent c4c0abaf87
commit d2aea3b240
4 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfiles/build-base/windows/Dockerfile.agent
View File

@ -242,7 +242,7 @@ RUN Set-Location -Path $env:SystemDrive\.; `
--prefix=$env:BUILD_OUTPUT\openssl ` --prefix=$env:BUILD_OUTPUT\openssl `
--openssldir=$env:BUILD_OUTPUT\openssl_ssl; ` --openssldir=$env:BUILD_OUTPUT\openssl_ssl; `
set CL=/MP; ` set CL=/MP; `
nmake /S build_sw; ` nmake /S build_libs; `
nmake /S install_dev; ` nmake /S install_dev; `
nmake /S clean | Out-Null; ` nmake /S clean | Out-Null; `
Write-Host 'OpenSSL is ready...'; ` Write-Host 'OpenSSL is ready...'; `

2
Dockerfiles/build-base/windows/Dockerfile.agent2
View File

@ -269,7 +269,7 @@ RUN Set-Location -Path $env:SystemDrive\.; `
--libdir=lib ` --libdir=lib `
--prefix=$env:BUILD_OUTPUT/openssl ` --prefix=$env:BUILD_OUTPUT/openssl `
--openssldir=$env:BUILD_OUTPUT/openssl_ssl; ` --openssldir=$env:BUILD_OUTPUT/openssl_ssl; `
mingw32-make -s -j"""$env:NUMBER_OF_PROCESSORS""" build_sw; ` mingw32-make -s -j"""$env:NUMBER_OF_PROCESSORS""" build_libs; `
mingw32-make -s -j"""$env:NUMBER_OF_PROCESSORS""" install_dev; ` mingw32-make -s -j"""$env:NUMBER_OF_PROCESSORS""" install_dev; `
mingw32-make -s clean | Out-Null; ` mingw32-make -s clean | Out-Null; `
Write-Host 'OpenSSL is ready...'; ` Write-Host 'OpenSSL is ready...'; `

2
Dockerfiles/build-mysql/windows/Dockerfile.agent
View File

@ -57,7 +57,7 @@ RUN Set-Location -Path $env:SystemDrive\.; `
RFLAGS="""/D ZABBIX_VERSION_REVISION=$ZbxRevision /D ZABBIX_VERSION_RC_NUM=$env:ZABBIX_VERSION_RC_NUM""" ` RFLAGS="""/D ZABBIX_VERSION_REVISION=$ZbxRevision /D ZABBIX_VERSION_RC_NUM=$env:ZABBIX_VERSION_RC_NUM""" `
TLSINCDIR=$env:BUILD_OUTPUT\openssl\include ` TLSINCDIR=$env:BUILD_OUTPUT\openssl\include `
TLSLIBDIR=$env:BUILD_OUTPUT\openssl\lib ` TLSLIBDIR=$env:BUILD_OUTPUT\openssl\lib `
LIBS="""$env:LIBS $env:BUILD_OUTPUT\curl\lib\libcurl_a.lib $env:BUILD_OUTPUT\zlib\lib\zlib.lib""" ` LIBS="""$env:LIBS Crypt32.lib $env:BUILD_OUTPUT\curl\lib\libcurl_a.lib $env:BUILD_OUTPUT\zlib\lib\zlib.lib""" `
all; ` all; `
` `
Write-Host 'Verifying build ("zabbix_agentd.exe -V") ...'; ` Write-Host 'Verifying build ("zabbix_agentd.exe -V") ...'; `

3
Dockerfiles/build-mysql/windows/Dockerfile.agent2
View File

@ -13,7 +13,7 @@ ARG ZBX_VERSION=${MAJOR_VERSION}.42
ARG ZABBIX_VERSION_RC_NUM=2400 ARG ZABBIX_VERSION_RC_NUM=2400
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
ENV ZBX_SOURCES=$ZBX_SOURCES MAJOR_VERSION=$MAJOR_VERSION ZBX_VERSION=$ZBX_VERSION GIT_BRANCH=${GIT_BRANCH:-$ZBX_VERSION} ENV ZBX_SOURCES=$ZBX_SOURCES MAJOR_VERSION=$MAJOR_VERSION ZBX_VERSION=$ZBX_VERSION GIT_BRANCH=${GIT_BRANCH:-$ZBX_VERSION} `
ZABBIX_VERSION_RC_NUM=$ZABBIX_VERSION_RC_NUM ZABBIX_VERSION_RC_NUM=$ZABBIX_VERSION_RC_NUM
LABEL org.opencontainers.image.title="Zabbix agent 2 build (Windows)" ` LABEL org.opencontainers.image.title="Zabbix agent 2 build (Windows)" `
@ -48,7 +48,6 @@ RUN Set-Location -Path $env:SystemDrive\.; `
(Get-Content src\go\pkg\version\version.go).replace('{ZABBIX_REVISION}', $ZbxRevision) | Set-Content src\go\pkg\version\version.go; ` (Get-Content src\go\pkg\version\version.go).replace('{ZABBIX_REVISION}', $ZbxRevision) | Set-Content src\go\pkg\version\version.go; `
Set-Location -Path $env:SystemDrive\zabbix_src\zabbix-$env:ZBX_VERSION\build\mingw; ` Set-Location -Path $env:SystemDrive\zabbix_src\zabbix-$env:ZBX_VERSION\build\mingw; `
mingw32-make -j"""$env:NUMBER_OF_PROCESSORS""" ` mingw32-make -j"""$env:NUMBER_OF_PROCESSORS""" `
# CGO_LDFLAGS="""-lcrypt32 -L$env:BUILD_OUTPUT\openssl\lib -L$env:BUILD_OUTPUT\pcre\lib""" `
PCRE=$env:BUILD_OUTPUT\pcre ` PCRE=$env:BUILD_OUTPUT\pcre `
OPENSSL=$env:BUILD_OUTPUT\openssl ` OPENSSL=$env:BUILD_OUTPUT\openssl `
RFLAGS="""-DZABBIX_VERSION_RC_NUM=$env:ZABBIX_VERSION_RC_NUM"""; ` RFLAGS="""-DZABBIX_VERSION_RC_NUM=$env:ZABBIX_VERSION_RC_NUM"""; `