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

Added web service parameters and exporttype parameter

Browse Source
This commit is contained in:
Alexey Pustovalov 2021-04-27 17:32:45 -04:00
parent d6db212183
commit e6b463c140
9 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
.github/workflows/CI.yml vendored
View File

@ -43,7 +43,6 @@ jobs:
- web-apache-pgsql - web-apache-pgsql
- web-nginx-mysql - web-nginx-mysql
- web-nginx-pgsql - web-nginx-pgsql
- web-service
os: os:
- alpine - alpine
- ubuntu - ubuntu
@ -79,10 +78,6 @@ jobs:
DOCKER_PLATFORM="linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/ppc64le" DOCKER_PLATFORM="linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/ppc64le"
fi fi
if [ "${{ matrix.build }}" == "web-service" ]; then
DOCKER_PLATFORM="linux/amd64,linux/arm64"
fi
if [ "${{ matrix.os }}" == "ubuntu" ]; then if [ "${{ matrix.os }}" == "ubuntu" ]; then
DOCKER_PLATFORM="linux/amd64,linux/arm/v7,linux/arm64,linux/ppc64le" DOCKER_PLATFORM="linux/amd64,linux/arm/v7,linux/arm64,linux/ppc64le"
fi fi
@ -95,10 +90,6 @@ jobs:
DOCKER_PLATFORM=${DOCKER_PLATFORM%",linux/ppc64le"} DOCKER_PLATFORM=${DOCKER_PLATFORM%",linux/ppc64le"}
fi fi
if [ "${{ matrix.build }}" == "web-service" ]; then
DOCKER_PLATFORM=${DOCKER_PLATFORM%",linux/ppc64le"}
fi
echo ::set-output name=list::${DOCKER_PLATFORM} echo ::set-output name=list::${DOCKER_PLATFORM}
- name: Prepare environment (push) - name: Prepare environment (push)

2
agent2/ubuntu/Dockerfile
View File

@ -67,7 +67,7 @@ RUN set -eux && \
make \ make \
pkg-config \ pkg-config \
git \ git \
gcc \ g++ \
golang && \ golang && \
cd /tmp/ && \ cd /tmp/ && \
git clone ${ZBX_SOURCES} --branch ${ZBX_VERSION} --depth 1 --single-branch zabbix-${ZBX_VERSION} && \ git clone ${ZBX_SOURCES} --branch ${ZBX_VERSION} --depth 1 --single-branch zabbix-${ZBX_VERSION} && \

1
server-mysql/alpine/docker-entrypoint.sh
View File

