mirror of
https://github.com/zabbix/zabbix-docker.git
synced 2025-08-09 16:45:05 +02:00
Using env variables for zabbix user home and configuration files directory
This commit is contained in:
@ -14,7 +14,9 @@ ARG ZBX_VERSION
|
||||
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
|
||||
|
||||
ENV TERM=xterm \
|
||||
ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
|
||||
ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
|
||||
ZABBIX_USER_HOME_DIR="/var/lib/zabbix" \
|
||||
ZABBIX_CONF_DIR="/etc/zabbix"
|
||||
|
||||
LABEL description="Zabbix Java Gateway performs native support for monitoring JMX applications" \
|
||||
maintainer="alexey.pustovalov@zabbix.com" \
|
||||
@ -73,21 +75,21 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
|
||||
-g zabbix \
|
||||
--uid 1997 \
|
||||
--shell /sbin/nologin \
|
||||
--home-dir /var/lib/zabbix/ \
|
||||
--home-dir ${ZABBIX_USER_HOME_DIR} \
|
||||
zabbix && \
|
||||
mkdir -p /etc/zabbix/ && \
|
||||
mkdir -p ${ZABBIX_CONF_DIR}/ && \
|
||||
mkdir -p /usr/sbin/zabbix_java/ && \
|
||||
mkdir -p /usr/sbin/zabbix_java/ext_lib/ && \
|
||||
rm -rf /usr/sbin/zabbix_java/lib/logback.xml && \
|
||||
mv /usr/sbin/zabbix_java/lib/logback-console.xml /etc/zabbix/zabbix_java_gateway_logback.xml && \
|
||||
chown --quiet -R zabbix:root /etc/zabbix/ /usr/sbin/zabbix_java/ && \
|
||||
chgrp -R 0 /etc/zabbix/ /usr/sbin/zabbix_java/ && \
|
||||
chmod -R g=u /etc/zabbix/ /usr/sbin/zabbix_java/ && \
|
||||
mv /usr/sbin/zabbix_java/lib/logback-console.xml ${ZABBIX_CONF_DIR}/zabbix_java_gateway_logback.xml && \
|
||||
chown --quiet -R zabbix:root ${ZABBIX_CONF_DIR}/ /usr/sbin/zabbix_java/ && \
|
||||
chgrp -R 0 ${ZABBIX_CONF_DIR}/ /usr/sbin/zabbix_java/ && \
|
||||
chmod -R g=u ${ZABBIX_CONF_DIR}/ /usr/sbin/zabbix_java/ && \
|
||||
microdnf -y clean all
|
||||
|
||||
EXPOSE 10052/TCP
|
||||
|
||||
WORKDIR /var/lib/zabbix
|
||||
WORKDIR ${ZABBIX_USER_HOME_DIR}
|
||||
|
||||
COPY ["conf/usr/sbin/zabbix_java_gateway", "/usr/sbin/"]
|
||||
COPY ["docker-entrypoint.sh", "/usr/bin/"]
|
||||
|
@ -2,7 +2,7 @@
|
||||
JAVA=${JAVA:-"/usr/bin/java"}
|
||||
|
||||
JAVA_OPTIONS="-server $JAVA_OPTIONS"
|
||||
JAVA_OPTIONS="$JAVA_OPTIONS -Dlogback.configurationFile=/etc/zabbix/zabbix_java_gateway_logback.xml"
|
||||
JAVA_OPTIONS="$JAVA_OPTIONS -Dlogback.configurationFile=$ZABBIX_CONF_DIR/zabbix_java_gateway_logback.xml"
|
||||
|
||||
cd /usr/sbin/zabbix_java
|
||||
|
||||
|
@ -9,14 +9,10 @@ if [ "${DEBUG_MODE,,}" == "true" ]; then
|
||||
set -o xtrace
|
||||
fi
|
||||
|
||||
# Default directories
|
||||
# Configuration files directory
|
||||
ZABBIX_ETC_DIR="/etc/zabbix"
|
||||
|
||||
prepare_java_gateway_config() {
|
||||
echo "** Preparing Zabbix Java Gateway log configuration file"
|
||||
|
||||
ZBX_GATEWAY_CONFIG=$ZABBIX_ETC_DIR/zabbix_java_gateway_logback.xml
|
||||
ZBX_GATEWAY_CONFIG=$ZABBIX_CONF_DIR/zabbix_java_gateway_logback.xml
|
||||
|
||||
: ${ZBX_DEBUGLEVEL:="info"}
|
||||
|
||||
|
Reference in New Issue
Block a user