extern/zabbix-docker
1
0
Fork 0
mirror of https://github.com/zabbix/zabbix-docker.git synced 2024-11-22 07:43:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1382 from zabbix/trunk_windows

Browse Source 
Trunk windows
This commit is contained in:
Alexey Pustovalov 2024-05-20 16:41:47 +09:00 committed by GitHub
commit 6163ec73b0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/images_build_windows.yml vendored
View File

@ -144,7 +144,7 @@ jobs:
name: Build ${{ matrix.component }} base on ${{ matrix.os }}
needs: init_build
runs-on: ${{ matrix.os }}
timeout-minutes: 90
timeout-minutes: 120
permissions:
contents: read
id-token: write

2
Dockerfiles/agent/windows/Dockerfile
View File

@ -39,7 +39,7 @@ RUN $env:PATH = [string]::Format('{0}\zabbix\sbin;{0}\zabbix\bin;', $env:SystemD
$env:ZBX_HOME = [string]::Format('{0}\zabbix', $env:SystemDrive); `
[Environment]::SetEnvironmentVariable('ZBX_HOME', $env:ZBX_HOME, [EnvironmentVariableTarget]::Machine); `
`
Write-Host ('Verifying Zabbix agent 2 {0} ...' -f $env:ZBX_VERSION); `
Write-Host ('Verifying Zabbix agent {0} ...' -f $env:ZBX_VERSION); `
zabbix_agentd.exe -V;
RUN Set-Location -Path $env:SystemDrive\.; `

14
Dockerfiles/agent2/windows/docker-entrypoint.ps1
View File

@ -109,7 +109,7 @@ function Update-Config-Multiple-Var {
}
function Prepare-Zbx-Agent-Config {
Write-Host "** Preparing Zabbix agent configuration file"
Write-Host "** Preparing Zabbix agent 2 configuration file"
$ZbxAgentConfig="$ZabbixConfigDir\zabbix_agent2.conf"
@ -226,9 +226,19 @@ function Prepare-Zbx-Agent-Config {
}
function Prepare-Zbx-Agent-Plugins-Config {
Write-Host "** Preparing Zabbix agent 2 (plugins) configuration file"
$ZbxAgentConfig="$ZabbixConfigDir\zabbix_agent2.conf"
# Update-Config-Var $ZbxAgentConfig "Plugins.MongoDB.System.Path" "$ZabbixUserHomeDir\zabbix-agent2-plugin\zabbix-agent2-plugin-mongodb.exe"
# Update-Config-Var $ZbxAgentConfig "Plugins.PostgreSQL.System.Path" "$ZabbixUserHomeDir\zabbix-agent2-plugin\zabbix-agent2-plugin-postgresql.exe"
}
function PrepareAgent {
Write-Host "** Preparing Zabbix agent"
Write-Host "** Preparing Zabbix agent 2"
Prepare-Zbx-Agent-Config
Prepare-Zbx-Agent-Plugins-Config
}
$commandArgs=$args