File tree Expand file tree Collapse file tree 3 files changed +4
-3
lines changed Expand file tree Collapse file tree 3 files changed +4
-3
lines changed Original file line number Diff line number Diff line change @@ -101,6 +101,7 @@ run_local_test_pg13: clean_local_test_pg13
101101 docker rm pg13
102102
103103run_zabbix: clean_zabbix
104+ docker network create --driver=bridge --subnet=172.18.0.0/16 network-local-tests
104105 $(WORKDIR)/tests/local_start_zabbix.sh
105106
106107clean_local_test_pg9.5:
Original file line number Diff line number Diff line change 22
33if [ ! -v ZABBIX_DOCKER_VERSIONS ];
44then
5- export ZABBIX_DOCKER_VERSIONS=" 5.2 5.0 4.4 4.2"
5+ export ZABBIX_DOCKER_VERSIONS=" 5.2 5.0 4.4 4.2 4.0 3.4 3.2 3.0 "
66fi
77# !!!! zabbix 4.4 имеет порт 80, остальные 8080
88# ZABBIX_DOCKER_VERSIONS="4.4"
Original file line number Diff line number Diff line change 66# ##### test mamonsu zabbix *
77mkdir /etc/mamonsu/
88cp /var/tmp/mamonsu/packaging/conf/example.conf /etc/mamonsu/agent.conf
9- ZABBIX_DOCKER_VERSIONS=" 5.2 5.0 4.4 4.2"
9+ ZABBIX_DOCKER_VERSIONS=" 5.2 5.0 4.4 4.2 4.0 3.4 3.2 3.0 "
1010for VER in $ZABBIX_DOCKER_VERSIONS
1111do
1212 IFS=' .' read -ra VER_ARRAY <<< $VER
1313 VER_MAJOR=${VER_ARRAY[0]}
1414 VER_MINOR=${VER_ARRAY[1]}
1515
1616 Z_PORT=" :8080"
17- if [[ " $VER " == " 4.2" ]]
17+ if [[ " $VER " == " 4.2" || " $VER " == " 3.4 " || " $VER " == " 3.2 " ]]
1818 then
1919 Z_PORT=" :80"
2020 fi
You can’t perform that action at this time.
0 commit comments