@ -407,6 +407,7 @@ update_zbx_config() {
if [ -n "${ZBX_EXPORTFILESIZE}" ]; then if [ -n "${ZBX_EXPORTFILESIZE}" ]; then
update_config_var $ZBX_CONFIG "ExportDir" "$ZABBIX_USER_HOME_DIR/export/" update_config_var $ZBX_CONFIG "ExportDir" "$ZABBIX_USER_HOME_DIR/export/"
update_config_var $ZBX_CONFIG "ExportFileSize" "${ZBX_EXPORTFILESIZE}" update_config_var $ZBX_CONFIG "ExportFileSize" "${ZBX_EXPORTFILESIZE}"
update_config_var $ZBX_CONFIG "ExportType" "${ZBX_EXPORTTYPE}"
fi fi
update_config_var $ZBX_CONFIG "FpingLocation" "/usr/sbin/fping" update_config_var $ZBX_CONFIG "FpingLocation" "/usr/sbin/fping"

1
server-mysql/centos/docker-entrypoint.sh
View File

@ -404,6 +404,7 @@ update_zbx_config() {
if [ -n "${ZBX_EXPORTFILESIZE}" ]; then if [ -n "${ZBX_EXPORTFILESIZE}" ]; then
update_config_var $ZBX_CONFIG "ExportDir" "$ZABBIX_USER_HOME_DIR/export/" update_config_var $ZBX_CONFIG "ExportDir" "$ZABBIX_USER_HOME_DIR/export/"
update_config_var $ZBX_CONFIG "ExportFileSize" "${ZBX_EXPORTFILESIZE}" update_config_var $ZBX_CONFIG "ExportFileSize" "${ZBX_EXPORTFILESIZE}"
update_config_var $ZBX_CONFIG "ExportType" "${ZBX_EXPORTTYPE}"
fi fi
update_config_var $ZBX_CONFIG "FpingLocation" "/usr/sbin/fping" update_config_var $ZBX_CONFIG "FpingLocation" "/usr/sbin/fping"

1
server-mysql/rhel/docker-entrypoint.sh
View File

@ -404,6 +404,7 @@ update_zbx_config() {
if [ -n "${ZBX_EXPORTFILESIZE}" ]; then if [ -n "${ZBX_EXPORTFILESIZE}" ]; then
update_config_var $ZBX_CONFIG "ExportDir" "$ZABBIX_USER_HOME_DIR/export/" update_config_var $ZBX_CONFIG "ExportDir" "$ZABBIX_USER_HOME_DIR/export/"
update_config_var $ZBX_CONFIG "ExportFileSize" "${ZBX_EXPORTFILESIZE}" update_config_var $ZBX_CONFIG "ExportFileSize" "${ZBX_EXPORTFILESIZE}"
update_config_var $ZBX_CONFIG "ExportType" "${ZBX_EXPORTTYPE}"
fi fi
update_config_var $ZBX_CONFIG "FpingLocation" "/usr/sbin/fping" update_config_var $ZBX_CONFIG "FpingLocation" "/usr/sbin/fping"

1
server-mysql/ubuntu/docker-entrypoint.sh
View File

@ -404,6 +404,7 @@ update_zbx_config() {
if [ -n "${ZBX_EXPORTFILESIZE}" ]; then if [ -n "${ZBX_EXPORTFILESIZE}" ]; then
update_config_var $ZBX_CONFIG "ExportDir" "$ZABBIX_USER_HOME_DIR/export/" update_config_var $ZBX_CONFIG "ExportDir" "$ZABBIX_USER_HOME_DIR/export/"
update_config_var $ZBX_CONFIG "ExportFileSize" "${ZBX_EXPORTFILESIZE}" update_config_var $ZBX_CONFIG "ExportFileSize" "${ZBX_EXPORTFILESIZE}"
update_config_var $ZBX_CONFIG "ExportType" "${ZBX_EXPORTTYPE}"
fi fi
update_config_var $ZBX_CONFIG "FpingLocation" "/usr/bin/fping" update_config_var $ZBX_CONFIG "FpingLocation" "/usr/bin/fping"

1
server-pgsql/alpine/docker-entrypoint.sh
View File

@ -442,6 +442,7 @@ update_zbx_config() {
if [ -n "${ZBX_EXPORTFILESIZE}" ]; then if [ -n "${ZBX_EXPORTFILESIZE}" ]; then
update_config_var $ZBX_CONFIG "ExportDir" "$ZABBIX_USER_HOME_DIR/export/" update_config_var $ZBX_CONFIG "ExportDir" "$ZABBIX_USER_HOME_DIR/export/"
update_config_var $ZBX_CONFIG "ExportFileSize" "${ZBX_EXPORTFILESIZE}" update_config_var $ZBX_CONFIG "ExportFileSize" "${ZBX_EXPORTFILESIZE}"
update_config_var $ZBX_CONFIG "ExportType" "${ZBX_EXPORTTYPE}"
fi fi
update_config_var $ZBX_CONFIG "FpingLocation" "/usr/sbin/fping" update_config_var $ZBX_CONFIG "FpingLocation" "/usr/sbin/fping"

1
server-pgsql/centos/docker-entrypoint.sh
View File

@ -442,6 +442,7 @@ update_zbx_config() {
if [ -n "${ZBX_EXPORTFILESIZE}" ]; then if [ -n "${ZBX_EXPORTFILESIZE}" ]; then
update_config_var $ZBX_CONFIG "ExportDir" "$ZABBIX_USER_HOME_DIR/export/" update_config_var $ZBX_CONFIG "ExportDir" "$ZABBIX_USER_HOME_DIR/export/"
update_config_var $ZBX_CONFIG "ExportFileSize" "${ZBX_EXPORTFILESIZE}" update_config_var $ZBX_CONFIG "ExportFileSize" "${ZBX_EXPORTFILESIZE}"
update_config_var $ZBX_CONFIG "ExportType" "${ZBX_EXPORTTYPE}"
fi fi
update_config_var $ZBX_CONFIG "FpingLocation" "/usr/sbin/fping" update_config_var $ZBX_CONFIG "FpingLocation" "/usr/sbin/fping"

1
server-pgsql/ubuntu/docker-entrypoint.sh
View File

@ -442,6 +442,7 @@ update_zbx_config() {
if [ -n "${ZBX_EXPORTFILESIZE}" ]; then if [ -n "${ZBX_EXPORTFILESIZE}" ]; then
update_config_var $ZBX_CONFIG "ExportDir" "$ZABBIX_USER_HOME_DIR/export/" update_config_var $ZBX_CONFIG "ExportDir" "$ZABBIX_USER_HOME_DIR/export/"
update_config_var $ZBX_CONFIG "ExportFileSize" "${ZBX_EXPORTFILESIZE}" update_config_var $ZBX_CONFIG "ExportFileSize" "${ZBX_EXPORTFILESIZE}"
update_config_var $ZBX_CONFIG "ExportType" "${ZBX_EXPORTTYPE}"
fi fi
update_config_var $ZBX_CONFIG "FpingLocation" "/usr/bin/fping" update_config_var $ZBX_CONFIG "FpingLocation" "/usr/bin/fping"