mirror of
https://github.com/zabbix/zabbix-docker.git
synced 2025-08-09 08:35:05 +02:00
Zabbix v3.4.10 release
This commit is contained in:
@ -4,7 +4,7 @@ ARG APK_FLAGS_COMMON=""
|
|||||||
ARG APK_FLAGS_DEV="${APK_FLAGS_COMMON} --no-cache"
|
ARG APK_FLAGS_DEV="${APK_FLAGS_COMMON} --no-cache"
|
||||||
|
|
||||||
ARG MAJOR_VERSION=3.4
|
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}/
|
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
||||||
ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
|
ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
|
||||||
ZBX_TYPE=agent
|
ZBX_TYPE=agent
|
||||||
@ -49,7 +49,7 @@ ARG APK_FLAGS_COMMON=""
|
|||||||
ARG APK_FLAGS_PERSISTENT="${APK_FLAGS_COMMON} --clean-protected --no-cache"
|
ARG APK_FLAGS_PERSISTENT="${APK_FLAGS_COMMON} --clean-protected --no-cache"
|
||||||
|
|
||||||
ARG MAJOR_VERSION=3.4
|
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}/
|
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
||||||
ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
|
ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
|
||||||
ZBX_TYPE=agent ZBX_DB_TYPE=none ZBX_OPT_TYPE=none
|
ZBX_TYPE=agent ZBX_DB_TYPE=none ZBX_OPT_TYPE=none
|
||||||
|
@ -838,6 +838,8 @@ prepare_zbx_web_config() {
|
|||||||
echo "**** Zabbix related PHP configuration file not found"
|
echo "**** Zabbix related PHP configuration file not found"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
ZBX_HISTORYSTORAGETYPES=${ZBX_HISTORYSTORAGETYPES:-"[]"}
|
||||||
|
|
||||||
# Escaping characters in parameter value
|
# Escaping characters in parameter value
|
||||||
server_name=$(escape_spec_char "${ZBX_SERVER_NAME}")
|
server_name=$(escape_spec_char "${ZBX_SERVER_NAME}")
|
||||||
server_user=$(escape_spec_char "${DB_SERVER_ZBX_USER}")
|
server_user=$(escape_spec_char "${DB_SERVER_ZBX_USER}")
|
||||||
|
@ -4,7 +4,7 @@ ARG YUM_FLAGS_COMMON="-y"
|
|||||||
ARG YUM_FLAGS_DEV="${YUM_FLAGS_COMMON}"
|
ARG YUM_FLAGS_DEV="${YUM_FLAGS_COMMON}"
|
||||||
|
|
||||||
ARG MAJOR_VERSION=3.4
|
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}/
|
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
||||||
ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
|
ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
|
||||||
ZBX_TYPE=agent
|
ZBX_TYPE=agent
|
||||||
@ -48,7 +48,7 @@ ARG YUM_FLAGS_COMMON="-y"
|
|||||||
ARG YUM_FLAGS_PERSISTENT="${YUM_FLAGS_COMMON}"
|
ARG YUM_FLAGS_PERSISTENT="${YUM_FLAGS_COMMON}"
|
||||||
|
|
||||||
ARG MAJOR_VERSION=3.4
|
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}/
|
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
||||||
ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
|
ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
|
||||||
ZBX_TYPE=agent ZBX_DB_TYPE=none ZBX_OPT_TYPE=none
|
ZBX_TYPE=agent ZBX_DB_TYPE=none ZBX_OPT_TYPE=none
|
||||||
|
@ -838,6 +838,8 @@ prepare_zbx_web_config() {
|
|||||||
echo "**** Zabbix related PHP configuration file not found"
|
echo "**** Zabbix related PHP configuration file not found"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
ZBX_HISTORYSTORAGETYPES=${ZBX_HISTORYSTORAGETYPES:-"[]"}
|
||||||
|
|
||||||
# Escaping characters in parameter value
|
# Escaping characters in parameter value
|
||||||
server_name=$(escape_spec_char "${ZBX_SERVER_NAME}")
|
server_name=$(escape_spec_char "${ZBX_SERVER_NAME}")
|
||||||
server_user=$(escape_spec_char "${DB_SERVER_ZBX_USER}")
|
server_user=$(escape_spec_char "${DB_SERVER_ZBX_USER}")
|
||||||
|
@ -4,7 +4,7 @@ ARG APT_FLAGS_COMMON="-y"
|
|||||||
ARG APT_FLAGS_DEV="${APT_FLAGS_COMMON} --no-install-recommends"
|
ARG APT_FLAGS_DEV="${APT_FLAGS_COMMON} --no-install-recommends"
|
||||||
|
|
||||||
ARG MAJOR_VERSION=3.4
|
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}/
|
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
||||||
ENV LANG=en_US.UTF-8 LANGUAGE=en_US:en LC_ALL=en_US.UTF-8 DEBIAN_FRONTEND=noninteractive TERM=xterm \
|
ENV LANG=en_US.UTF-8 LANGUAGE=en_US:en LC_ALL=en_US.UTF-8 DEBIAN_FRONTEND=noninteractive TERM=xterm \
|
||||||
ZBX_TYPE=agent ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
|
ZBX_TYPE=agent ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
|
||||||
@ -51,7 +51,7 @@ ARG APT_FLAGS_COMMON="-y"
|
|||||||
ARG APT_FLAGS_PERSISTENT="${APT_FLAGS_COMMON} --no-install-recommends"
|
ARG APT_FLAGS_PERSISTENT="${APT_FLAGS_COMMON} --no-install-recommends"
|
||||||
|
|
||||||
ARG MAJOR_VERSION=3.4
|
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}/
|
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
||||||
ENV LANG=en_US.UTF-8 LANGUAGE=en_US:en LC_ALL=en_US.UTF-8 DEBIAN_FRONTEND=noninteractive TERM=xterm \
|
ENV LANG=en_US.UTF-8 LANGUAGE=en_US:en LC_ALL=en_US.UTF-8 DEBIAN_FRONTEND=noninteractive TERM=xterm \
|
||||||
ZBX_TYPE=agent ZBX_DB_TYPE=none ZBX_OPT_TYPE=none \
|
ZBX_TYPE=agent ZBX_DB_TYPE=none ZBX_OPT_TYPE=none \
|
||||||
|
@ -838,6 +838,8 @@ prepare_zbx_web_config() {
|
|||||||
echo "**** Zabbix related PHP configuration file not found"
|
echo "**** Zabbix related PHP configuration file not found"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
ZBX_HISTORYSTORAGETYPES=${ZBX_HISTORYSTORAGETYPES:-"[]"}
|
||||||
|
|
||||||
# Escaping characters in parameter value
|
# Escaping characters in parameter value
|
||||||
server_name=$(escape_spec_char "${ZBX_SERVER_NAME}")
|
server_name=$(escape_spec_char "${ZBX_SERVER_NAME}")
|
||||||
server_user=$(escape_spec_char "${DB_SERVER_ZBX_USER}")
|
server_user=$(escape_spec_char "${DB_SERVER_ZBX_USER}")
|
||||||
|
@ -35,7 +35,7 @@ RUN addgroup zabbix && \
|
|||||||
rm -rf /var/cache/apk/*
|
rm -rf /var/cache/apk/*
|
||||||
|
|
||||||
ARG MAJOR_VERSION=3.4
|
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}/
|
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
||||||
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
|
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
|
||||||
|
|
||||||
|
@ -838,6 +838,8 @@ prepare_zbx_web_config() {
|
|||||||
echo "**** Zabbix related PHP configuration file not found"
|
echo "**** Zabbix related PHP configuration file not found"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
ZBX_HISTORYSTORAGETYPES=${ZBX_HISTORYSTORAGETYPES:-"[]"}
|
||||||
|
|
||||||
# Escaping characters in parameter value
|
# Escaping characters in parameter value
|
||||||
server_name=$(escape_spec_char "${ZBX_SERVER_NAME}")
|
server_name=$(escape_spec_char "${ZBX_SERVER_NAME}")
|
||||||
server_user=$(escape_spec_char "${DB_SERVER_ZBX_USER}")
|
server_user=$(escape_spec_char "${DB_SERVER_ZBX_USER}")
|
||||||
|
@ -4,7 +4,7 @@ ARG YUM_FLAGS_COMMON="-y"
|
|||||||
ARG YUM_FLAGS_DEV="${YUM_FLAGS_COMMON}"
|
ARG YUM_FLAGS_DEV="${YUM_FLAGS_COMMON}"
|
||||||
|
|
||||||
ARG MAJOR_VERSION=3.4
|
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}/
|
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
||||||
ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
|
ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
|
||||||
ZBX_TYPE=java-gateway
|
ZBX_TYPE=java-gateway
|
||||||
@ -44,7 +44,7 @@ ARG YUM_FLAGS_COMMON="-y"
|
|||||||
ARG YUM_FLAGS_PERSISTENT="${YUM_FLAGS_COMMON}"
|
ARG YUM_FLAGS_PERSISTENT="${YUM_FLAGS_COMMON}"
|
||||||
|
|
||||||
ARG MAJOR_VERSION=3.4
|
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}/
|
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
||||||
ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
|
ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
|
||||||
ZBX_TYPE=java-gateway ZBX_DB_TYPE=none ZBX_OPT_TYPE=none
|
ZBX_TYPE=java-gateway ZBX_DB_TYPE=none ZBX_OPT_TYPE=none
|
||||||
|
@ -838,6 +838,8 @@ prepare_zbx_web_config() {
|
|||||||
echo "**** Zabbix related PHP configuration file not found"
|
echo "**** Zabbix related PHP configuration file not found"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
ZBX_HISTORYSTORAGETYPES=${ZBX_HISTORYSTORAGETYPES:-"[]"}
|
||||||
|
|
||||||
# Escaping characters in parameter value
|
# Escaping characters in parameter value
|
||||||
server_name=$(escape_spec_char "${ZBX_SERVER_NAME}")
|
server_name=$(escape_spec_char "${ZBX_SERVER_NAME}")
|
||||||
server_user=$(escape_spec_char "${DB_SERVER_ZBX_USER}")
|
server_user=$(escape_spec_char "${DB_SERVER_ZBX_USER}")
|
||||||
|
@ -40,7 +40,7 @@ RUN locale-gen $LC_ALL && \
|
|||||||
rm -rf /var/lib/apt/lists/*
|
rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
ARG MAJOR_VERSION=3.4
|
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}/
|
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
||||||
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
|
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
|
||||||
|
|
||||||
|
@ -838,6 +838,8 @@ prepare_zbx_web_config() {
|
|||||||
echo "**** Zabbix related PHP configuration file not found"
|
echo "**** Zabbix related PHP configuration file not found"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
ZBX_HISTORYSTORAGETYPES=${ZBX_HISTORYSTORAGETYPES:-"[]"}
|
||||||
|
|
||||||
# Escaping characters in parameter value
|
# Escaping characters in parameter value
|
||||||
server_name=$(escape_spec_char "${ZBX_SERVER_NAME}")
|
server_name=$(escape_spec_char "${ZBX_SERVER_NAME}")
|
||||||
server_user=$(escape_spec_char "${DB_SERVER_ZBX_USER}")
|
server_user=$(escape_spec_char "${DB_SERVER_ZBX_USER}")
|
||||||
|
@ -59,7 +59,7 @@ RUN addgroup zabbix && \
|
|||||||
rm -rf /var/cache/apk/*
|
rm -rf /var/cache/apk/*
|
||||||
|
|
||||||
ARG MAJOR_VERSION=3.4
|
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}/
|
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
||||||
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
|
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
|
||||||
|
|
||||||
|
@ -838,6 +838,8 @@ prepare_zbx_web_config() {
|
|||||||
echo "**** Zabbix related PHP configuration file not found"
|
echo "**** Zabbix related PHP configuration file not found"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
ZBX_HISTORYSTORAGETYPES=${ZBX_HISTORYSTORAGETYPES:-"[]"}
|
||||||
|
|
||||||
# Escaping characters in parameter value
|
# Escaping characters in parameter value
|
||||||
server_name=$(escape_spec_char "${ZBX_SERVER_NAME}")
|
server_name=$(escape_spec_char "${ZBX_SERVER_NAME}")
|
||||||
server_user=$(escape_spec_char "${DB_SERVER_ZBX_USER}")
|
server_user=$(escape_spec_char "${DB_SERVER_ZBX_USER}")
|
||||||
|
@ -4,7 +4,7 @@ ARG YUM_FLAGS_COMMON="-y"
|
|||||||
ARG YUM_FLAGS_DEV="${YUM_FLAGS_COMMON}"
|
ARG YUM_FLAGS_DEV="${YUM_FLAGS_COMMON}"
|
||||||
|
|
||||||
ARG MAJOR_VERSION=3.4
|
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}/
|
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
||||||
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
|
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
|
||||||
ZBX_TYPE=proxy ZBX_DB_TYPE=mysql
|
ZBX_TYPE=proxy ZBX_DB_TYPE=mysql
|
||||||
@ -65,7 +65,7 @@ ARG YUM_FLAGS_COMMON="-y"
|
|||||||
ARG YUM_FLAGS_PERSISTENT="${YUM_FLAGS_COMMON}"
|
ARG YUM_FLAGS_PERSISTENT="${YUM_FLAGS_COMMON}"
|
||||||
|
|
||||||
ARG MAJOR_VERSION=3.4
|
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}/
|
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
||||||
ENV TERM=xterm MIBDIRS=/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL \
|
ENV TERM=xterm MIBDIRS=/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL \
|
||||||
ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
|
ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
|
||||||
|
@ -838,6 +838,8 @@ prepare_zbx_web_config() {
|
|||||||
echo "**** Zabbix related PHP configuration file not found"
|
echo "**** Zabbix related PHP configuration file not found"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
ZBX_HISTORYSTORAGETYPES=${ZBX_HISTORYSTORAGETYPES:-"[]"}
|
||||||
|
|
||||||
# Escaping characters in parameter value
|
# Escaping characters in parameter value
|
||||||
server_name=$(escape_spec_char "${ZBX_SERVER_NAME}")
|
server_name=$(escape_spec_char "${ZBX_SERVER_NAME}")
|
||||||
server_user=$(escape_spec_char "${DB_SERVER_ZBX_USER}")
|
server_user=$(escape_spec_char "${DB_SERVER_ZBX_USER}")
|
||||||
|
@ -67,7 +67,7 @@ RUN locale-gen $LC_ALL && \
|
|||||||
rm -rf /var/lib/apt/lists/*
|
rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
ARG MAJOR_VERSION=3.4
|
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}/
|
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
||||||
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
|
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
|
||||||
|
|
||||||
|
@ -838,6 +838,8 @@ prepare_zbx_web_config() {
|
|||||||
echo "**** Zabbix related PHP configuration file not found"
|
echo "**** Zabbix related PHP configuration file not found"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
ZBX_HISTORYSTORAGETYPES=${ZBX_HISTORYSTORAGETYPES:-"[]"}
|
||||||
|
|
||||||
# Escaping characters in parameter value
|
# Escaping characters in parameter value
|
||||||
server_name=$(escape_spec_char "${ZBX_SERVER_NAME}")
|
server_name=$(escape_spec_char "${ZBX_SERVER_NAME}")
|
||||||
server_user=$(escape_spec_char "${DB_SERVER_ZBX_USER}")
|
server_user=$(escape_spec_char "${DB_SERVER_ZBX_USER}")
|
||||||
|
@ -57,7 +57,7 @@ RUN addgroup zabbix && \
|
|||||||
rm -rf /var/cache/apk/*
|
rm -rf /var/cache/apk/*
|
||||||
|
|
||||||
ARG MAJOR_VERSION=3.4
|
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}/
|
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
||||||
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
|
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
|
||||||
|
|
||||||
|
@ -838,6 +838,8 @@ prepare_zbx_web_config() {
|
|||||||
echo "**** Zabbix related PHP configuration file not found"
|
echo "**** Zabbix related PHP configuration file not found"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
ZBX_HISTORYSTORAGETYPES=${ZBX_HISTORYSTORAGETYPES:-"[]"}
|
||||||
|
|
||||||
# Escaping characters in parameter value
|
# Escaping characters in parameter value
|
||||||
server_name=$(escape_spec_char "${ZBX_SERVER_NAME}")
|
server_name=$(escape_spec_char "${ZBX_SERVER_NAME}")
|
||||||
server_user=$(escape_spec_char "${DB_SERVER_ZBX_USER}")
|
server_user=$(escape_spec_char "${DB_SERVER_ZBX_USER}")
|
||||||
|
@ -4,7 +4,7 @@ ARG YUM_FLAGS_COMMON="-y"
|
|||||||
ARG YUM_FLAGS_DEV="${YUM_FLAGS_COMMON}"
|
ARG YUM_FLAGS_DEV="${YUM_FLAGS_COMMON}"
|
||||||
|
|
||||||
ARG MAJOR_VERSION=3.4
|
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}/
|
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
||||||
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
|
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
|
||||||
ZBX_TYPE=proxy ZBX_DB_TYPE=sqlite3
|
ZBX_TYPE=proxy ZBX_DB_TYPE=sqlite3
|
||||||
@ -65,7 +65,7 @@ ARG YUM_FLAGS_COMMON="-y"
|
|||||||
ARG YUM_FLAGS_PERSISTENT="${YUM_FLAGS_COMMON}"
|
ARG YUM_FLAGS_PERSISTENT="${YUM_FLAGS_COMMON}"
|
||||||
|
|
||||||
ARG MAJOR_VERSION=3.4
|
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}/
|
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
||||||
ENV TERM=xterm MIBDIRS=/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL \
|
ENV TERM=xterm MIBDIRS=/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL \
|
||||||
ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
|
ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
|
||||||
|
@ -838,6 +838,8 @@ prepare_zbx_web_config() {
|
|||||||
echo "**** Zabbix related PHP configuration file not found"
|
echo "**** Zabbix related PHP configuration file not found"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
ZBX_HISTORYSTORAGETYPES=${ZBX_HISTORYSTORAGETYPES:-"[]"}
|
||||||
|
|
||||||
# Escaping characters in parameter value
|
# Escaping characters in parameter value
|
||||||
server_name=$(escape_spec_char "${ZBX_SERVER_NAME}")
|
server_name=$(escape_spec_char "${ZBX_SERVER_NAME}")
|
||||||
server_user=$(escape_spec_char "${DB_SERVER_ZBX_USER}")
|
server_user=$(escape_spec_char "${DB_SERVER_ZBX_USER}")
|
||||||
|
@ -64,7 +64,7 @@ RUN locale-gen $LC_ALL && \
|
|||||||
rm -rf /var/lib/apt/lists/*
|
rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
ARG MAJOR_VERSION=3.4
|
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}/
|
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
||||||
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
|
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
|
||||||
|
|
||||||
|
@ -838,6 +838,8 @@ prepare_zbx_web_config() {
|
|||||||
echo "**** Zabbix related PHP configuration file not found"
|
echo "**** Zabbix related PHP configuration file not found"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
ZBX_HISTORYSTORAGETYPES=${ZBX_HISTORYSTORAGETYPES:-"[]"}
|
||||||
|
|
||||||
# Escaping characters in parameter value
|
# Escaping characters in parameter value
|
||||||
server_name=$(escape_spec_char "${ZBX_SERVER_NAME}")
|
server_name=$(escape_spec_char "${ZBX_SERVER_NAME}")
|
||||||
server_user=$(escape_spec_char "${DB_SERVER_ZBX_USER}")
|
server_user=$(escape_spec_char "${DB_SERVER_ZBX_USER}")
|
||||||
|
@ -61,7 +61,7 @@ RUN addgroup zabbix && \
|
|||||||
rm -rf /var/cache/apk/*
|
rm -rf /var/cache/apk/*
|
||||||
|
|
||||||
ARG MAJOR_VERSION=3.4
|
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}/
|
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
||||||
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
|
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
|
||||||
|
|
||||||
|
@ -838,6 +838,8 @@ prepare_zbx_web_config() {
|
|||||||
echo "**** Zabbix related PHP configuration file not found"
|
echo "**** Zabbix related PHP configuration file not found"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
ZBX_HISTORYSTORAGETYPES=${ZBX_HISTORYSTORAGETYPES:-"[]"}
|
||||||
|
|
||||||
# Escaping characters in parameter value
|
# Escaping characters in parameter value
|
||||||
server_name=$(escape_spec_char "${ZBX_SERVER_NAME}")
|
server_name=$(escape_spec_char "${ZBX_SERVER_NAME}")
|
||||||
server_user=$(escape_spec_char "${DB_SERVER_ZBX_USER}")
|
server_user=$(escape_spec_char "${DB_SERVER_ZBX_USER}")
|
||||||
|
@ -4,7 +4,7 @@ ARG YUM_FLAGS_COMMON="-y"
|
|||||||
ARG YUM_FLAGS_DEV="${YUM_FLAGS_COMMON}"
|
ARG YUM_FLAGS_DEV="${YUM_FLAGS_COMMON}"
|
||||||
|
|
||||||
ARG MAJOR_VERSION=3.4
|
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}/
|
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
||||||
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
|
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
|
||||||
ZBX_TYPE=server ZBX_DB_TYPE=mysql ZBX_OPT_TYPE=none
|
ZBX_TYPE=server ZBX_DB_TYPE=mysql ZBX_OPT_TYPE=none
|
||||||
@ -70,7 +70,7 @@ ARG YUM_FLAGS_COMMON="-y"
|
|||||||
ARG YUM_FLAGS_PERSISTENT="${YUM_FLAGS_COMMON}"
|
ARG YUM_FLAGS_PERSISTENT="${YUM_FLAGS_COMMON}"
|
||||||
|
|
||||||
ARG MAJOR_VERSION=3.4
|
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}/
|
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
||||||
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
|
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
|
||||||
TERM=xterm MIBDIRS=/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL \
|
TERM=xterm MIBDIRS=/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL \
|
||||||
|
@ -838,6 +838,8 @@ prepare_zbx_web_config() {
|
|||||||
echo "**** Zabbix related PHP configuration file not found"
|
echo "**** Zabbix related PHP configuration file not found"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
ZBX_HISTORYSTORAGETYPES=${ZBX_HISTORYSTORAGETYPES:-"[]"}
|
||||||
|
|
||||||
# Escaping characters in parameter value
|
# Escaping characters in parameter value
|
||||||
server_name=$(escape_spec_char "${ZBX_SERVER_NAME}")
|
server_name=$(escape_spec_char "${ZBX_SERVER_NAME}")
|
||||||
server_user=$(escape_spec_char "${DB_SERVER_ZBX_USER}")
|
server_user=$(escape_spec_char "${DB_SERVER_ZBX_USER}")
|
||||||
|
@ -69,7 +69,7 @@ RUN locale-gen $LC_ALL && \
|
|||||||
rm -rf /var/lib/apt/lists/*
|
rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
ARG MAJOR_VERSION=3.4
|
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}/
|
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
||||||
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
|
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
|
||||||
|
|
||||||
|
@ -838,6 +838,8 @@ prepare_zbx_web_config() {
|
|||||||
echo "**** Zabbix related PHP configuration file not found"
|
echo "**** Zabbix related PHP configuration file not found"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
ZBX_HISTORYSTORAGETYPES=${ZBX_HISTORYSTORAGETYPES:-"[]"}
|
||||||
|
|
||||||
# Escaping characters in parameter value
|
# Escaping characters in parameter value
|
||||||
server_name=$(escape_spec_char "${ZBX_SERVER_NAME}")
|
server_name=$(escape_spec_char "${ZBX_SERVER_NAME}")
|
||||||
server_user=$(escape_spec_char "${DB_SERVER_ZBX_USER}")
|
server_user=$(escape_spec_char "${DB_SERVER_ZBX_USER}")
|
||||||
|
@ -61,7 +61,7 @@ RUN addgroup zabbix && \
|
|||||||
rm -rf /var/cache/apk/*
|
rm -rf /var/cache/apk/*
|
||||||
|
|
||||||
ARG MAJOR_VERSION=3.4
|
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}/
|
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
||||||
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
|
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
|
||||||
|
|
||||||
|
@ -838,6 +838,8 @@ prepare_zbx_web_config() {
|
|||||||
echo "**** Zabbix related PHP configuration file not found"
|
echo "**** Zabbix related PHP configuration file not found"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
ZBX_HISTORYSTORAGETYPES=${ZBX_HISTORYSTORAGETYPES:-"[]"}
|
||||||
|
|
||||||
# Escaping characters in parameter value
|
# Escaping characters in parameter value
|
||||||
server_name=$(escape_spec_char "${ZBX_SERVER_NAME}")
|
server_name=$(escape_spec_char "${ZBX_SERVER_NAME}")
|
||||||
server_user=$(escape_spec_char "${DB_SERVER_ZBX_USER}")
|
server_user=$(escape_spec_char "${DB_SERVER_ZBX_USER}")
|
||||||
|
@ -4,7 +4,7 @@ ARG YUM_FLAGS_COMMON="-y"
|
|||||||
ARG YUM_FLAGS_DEV="${YUM_FLAGS_COMMON}"
|
ARG YUM_FLAGS_DEV="${YUM_FLAGS_COMMON}"
|
||||||
|
|
||||||
ARG MAJOR_VERSION=3.4
|
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}/
|
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
||||||
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
|
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
|
||||||
ZBX_TYPE=server ZBX_DB_TYPE=postgresql ZBX_OPT_TYPE=none
|
ZBX_TYPE=server ZBX_DB_TYPE=postgresql ZBX_OPT_TYPE=none
|
||||||
@ -70,7 +70,7 @@ ARG YUM_FLAGS_COMMON="-y"
|
|||||||
ARG YUM_FLAGS_PERSISTENT="${YUM_FLAGS_COMMON}"
|
ARG YUM_FLAGS_PERSISTENT="${YUM_FLAGS_COMMON}"
|
||||||
|
|
||||||
ARG MAJOR_VERSION=3.4
|
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}/
|
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
||||||
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
|
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
|
||||||
TERM=xterm MIBDIRS=/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL \
|
TERM=xterm MIBDIRS=/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL \
|
||||||
|
@ -838,6 +838,8 @@ prepare_zbx_web_config() {
|
|||||||
echo "**** Zabbix related PHP configuration file not found"
|
echo "**** Zabbix related PHP configuration file not found"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
ZBX_HISTORYSTORAGETYPES=${ZBX_HISTORYSTORAGETYPES:-"[]"}
|
||||||
|
|
||||||
# Escaping characters in parameter value
|
# Escaping characters in parameter value
|
||||||
server_name=$(escape_spec_char "${ZBX_SERVER_NAME}")
|
server_name=$(escape_spec_char "${ZBX_SERVER_NAME}")
|
||||||
server_user=$(escape_spec_char "${DB_SERVER_ZBX_USER}")
|
server_user=$(escape_spec_char "${DB_SERVER_ZBX_USER}")
|
||||||
|
@ -69,7 +69,7 @@ RUN locale-gen $LC_ALL && \
|
|||||||
rm -rf /var/lib/apt/lists/*
|
rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
ARG MAJOR_VERSION=3.4
|
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}/
|
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
||||||
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
|
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
|
||||||
|
|
||||||
|
@ -838,6 +838,8 @@ prepare_zbx_web_config() {
|
|||||||
echo "**** Zabbix related PHP configuration file not found"
|
echo "**** Zabbix related PHP configuration file not found"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
ZBX_HISTORYSTORAGETYPES=${ZBX_HISTORYSTORAGETYPES:-"[]"}
|
||||||
|
|
||||||
# Escaping characters in parameter value
|
# Escaping characters in parameter value
|
||||||
server_name=$(escape_spec_char "${ZBX_SERVER_NAME}")
|
server_name=$(escape_spec_char "${ZBX_SERVER_NAME}")
|
||||||
server_user=$(escape_spec_char "${DB_SERVER_ZBX_USER}")
|
server_user=$(escape_spec_char "${DB_SERVER_ZBX_USER}")
|
||||||
|
@ -19,7 +19,7 @@ LABEL org.label-schema.name="zabbix-snmptraps-alpine" \
|
|||||||
org.label-schema.license="GPL v2.0"
|
org.label-schema.license="GPL v2.0"
|
||||||
|
|
||||||
ARG MAJOR_VERSION=3.4
|
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}/
|
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
||||||
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
|
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
|
||||||
|
|
||||||
|
@ -4,7 +4,7 @@ ARG YUM_FLAGS_COMMON="-y"
|
|||||||
ARG YUM_FLAGS_DEV="${YUM_FLAGS_COMMON}"
|
ARG YUM_FLAGS_DEV="${YUM_FLAGS_COMMON}"
|
||||||
|
|
||||||
ARG MAJOR_VERSION=3.4
|
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}/
|
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
||||||
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
|
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
|
||||||
|
|
||||||
@ -35,7 +35,7 @@ ARG YUM_FLAGS_COMMON="-y"
|
|||||||
ARG YUM_FLAGS_PERSISTENT="${YUM_FLAGS_COMMON}"
|
ARG YUM_FLAGS_PERSISTENT="${YUM_FLAGS_COMMON}"
|
||||||
|
|
||||||
ARG MAJOR_VERSION=3.4
|
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}/
|
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
||||||
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
|
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
|
||||||
TERM=xterm MIBDIRS=/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL
|
TERM=xterm MIBDIRS=/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL
|
||||||
|
@ -20,7 +20,7 @@ LABEL org.label-schema.name="zabbix-snmptraps-ubuntu" \
|
|||||||
org.label-schema.license="GPL v2.0"
|
org.label-schema.license="GPL v2.0"
|
||||||
|
|
||||||
ARG MAJOR_VERSION=3.4
|
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}/
|
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
||||||
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
|
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
|
||||||
|
|
||||||
|
@ -55,7 +55,7 @@ RUN addgroup zabbix && \
|
|||||||
rm -rf /var/cache/apk/*
|
rm -rf /var/cache/apk/*
|
||||||
|
|
||||||
ARG MAJOR_VERSION=3.4
|
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}/
|
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
||||||
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
|
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
|
||||||
|
|
||||||
|
@ -838,6 +838,8 @@ prepare_zbx_web_config() {
|
|||||||
echo "**** Zabbix related PHP configuration file not found"
|
echo "**** Zabbix related PHP configuration file not found"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
ZBX_HISTORYSTORAGETYPES=${ZBX_HISTORYSTORAGETYPES:-"[]"}
|
||||||
|
|
||||||
# Escaping characters in parameter value
|
# Escaping characters in parameter value
|
||||||
server_name=$(escape_spec_char "${ZBX_SERVER_NAME}")
|
server_name=$(escape_spec_char "${ZBX_SERVER_NAME}")
|
||||||
server_user=$(escape_spec_char "${DB_SERVER_ZBX_USER}")
|
server_user=$(escape_spec_char "${DB_SERVER_ZBX_USER}")
|
||||||
|
@ -4,7 +4,7 @@ ARG YUM_FLAGS_COMMON="-y"
|
|||||||
ARG YUM_FLAGS_DEV="${YUM_FLAGS_COMMON}"
|
ARG YUM_FLAGS_DEV="${YUM_FLAGS_COMMON}"
|
||||||
|
|
||||||
ARG MAJOR_VERSION=3.4
|
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}/
|
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
||||||
ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
|
ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
|
||||||
|
|
||||||
@ -35,7 +35,7 @@ ARG YUM_FLAGS_COMMON="-y"
|
|||||||
ARG YUM_FLAGS_PERSISTENT="${YUM_FLAGS_COMMON}"
|
ARG YUM_FLAGS_PERSISTENT="${YUM_FLAGS_COMMON}"
|
||||||
|
|
||||||
ARG MAJOR_VERSION=3.4
|
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}/
|
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
||||||
ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
|
ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
|
||||||
ZBX_TYPE=frontend ZBX_DB_TYPE=mysql ZBX_OPT_TYPE=apache
|
ZBX_TYPE=frontend ZBX_DB_TYPE=mysql ZBX_OPT_TYPE=apache
|
||||||
|
@ -838,6 +838,8 @@ prepare_zbx_web_config() {
|
|||||||
echo "**** Zabbix related PHP configuration file not found"
|
echo "**** Zabbix related PHP configuration file not found"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
ZBX_HISTORYSTORAGETYPES=${ZBX_HISTORYSTORAGETYPES:-"[]"}
|
||||||
|
|
||||||
# Escaping characters in parameter value
|
# Escaping characters in parameter value
|
||||||
server_name=$(escape_spec_char "${ZBX_SERVER_NAME}")
|
server_name=$(escape_spec_char "${ZBX_SERVER_NAME}")
|
||||||
server_user=$(escape_spec_char "${DB_SERVER_ZBX_USER}")
|
server_user=$(escape_spec_char "${DB_SERVER_ZBX_USER}")
|
||||||
|
@ -48,7 +48,7 @@ RUN locale-gen $LC_ALL && \
|
|||||||
rm -rf /var/lib/apt/lists/*
|
rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
ARG MAJOR_VERSION=3.4
|
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}/
|
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
||||||
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
|
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
|
||||||
|
|
||||||
|
@ -838,6 +838,8 @@ prepare_zbx_web_config() {
|
|||||||
echo "**** Zabbix related PHP configuration file not found"
|
echo "**** Zabbix related PHP configuration file not found"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
ZBX_HISTORYSTORAGETYPES=${ZBX_HISTORYSTORAGETYPES:-"[]"}
|
||||||
|
|
||||||
# Escaping characters in parameter value
|
# Escaping characters in parameter value
|
||||||
server_name=$(escape_spec_char "${ZBX_SERVER_NAME}")
|
server_name=$(escape_spec_char "${ZBX_SERVER_NAME}")
|
||||||
server_user=$(escape_spec_char "${DB_SERVER_ZBX_USER}")
|
server_user=$(escape_spec_char "${DB_SERVER_ZBX_USER}")
|
||||||
|
@ -54,7 +54,7 @@ RUN addgroup zabbix && \
|
|||||||
rm -rf /var/cache/apk/*
|
rm -rf /var/cache/apk/*
|
||||||
|
|
||||||
ARG MAJOR_VERSION=3.4
|
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}/
|
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
||||||
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
|
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
|
||||||
|
|
||||||
|
@ -838,6 +838,8 @@ prepare_zbx_web_config() {
|
|||||||
echo "**** Zabbix related PHP configuration file not found"
|
echo "**** Zabbix related PHP configuration file not found"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
ZBX_HISTORYSTORAGETYPES=${ZBX_HISTORYSTORAGETYPES:-"[]"}
|
||||||
|
|
||||||
# Escaping characters in parameter value
|
# Escaping characters in parameter value
|
||||||
server_name=$(escape_spec_char "${ZBX_SERVER_NAME}")
|
server_name=$(escape_spec_char "${ZBX_SERVER_NAME}")
|
||||||
server_user=$(escape_spec_char "${DB_SERVER_ZBX_USER}")
|
server_user=$(escape_spec_char "${DB_SERVER_ZBX_USER}")
|
||||||
|
@ -4,7 +4,7 @@ ARG YUM_FLAGS_COMMON="-y"
|
|||||||
ARG YUM_FLAGS_DEV="${YUM_FLAGS_COMMON}"
|
ARG YUM_FLAGS_DEV="${YUM_FLAGS_COMMON}"
|
||||||
|
|
||||||
ARG MAJOR_VERSION=3.4
|
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}/
|
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
||||||
ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
|
ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
|
||||||
|
|
||||||
@ -35,7 +35,7 @@ ARG YUM_FLAGS_COMMON="-y"
|
|||||||
ARG YUM_FLAGS_PERSISTENT="${YUM_FLAGS_COMMON}"
|
ARG YUM_FLAGS_PERSISTENT="${YUM_FLAGS_COMMON}"
|
||||||
|
|
||||||
ARG MAJOR_VERSION=3.4
|
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}/
|
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
||||||
ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
|
ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
|
||||||
ZBX_TYPE=frontend ZBX_DB_TYPE=postgresql ZBX_OPT_TYPE=apache
|
ZBX_TYPE=frontend ZBX_DB_TYPE=postgresql ZBX_OPT_TYPE=apache
|
||||||
|
@ -838,6 +838,8 @@ prepare_zbx_web_config() {
|
|||||||
echo "**** Zabbix related PHP configuration file not found"
|
echo "**** Zabbix related PHP configuration file not found"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
ZBX_HISTORYSTORAGETYPES=${ZBX_HISTORYSTORAGETYPES:-"[]"}
|
||||||
|
|
||||||
# Escaping characters in parameter value
|
# Escaping characters in parameter value
|
||||||
server_name=$(escape_spec_char "${ZBX_SERVER_NAME}")
|
server_name=$(escape_spec_char "${ZBX_SERVER_NAME}")
|
||||||
server_user=$(escape_spec_char "${DB_SERVER_ZBX_USER}")
|
server_user=$(escape_spec_char "${DB_SERVER_ZBX_USER}")
|
||||||
|
@ -48,7 +48,7 @@ RUN locale-gen $LC_ALL && \
|
|||||||
rm -rf /var/lib/apt/lists/*
|
rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
ARG MAJOR_VERSION=3.4
|
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}/
|
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
||||||
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
|
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
|
||||||
|
|
||||||
|
@ -838,6 +838,8 @@ prepare_zbx_web_config() {
|
|||||||
echo "**** Zabbix related PHP configuration file not found"
|
echo "**** Zabbix related PHP configuration file not found"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
ZBX_HISTORYSTORAGETYPES=${ZBX_HISTORYSTORAGETYPES:-"[]"}
|
||||||
|
|
||||||
# Escaping characters in parameter value
|
# Escaping characters in parameter value
|
||||||
server_name=$(escape_spec_char "${ZBX_SERVER_NAME}")
|
server_name=$(escape_spec_char "${ZBX_SERVER_NAME}")
|
||||||
server_user=$(escape_spec_char "${DB_SERVER_ZBX_USER}")
|
server_user=$(escape_spec_char "${DB_SERVER_ZBX_USER}")
|
||||||
|
@ -55,7 +55,7 @@ RUN addgroup zabbix && \
|
|||||||
rm -rf /var/cache/apk/*
|
rm -rf /var/cache/apk/*
|
||||||
|
|
||||||
ARG MAJOR_VERSION=3.4
|
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}/
|
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
||||||
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
|
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
|
||||||
|
|
||||||
|
@ -838,6 +838,8 @@ prepare_zbx_web_config() {
|
|||||||
echo "**** Zabbix related PHP configuration file not found"
|
echo "**** Zabbix related PHP configuration file not found"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
ZBX_HISTORYSTORAGETYPES=${ZBX_HISTORYSTORAGETYPES:-"[]"}
|
||||||
|
|
||||||
# Escaping characters in parameter value
|
# Escaping characters in parameter value
|
||||||
server_name=$(escape_spec_char "${ZBX_SERVER_NAME}")
|
server_name=$(escape_spec_char "${ZBX_SERVER_NAME}")
|
||||||
server_user=$(escape_spec_char "${DB_SERVER_ZBX_USER}")
|
server_user=$(escape_spec_char "${DB_SERVER_ZBX_USER}")
|
||||||
|
@ -4,7 +4,7 @@ ARG YUM_FLAGS_COMMON="-y"
|
|||||||
ARG YUM_FLAGS_DEV="${YUM_FLAGS_COMMON}"
|
ARG YUM_FLAGS_DEV="${YUM_FLAGS_COMMON}"
|
||||||
|
|
||||||
ARG MAJOR_VERSION=3.4
|
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}/
|
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
||||||
ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
|
ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
|
||||||
ZBX_TYPE=frontend ZBX_DB_TYPE=mysql ZBX_OPT_TYPE=nginx
|
ZBX_TYPE=frontend ZBX_DB_TYPE=mysql ZBX_OPT_TYPE=nginx
|
||||||
@ -36,7 +36,7 @@ ARG YUM_FLAGS_COMMON="-y"
|
|||||||
ARG YUM_FLAGS_PERSISTENT="${YUM_FLAGS_COMMON}"
|
ARG YUM_FLAGS_PERSISTENT="${YUM_FLAGS_COMMON}"
|
||||||
|
|
||||||
ARG MAJOR_VERSION=3.4
|
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}/
|
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
||||||
ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
|
ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
|
||||||
ZBX_TYPE=frontend ZBX_DB_TYPE=mysql ZBX_OPT_TYPE=nginx
|
ZBX_TYPE=frontend ZBX_DB_TYPE=mysql ZBX_OPT_TYPE=nginx
|
||||||
|
@ -838,6 +838,8 @@ prepare_zbx_web_config() {
|
|||||||
echo "**** Zabbix related PHP configuration file not found"
|
echo "**** Zabbix related PHP configuration file not found"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
ZBX_HISTORYSTORAGETYPES=${ZBX_HISTORYSTORAGETYPES:-"[]"}
|
||||||
|
|
||||||
# Escaping characters in parameter value
|
# Escaping characters in parameter value
|
||||||
server_name=$(escape_spec_char "${ZBX_SERVER_NAME}")
|
server_name=$(escape_spec_char "${ZBX_SERVER_NAME}")
|
||||||
server_user=$(escape_spec_char "${DB_SERVER_ZBX_USER}")
|
server_user=$(escape_spec_char "${DB_SERVER_ZBX_USER}")
|
||||||
|
@ -60,7 +60,7 @@ RUN locale-gen $LC_ALL && \
|
|||||||
rm -rf /var/lib/apt/lists/*
|
rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
ARG MAJOR_VERSION=3.4
|
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}/
|
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
||||||
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
|
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
|
||||||
|
|
||||||
|
@ -838,6 +838,8 @@ prepare_zbx_web_config() {
|
|||||||
echo "**** Zabbix related PHP configuration file not found"
|
echo "**** Zabbix related PHP configuration file not found"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
ZBX_HISTORYSTORAGETYPES=${ZBX_HISTORYSTORAGETYPES:-"[]"}
|
||||||
|
|
||||||
# Escaping characters in parameter value
|
# Escaping characters in parameter value
|
||||||
server_name=$(escape_spec_char "${ZBX_SERVER_NAME}")
|
server_name=$(escape_spec_char "${ZBX_SERVER_NAME}")
|
||||||
server_user=$(escape_spec_char "${DB_SERVER_ZBX_USER}")
|
server_user=$(escape_spec_char "${DB_SERVER_ZBX_USER}")
|
||||||
|
@ -54,7 +54,7 @@ RUN addgroup zabbix && \
|
|||||||
rm -rf /var/cache/apk/*
|
rm -rf /var/cache/apk/*
|
||||||
|
|
||||||
ARG MAJOR_VERSION=3.4
|
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}/
|
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
||||||
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
|
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
|
||||||
|
|
||||||
|
@ -838,6 +838,8 @@ prepare_zbx_web_config() {
|
|||||||
echo "**** Zabbix related PHP configuration file not found"
|
echo "**** Zabbix related PHP configuration file not found"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
ZBX_HISTORYSTORAGETYPES=${ZBX_HISTORYSTORAGETYPES:-"[]"}
|
||||||
|
|
||||||
# Escaping characters in parameter value
|
# Escaping characters in parameter value
|
||||||
server_name=$(escape_spec_char "${ZBX_SERVER_NAME}")
|
server_name=$(escape_spec_char "${ZBX_SERVER_NAME}")
|
||||||
server_user=$(escape_spec_char "${DB_SERVER_ZBX_USER}")
|
server_user=$(escape_spec_char "${DB_SERVER_ZBX_USER}")
|
||||||
|
@ -4,7 +4,7 @@ ARG YUM_FLAGS_COMMON="-y"
|
|||||||
ARG YUM_FLAGS_DEV="${YUM_FLAGS_COMMON}"
|
ARG YUM_FLAGS_DEV="${YUM_FLAGS_COMMON}"
|
||||||
|
|
||||||
ARG MAJOR_VERSION=3.4
|
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}/
|
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
||||||
ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
|
ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
|
||||||
ZBX_TYPE=frontend ZBX_DB_TYPE=postgresql ZBX_OPT_TYPE=nginx
|
ZBX_TYPE=frontend ZBX_DB_TYPE=postgresql ZBX_OPT_TYPE=nginx
|
||||||
@ -36,7 +36,7 @@ ARG YUM_FLAGS_COMMON="-y"
|
|||||||
ARG YUM_FLAGS_PERSISTENT="${YUM_FLAGS_COMMON}"
|
ARG YUM_FLAGS_PERSISTENT="${YUM_FLAGS_COMMON}"
|
||||||
|
|
||||||
ARG MAJOR_VERSION=3.4
|
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}/
|
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
||||||
ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
|
ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
|
||||||
ZBX_TYPE=frontend ZBX_DB_TYPE=postgresql ZBX_OPT_TYPE=nginx
|
ZBX_TYPE=frontend ZBX_DB_TYPE=postgresql ZBX_OPT_TYPE=nginx
|
||||||
|
@ -838,6 +838,8 @@ prepare_zbx_web_config() {
|
|||||||
echo "**** Zabbix related PHP configuration file not found"
|
echo "**** Zabbix related PHP configuration file not found"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
ZBX_HISTORYSTORAGETYPES=${ZBX_HISTORYSTORAGETYPES:-"[]"}
|
||||||
|
|
||||||
# Escaping characters in parameter value
|
# Escaping characters in parameter value
|
||||||
server_name=$(escape_spec_char "${ZBX_SERVER_NAME}")
|
server_name=$(escape_spec_char "${ZBX_SERVER_NAME}")
|
||||||
server_user=$(escape_spec_char "${DB_SERVER_ZBX_USER}")
|
server_user=$(escape_spec_char "${DB_SERVER_ZBX_USER}")
|
||||||
|
@ -60,7 +60,7 @@ RUN locale-gen $LC_ALL && \
|
|||||||
rm -rf /var/lib/apt/lists/*
|
rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
ARG MAJOR_VERSION=3.4
|
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}/
|
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
||||||
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
|
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
|
||||||
|
|
||||||
|
@ -838,6 +838,8 @@ prepare_zbx_web_config() {
|
|||||||
echo "**** Zabbix related PHP configuration file not found"
|
echo "**** Zabbix related PHP configuration file not found"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
ZBX_HISTORYSTORAGETYPES=${ZBX_HISTORYSTORAGETYPES:-"[]"}
|
||||||
|
|
||||||
# Escaping characters in parameter value
|
# Escaping characters in parameter value
|
||||||
server_name=$(escape_spec_char "${ZBX_SERVER_NAME}")
|
server_name=$(escape_spec_char "${ZBX_SERVER_NAME}")
|
||||||
server_user=$(escape_spec_char "${DB_SERVER_ZBX_USER}")
|
server_user=$(escape_spec_char "${DB_SERVER_ZBX_USER}")
|
||||||
|
@ -4,7 +4,7 @@ ARG APK_FLAGS_COMMON=""
|
|||||||
ARG APK_FLAGS_DEV="${APK_FLAGS_COMMON} --no-cache"
|
ARG APK_FLAGS_DEV="${APK_FLAGS_COMMON} --no-cache"
|
||||||
|
|
||||||
ARG MAJOR_VERSION=3.4
|
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}/
|
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
||||||
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
|
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
|
||||||
PATH=${PATH}:/usr/lib/jvm/default-jvm/bin/ JAVA_HOME=/usr/lib/jvm/default-jvm \
|
PATH=${PATH}:/usr/lib/jvm/default-jvm/bin/ JAVA_HOME=/usr/lib/jvm/default-jvm \
|
||||||
@ -86,7 +86,7 @@ ARG APK_FLAGS_COMMON=""
|
|||||||
ARG APK_FLAGS_PERSISTENT="${APK_FLAGS_COMMON} --clean-protected --no-cache"
|
ARG APK_FLAGS_PERSISTENT="${APK_FLAGS_COMMON} --clean-protected --no-cache"
|
||||||
|
|
||||||
ARG MAJOR_VERSION=3.4
|
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}/
|
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
||||||
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
|
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
|
||||||
MIBDIRS=/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL PATH=${PATH}:/usr/lib/jvm/default-jvm/bin/ JAVA_HOME=/usr/lib/jvm/default-jvm \
|
MIBDIRS=/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL PATH=${PATH}:/usr/lib/jvm/default-jvm/bin/ JAVA_HOME=/usr/lib/jvm/default-jvm \
|
||||||
|
@ -838,6 +838,8 @@ prepare_zbx_web_config() {
|
|||||||
echo "**** Zabbix related PHP configuration file not found"
|
echo "**** Zabbix related PHP configuration file not found"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
ZBX_HISTORYSTORAGETYPES=${ZBX_HISTORYSTORAGETYPES:-"[]"}
|
||||||
|
|
||||||
# Escaping characters in parameter value
|
# Escaping characters in parameter value
|
||||||
server_name=$(escape_spec_char "${ZBX_SERVER_NAME}")
|
server_name=$(escape_spec_char "${ZBX_SERVER_NAME}")
|
||||||
server_user=$(escape_spec_char "${DB_SERVER_ZBX_USER}")
|
server_user=$(escape_spec_char "${DB_SERVER_ZBX_USER}")
|
||||||
|
@ -4,7 +4,7 @@ ARG YUM_FLAGS_COMMON="-y"
|
|||||||
ARG YUM_FLAGS_DEV="${YUM_FLAGS_COMMON}"
|
ARG YUM_FLAGS_DEV="${YUM_FLAGS_COMMON}"
|
||||||
|
|
||||||
ARG MAJOR_VERSION=3.4
|
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}/
|
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
||||||
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
|
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
|
||||||
ZBX_TYPE=server ZBX_DB_TYPE=mysql ZBX_OPT_TYPE=nginx \
|
ZBX_TYPE=server ZBX_DB_TYPE=mysql ZBX_OPT_TYPE=nginx \
|
||||||
@ -86,7 +86,7 @@ ARG YUM_FLAGS_COMMON="-y"
|
|||||||
ARG YUM_FLAGS_PERSISTENT="${YUM_FLAGS_COMMON}"
|
ARG YUM_FLAGS_PERSISTENT="${YUM_FLAGS_COMMON}"
|
||||||
|
|
||||||
ARG MAJOR_VERSION=3.4
|
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}/
|
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
||||||
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
|
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
|
||||||
TERM=xterm MIBDIRS=/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL \
|
TERM=xterm MIBDIRS=/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL \
|
||||||
|
@ -838,6 +838,8 @@ prepare_zbx_web_config() {
|
|||||||
echo "**** Zabbix related PHP configuration file not found"
|
echo "**** Zabbix related PHP configuration file not found"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
ZBX_HISTORYSTORAGETYPES=${ZBX_HISTORYSTORAGETYPES:-"[]"}
|
||||||
|
|
||||||
# Escaping characters in parameter value
|
# Escaping characters in parameter value
|
||||||
server_name=$(escape_spec_char "${ZBX_SERVER_NAME}")
|
server_name=$(escape_spec_char "${ZBX_SERVER_NAME}")
|
||||||
server_user=$(escape_spec_char "${DB_SERVER_ZBX_USER}")
|
server_user=$(escape_spec_char "${DB_SERVER_ZBX_USER}")
|
||||||
|
@ -12,7 +12,7 @@ ARG BUILD_DATE
|
|||||||
ARG VCS_REF
|
ARG VCS_REF
|
||||||
|
|
||||||
ARG MAJOR_VERSION=3.4
|
ARG MAJOR_VERSION=3.4
|
||||||
ARG RELEASE=9
|
ARG RELEASE=10
|
||||||
ARG ZBX_VERSION=${MAJOR_VERSION}.${RELEASE}
|
ARG ZBX_VERSION=${MAJOR_VERSION}.${RELEASE}
|
||||||
|
|
||||||
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
||||||
|
@ -838,6 +838,8 @@ prepare_zbx_web_config() {
|
|||||||
echo "**** Zabbix related PHP configuration file not found"
|
echo "**** Zabbix related PHP configuration file not found"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
ZBX_HISTORYSTORAGETYPES=${ZBX_HISTORYSTORAGETYPES:-"[]"}
|
||||||
|
|
||||||
# Escaping characters in parameter value
|
# Escaping characters in parameter value
|
||||||
server_name=$(escape_spec_char "${ZBX_SERVER_NAME}")
|
server_name=$(escape_spec_char "${ZBX_SERVER_NAME}")
|
||||||
server_user=$(escape_spec_char "${DB_SERVER_ZBX_USER}")
|
server_user=$(escape_spec_char "${DB_SERVER_ZBX_USER}")
|
||||||
|
@ -4,7 +4,7 @@ ARG APT_FLAGS_COMMON="-y"
|
|||||||
ARG APT_FLAGS_DEV="${APT_FLAGS_COMMON} --no-install-recommends"
|
ARG APT_FLAGS_DEV="${APT_FLAGS_COMMON} --no-install-recommends"
|
||||||
|
|
||||||
ARG MAJOR_VERSION=3.4
|
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}/
|
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
||||||
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
|
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
|
||||||
LANG=en_US.UTF-8 LANGUAGE=en_US:en LC_ALL=en_US.UTF-8 DEBIAN_FRONTEND=noninteractive TERM=xterm \
|
LANG=en_US.UTF-8 LANGUAGE=en_US:en LC_ALL=en_US.UTF-8 DEBIAN_FRONTEND=noninteractive TERM=xterm \
|
||||||
@ -90,7 +90,7 @@ ARG VCS_REF
|
|||||||
ARG APT_FLAGS_COMMON="-y"
|
ARG APT_FLAGS_COMMON="-y"
|
||||||
ARG APT_FLAGS_PERSISTENT="${APT_FLAGS_COMMON} --no-install-recommends"
|
ARG APT_FLAGS_PERSISTENT="${APT_FLAGS_COMMON} --no-install-recommends"
|
||||||
ARG MAJOR_VERSION=3.4
|
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}/
|
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
||||||
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
|
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
|
||||||
LANG=en_US.UTF-8 LANGUAGE=en_US:en LC_ALL=en_US.UTF-8 DEBIAN_FRONTEND=noninteractive TERM=xterm \
|
LANG=en_US.UTF-8 LANGUAGE=en_US:en LC_ALL=en_US.UTF-8 DEBIAN_FRONTEND=noninteractive TERM=xterm \
|
||||||
|
@ -838,6 +838,8 @@ prepare_zbx_web_config() {
|
|||||||
echo "**** Zabbix related PHP configuration file not found"
|
echo "**** Zabbix related PHP configuration file not found"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
ZBX_HISTORYSTORAGETYPES=${ZBX_HISTORYSTORAGETYPES:-"[]"}
|
||||||
|
|
||||||
# Escaping characters in parameter value
|
# Escaping characters in parameter value
|
||||||
server_name=$(escape_spec_char "${ZBX_SERVER_NAME}")
|
server_name=$(escape_spec_char "${ZBX_SERVER_NAME}")
|
||||||
server_user=$(escape_spec_char "${DB_SERVER_ZBX_USER}")
|
server_user=$(escape_spec_char "${DB_SERVER_ZBX_USER}")
|
||||||
|
Reference in New Issue
Block a user