extern/zabbix-docker
1
0
Fork 0
mirror of https://github.com/zabbix/zabbix-docker.git synced 2025-01-23 05:48:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated source packages for Windows agents

Browse Source
This commit is contained in:
Alexey Pustovalov 2023-09-20 18:23:06 +09:00
parent 27ac8dba9e
commit f87f43a151
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Dockerfiles/build-base/ubuntu/Dockerfile
View File

@ -6,7 +6,7 @@ ARG ZBX_VERSION=${MAJOR_VERSION}.11
ENV TERM=xterm \ ENV TERM=xterm \
ZBX_VERSION=${ZBX_VERSION} \ ZBX_VERSION=${ZBX_VERSION} \
PATH=/usr/lib/go-1.18/bin:$PATH PATH=/usr/lib/go-1.20/bin:$PATH
LABEL org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zabbix.com>" \ LABEL org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zabbix.com>" \
org.opencontainers.image.description="Zabbix build base image contains all required packages to build Zabbix images" \ org.opencontainers.image.description="Zabbix build base image contains all required packages to build Zabbix images" \
@ -43,7 +43,7 @@ RUN set -eux && \
pkg-config \ pkg-config \
gettext \ gettext \
git \ git \
golang-1.18 \ golang-1.20 \
unzip \ unzip \
unixodbc-dev" && \ unixodbc-dev" && \
apt-get -y update && \ apt-get -y update && \

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

