extern/zabbix-docker
1
0
Fork 0
mirror of https://github.com/zabbix/zabbix-docker.git synced 2025-08-13 18:37:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

Zabbix v3.4.10 release

Browse Source
This commit is contained in:
root
2018-06-05 19:47:27 -07:00
parent 54fa22bbf8
commit 1ded17acb9
71 changed files with 121 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
java-gateway/alpine/Dockerfile
View File

@ -35,7 +35,7 @@ RUN addgroup zabbix && \
rm -rf /var/cache/apk/*
ARG MAJOR_VERSION=3.4
ARG ZBX_VERSION=${MAJOR_VERSION}.9
ARG ZBX_VERSION=${MAJOR_VERSION}.10
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}

2
java-gateway/alpine/docker-entrypoint.sh
View File

@ -838,6 +838,8 @@ prepare_zbx_web_config() {
echo "**** Zabbix related PHP configuration file not found"
fi
ZBX_HISTORYSTORAGETYPES=${ZBX_HISTORYSTORAGETYPES:-"[]"}
# Escaping characters in parameter value
server_name=$(escape_spec_char "${ZBX_SERVER_NAME}")
server_user=$(escape_spec_char "${DB_SERVER_ZBX_USER}")

4
java-gateway/centos/Dockerfile
View File

@ -4,7 +4,7 @@ ARG YUM_FLAGS_COMMON="-y"
ARG YUM_FLAGS_DEV="${YUM_FLAGS_COMMON}"
ARG MAJOR_VERSION=3.4
ARG ZBX_VERSION=${MAJOR_VERSION}.9
ARG ZBX_VERSION=${MAJOR_VERSION}.10
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
ZBX_TYPE=java-gateway
@ -44,7 +44,7 @@ ARG YUM_FLAGS_COMMON="-y"
ARG YUM_FLAGS_PERSISTENT="${YUM_FLAGS_COMMON}"
ARG MAJOR_VERSION=3.4
ARG ZBX_VERSION=${MAJOR_VERSION}.9
ARG ZBX_VERSION=${MAJOR_VERSION}.10
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
ZBX_TYPE=java-gateway ZBX_DB_TYPE=none ZBX_OPT_TYPE=none

2
java-gateway/centos/docker-entrypoint.sh
View File

@ -838,6 +838,8 @@ prepare_zbx_web_config() {
echo "**** Zabbix related PHP configuration file not found"
fi
ZBX_HISTORYSTORAGETYPES=${ZBX_HISTORYSTORAGETYPES:-"[]"}
# Escaping characters in parameter value
server_name=$(escape_spec_char "${ZBX_SERVER_NAME}")
server_user=$(escape_spec_char "${DB_SERVER_ZBX_USER}")

2
java-gateway/ubuntu/Dockerfile
View File

@ -40,7 +40,7 @@ RUN locale-gen $LC_ALL && \
rm -rf /var/lib/apt/lists/*
ARG MAJOR_VERSION=3.4
ARG ZBX_VERSION=${MAJOR_VERSION}.9
ARG ZBX_VERSION=${MAJOR_VERSION}.10
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}

2
java-gateway/ubuntu/docker-entrypoint.sh
View File

@ -838,6 +838,8 @@ prepare_zbx_web_config() {
echo "**** Zabbix related PHP configuration file not found"
fi
ZBX_HISTORYSTORAGETYPES=${ZBX_HISTORYSTORAGETYPES:-"[]"}
# Escaping characters in parameter value
server_name=$(escape_spec_char "${ZBX_SERVER_NAME}")
server_user=$(escape_spec_char "${DB_SERVER_ZBX_USER}")