@ -3,9 +3,9 @@
ARG BUILD_BASE_IMAGE=mcr.microsoft.com/windows/servercore:ltsc2022 ARG BUILD_BASE_IMAGE=mcr.microsoft.com/windows/servercore:ltsc2022
FROM $BUILD_BASE_IMAGE FROM $BUILD_BASE_IMAGE
ARG PCRE2_VERSION=10.39 ARG PCRE2_VERSION=10.42
ARG OPENSSL_VERSION=3.0.8 ARG OPENSSL_VERSION=3.1.3
ARG LIBMODBUS_VERSION=v3.1.7 ARG LIBMODBUS_VERSION=v3.1.10
ARG BUILD_ARCH=x64 ARG BUILD_ARCH=x64
ARG CPU_MODEL=AMD64 ARG CPU_MODEL=AMD64
@ -148,7 +148,7 @@ RUN Set-Location -Path $env:SystemDrive\.; `
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; ` [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; `
Invoke-WebRequest -OutFile $env:SystemDrive\pcre2.zip -Uri $env:PCRE2_URL; ` Invoke-WebRequest -OutFile $env:SystemDrive\pcre2.zip -Uri $env:PCRE2_URL; `
` `
$sha256 = '08a8861f60fec3af30ca1e0f51d89ab5dc5c07bb71b74db5297f78b7e26c7226'; ` $sha256 = 'c33b418e3b936ee3153de2c61cc638e7e4fe3156022a5c77d0711bcbb9d64f1f'; `
Write-Host ('Verifying SHA256 ({0}) ...' -f $sha256); ` Write-Host ('Verifying SHA256 ({0}) ...' -f $sha256); `
if ((Get-FileHash $env:SystemDrive\pcre2.zip -Algorithm sha256).Hash -ne $sha256) { ` if ((Get-FileHash $env:SystemDrive\pcre2.zip -Algorithm sha256).Hash -ne $sha256) { `
Write-Host 'Checksum PCRE2 library failed!'; ` Write-Host 'Checksum PCRE2 library failed!'; `
@ -186,7 +186,7 @@ RUN Set-Location -Path $env:SystemDrive\.; `
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; ` [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; `
Invoke-WebRequest -OutFile $env:SystemDrive\openssl.tar.gz -Uri $env:OPENSSL_URL; ` Invoke-WebRequest -OutFile $env:SystemDrive\openssl.tar.gz -Uri $env:OPENSSL_URL; `
` `
$sha256 = '6c13d2bf38fdf31eac3ce2a347073673f5d63263398f1f69d0df4a41253e4b3e'; ` $sha256 = 'f0316a2ebd89e7f2352976445458689f80302093788c466692fb2a188b2eacf6'; `
Write-Host ('Verifying SHA256 ({0}) ...' -f $sha256); ` Write-Host ('Verifying SHA256 ({0}) ...' -f $sha256); `
if ((Get-FileHash $env:SystemDrive\openssl.tar.gz -Algorithm sha256).Hash -ne $sha256) { ` if ((Get-FileHash $env:SystemDrive\openssl.tar.gz -Algorithm sha256).Hash -ne $sha256) { `
Write-Host 'Checksum OpenSSL library failed!'; ` Write-Host 'Checksum OpenSSL library failed!'; `

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

@ -3,9 +3,9 @@
ARG BUILD_BASE_IMAGE=mcr.microsoft.com/windows/servercore:ltsc2022 ARG BUILD_BASE_IMAGE=mcr.microsoft.com/windows/servercore:ltsc2022
FROM $BUILD_BASE_IMAGE as builder_base FROM $BUILD_BASE_IMAGE as builder_base
ARG PCRE2_VERSION=10.39 ARG PCRE2_VERSION=10.42
ARG OPENSSL_VERSION=3.0.8 ARG OPENSSL_VERSION=3.1.3
ARG GOLANG_VERSION=1.19.6 ARG GOLANG_VERSION=1.21.1
ARG SEVEN_ZIP_VERSION=2107 ARG SEVEN_ZIP_VERSION=2107
ARG BUILD_ARCH=x64 ARG BUILD_ARCH=x64
ARG CPU_MODEL=AMD64 ARG CPU_MODEL=AMD64
@ -66,7 +66,7 @@ RUN Set-Location -Path $env:SystemDrive\.; `
Write-Host ('Downloading {0} ...' -f $env:GOLANG_URL); ` Write-Host ('Downloading {0} ...' -f $env:GOLANG_URL); `
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; ` [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; `
Invoke-WebRequest -OutFile $env:SystemDrive\go-amd64.msi -Uri $env:GOLANG_URL; ` Invoke-WebRequest -OutFile $env:SystemDrive\go-amd64.msi -Uri $env:GOLANG_URL; `
$sha256 = '205c178f7ebe29fa24fac72ddc097d3a37f541f93eae0ccf84d61cc459dc76d0'; ` $sha256 = 'd5bdec8f6c8f453f1a2e3d58ef5c1dd371f1b38930ef323347e345db984fc807'; `
` `
Write-Host ('Verifying SHA256 ({0}) ...' -f $sha256); ` Write-Host ('Verifying SHA256 ({0}) ...' -f $sha256); `
if ((Get-FileHash $env:SystemDrive\go-amd64.msi -Algorithm sha256).Hash -ne $sha256) { ` if ((Get-FileHash $env:SystemDrive\go-amd64.msi -Algorithm sha256).Hash -ne $sha256) { `
@ -169,7 +169,7 @@ RUN Set-Location -Path $env:SystemDrive\.; `
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; ` [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; `
Invoke-WebRequest -OutFile $env:SystemDrive\pcre2.zip -Uri $env:PCRE2_URL; ` Invoke-WebRequest -OutFile $env:SystemDrive\pcre2.zip -Uri $env:PCRE2_URL; `
` `
$sha256 = '08a8861f60fec3af30ca1e0f51d89ab5dc5c07bb71b74db5297f78b7e26c7226'; ` $sha256 = 'c33b418e3b936ee3153de2c61cc638e7e4fe3156022a5c77d0711bcbb9d64f1f'; `
Write-Host ('Verifying SHA256 ({0}) ...' -f $sha256); ` Write-Host ('Verifying SHA256 ({0}) ...' -f $sha256); `
if ((Get-FileHash $env:SystemDrive\pcre2.zip -Algorithm sha256).Hash -ne $sha256) { ` if ((Get-FileHash $env:SystemDrive\pcre2.zip -Algorithm sha256).Hash -ne $sha256) { `
Write-Host 'Checksum PCRE2 library failed!'; ` Write-Host 'Checksum PCRE2 library failed!'; `
@ -217,7 +217,7 @@ RUN Set-Location -Path $env:SystemDrive\.; `
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; ` [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; `
Invoke-WebRequest -OutFile $env:SystemDrive\openssl.tar.gz -Uri $env:OPENSSL_URL; ` Invoke-WebRequest -OutFile $env:SystemDrive\openssl.tar.gz -Uri $env:OPENSSL_URL; `
` `
$sha256 = '6c13d2bf38fdf31eac3ce2a347073673f5d63263398f1f69d0df4a41253e4b3e'; ` $sha256 = 'f0316a2ebd89e7f2352976445458689f80302093788c466692fb2a188b2eacf6'; `
Write-Host ('Verifying SHA256 ({0}) ...' -f $sha256); ` Write-Host ('Verifying SHA256 ({0}) ...' -f $sha256); `
if ((Get-FileHash $env:SystemDrive\openssl.tar.gz -Algorithm sha256).Hash -ne $sha256) { ` if ((Get-FileHash $env:SystemDrive\openssl.tar.gz -Algorithm sha256).Hash -ne $sha256) { `
Write-Host 'Checksum OpenSSL library failed!'; ` Write-Host 'Checksum OpenSSL library failed!'; `