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

Allow to start Zabbix processes under root and other users

Browse Source
This commit is contained in:
Alexey Pustovalov 2019-10-03 20:52:14 +03:00
parent 7fb5abe44f
commit 7b5b22da8f
13 changed files with 46 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
agent/alpine/Dockerfile
View File

@ -10,9 +10,10 @@ LABEL org.opencontainers.image.title="Zabbix agent" \
STOPSIGNAL SIGTERM STOPSIGNAL SIGTERM
RUN set -eux && \ RUN set -eux && \
addgroup zabbix && \ addgroup -S -g 1000 zabbix && \
adduser -S \ adduser -S \
-D -G zabbix \ -D -G zabbix \
-u 999 \
-h /var/lib/zabbix/ \ -h /var/lib/zabbix/ \
zabbix && \ zabbix && \
mkdir -p /etc/zabbix && \ mkdir -p /etc/zabbix && \

7
agent/alpine/docker-entrypoint.sh
View File

@ -104,7 +104,6 @@ update_config_multiple_var() {
prepare_zbx_agent_config() { prepare_zbx_agent_config() {
echo "** Preparing Zabbix agent configuration file" echo "** Preparing Zabbix agent configuration file"
ZBX_AGENT_CONFIG=$ZABBIX_ETC_DIR/zabbix_agentd.conf ZBX_AGENT_CONFIG=$ZABBIX_ETC_DIR/zabbix_agentd.conf
: ${ZBX_PASSIVESERVERS:=""} : ${ZBX_PASSIVESERVERS:=""}
@ -172,6 +171,12 @@ prepare_zbx_agent_config() {
update_config_var $ZBX_AGENT_CONFIG "TLSKeyFile" "${ZBX_TLSKEYFILE}" update_config_var $ZBX_AGENT_CONFIG "TLSKeyFile" "${ZBX_TLSKEYFILE}"
update_config_var $ZBX_AGENT_CONFIG "TLSPSKIdentity" "${ZBX_TLSPSKIDENTITY}" update_config_var $ZBX_AGENT_CONFIG "TLSPSKIdentity" "${ZBX_TLSPSKIDENTITY}"
update_config_var $ZBX_AGENT_CONFIG "TLSPSKFile" "${ZBX_TLSPSKFILE}" update_config_var $ZBX_AGENT_CONFIG "TLSPSKFile" "${ZBX_TLSPSKFILE}"
if [ "$(id -u)" != '0' ]; then
update_config_var $ZBX_AGENT_CONFIG "User" "$(whoami)"
else
update_config_var $ZBX_AGENT_CONFIG "AllowRoot" "1"
fi
} }
prepare_agent() { prepare_agent() {

3
java-gateway/alpine/Dockerfile
View File

@ -10,9 +10,10 @@ LABEL org.opencontainers.image.title="Zabbix Java Gateway" \
STOPSIGNAL SIGTERM STOPSIGNAL SIGTERM
RUN set -eux && \ RUN set -eux && \
addgroup zabbix && \ addgroup -S -g 1000 zabbix && \
adduser -S \ adduser -S \
-D -G zabbix \ -D -G zabbix \
-u 999 \
-h /var/lib/zabbix/ \ -h /var/lib/zabbix/ \
zabbix && \ zabbix && \
mkdir -p /etc/zabbix/ && \ mkdir -p /etc/zabbix/ && \

3
proxy-mysql/alpine/Dockerfile
View File

@ -10,9 +10,10 @@ LABEL org.opencontainers.image.title="Zabbix proxy (MySQL)" \
STOPSIGNAL SIGTERM STOPSIGNAL SIGTERM
RUN set -eux && \ RUN set -eux && \
addgroup zabbix && \ addgroup -S -g 1000 zabbix && \
adduser -S \ adduser -S \
-D -G zabbix \ -D -G zabbix \
-u 999 \
-h /var/lib/zabbix/ \ -h /var/lib/zabbix/ \
zabbix && \ zabbix && \
mkdir -p /etc/zabbix && \ mkdir -p /etc/zabbix && \

6
proxy-mysql/alpine/docker-entrypoint.sh
View File

@ -375,6 +375,12 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "TLSPSKIdentity" "${ZBX_TLSPSKIDENTITY}" update_config_var $ZBX_CONFIG "TLSPSKIdentity" "${ZBX_TLSPSKIDENTITY}"
update_config_var $ZBX_CONFIG "TLSPSKFile" "${ZBX_TLSPSKFILE}" update_config_var $ZBX_CONFIG "TLSPSKFile" "${ZBX_TLSPSKFILE}"
if [ "$(id -u)" != '0' ]; then
update_config_var $ZBX_CONFIG "User" "$(whoami)"
else
update_config_var $ZBX_CONFIG "AllowRoot" "1"
fi
} }
prepare_proxy() { prepare_proxy() {

3
proxy-sqlite3/alpine/Dockerfile
View File

@ -10,9 +10,10 @@ LABEL org.opencontainers.image.title="Zabbix proxy (SQLite3)" \
STOPSIGNAL SIGTERM STOPSIGNAL SIGTERM
RUN set -eux && \ RUN set -eux && \
addgroup zabbix && \ addgroup -S -g 1000 zabbix && \
adduser -S \ adduser -S \
-D -G zabbix \ -D -G zabbix \
-u 999 \
-h /var/lib/zabbix/ \ -h /var/lib/zabbix/ \
zabbix && \ zabbix && \
mkdir -p /etc/zabbix && \ mkdir -p /etc/zabbix && \

6
proxy-sqlite3/alpine/docker-entrypoint.sh
View File

@ -225,6 +225,12 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "TLSPSKIdentity" "${ZBX_TLSPSKIDENTITY}" update_config_var $ZBX_CONFIG "TLSPSKIdentity" "${ZBX_TLSPSKIDENTITY}"
update_config_var $ZBX_CONFIG "TLSPSKFile" "${ZBX_TLSPSKFILE}" update_config_var $ZBX_CONFIG "TLSPSKFile" "${ZBX_TLSPSKFILE}"
if [ "$(id -u)" != '0' ]; then
update_config_var $ZBX_CONFIG "User" "$(whoami)"
else
update_config_var $ZBX_CONFIG "AllowRoot" "1"
fi
} }
prepare_proxy() { prepare_proxy() {

3
server-mysql/alpine/Dockerfile
View File

@ -10,9 +10,10 @@ LABEL org.opencontainers.image.title="Zabbix server (MySQL)" \
STOPSIGNAL SIGTERM STOPSIGNAL SIGTERM
RUN set -eux && \ RUN set -eux && \
addgroup zabbix && \ addgroup -S -g 1000 zabbix && \
adduser -S \ adduser -S \
-D -G zabbix \ -D -G zabbix \
-u 999 \
-h /var/lib/zabbix/ \ -h /var/lib/zabbix/ \
zabbix && \ zabbix && \
adduser zabbix dialout && \ adduser zabbix dialout && \

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

@ -417,6 +417,12 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "TLSCertFile" "${ZBX_TLSCERTFILE}" update_config_var $ZBX_CONFIG "TLSCertFile" "${ZBX_TLSCERTFILE}"
update_config_var $ZBX_CONFIG "TLSKeyFile" "${ZBX_TLSKEYFILE}" update_config_var $ZBX_CONFIG "TLSKeyFile" "${ZBX_TLSKEYFILE}"
if [ "$(id -u)" != '0' ]; then
update_config_var $ZBX_CONFIG "User" "$(whoami)"
else
update_config_var $ZBX_CONFIG "AllowRoot" "1"
fi
} }
prepare_server() { prepare_server() {

3
server-pgsql/alpine/Dockerfile
View File

@ -10,9 +10,10 @@ LABEL org.opencontainers.image.title="Zabbix server (PostgreSQL)" \
STOPSIGNAL SIGTERM STOPSIGNAL SIGTERM
RUN set -eux && \ RUN set -eux && \
addgroup zabbix && \ addgroup -S -g 1000 zabbix && \
adduser -S \ adduser -S \
-D -G zabbix \ -D -G zabbix \
-u 999 \
-h /var/lib/zabbix/ \ -h /var/lib/zabbix/ \
zabbix && \ zabbix && \
adduser zabbix dialout && \ adduser zabbix dialout && \

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

@ -384,6 +384,12 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "TLSCertFile" "${ZBX_TLSCERTFILE}" update_config_var $ZBX_CONFIG "TLSCertFile" "${ZBX_TLSCERTFILE}"
update_config_var $ZBX_CONFIG "TLSKeyFile" "${ZBX_TLSKEYFILE}" update_config_var $ZBX_CONFIG "TLSKeyFile" "${ZBX_TLSKEYFILE}"
if [ "$(id -u)" != '0' ]; then
update_config_var $ZBX_CONFIG "User" "$(whoami)"
else
update_config_var $ZBX_CONFIG "AllowRoot" "1"
fi
} }
prepare_server() { prepare_server() {

3
web-apache-mysql/alpine/Dockerfile
View File

@ -10,9 +10,10 @@ LABEL org.opencontainers.image.title="Zabbix web-interface (Apache, MySQL)" \
STOPSIGNAL SIGTERM STOPSIGNAL SIGTERM
RUN set -eux && \ RUN set -eux && \
addgroup zabbix && \ addgroup -S -g 1000 zabbix && \
adduser -S \ adduser -S \
-D -G zabbix \ -D -G zabbix \
-u 999 \
-h /var/lib/zabbix/ \ -h /var/lib/zabbix/ \
-H \ -H \
zabbix && \ zabbix && \

3
web-apache-pgsql/alpine/Dockerfile
View File

@ -10,9 +10,10 @@ LABEL org.opencontainers.image.title="Zabbix web-interface (Apache, PostgreSQL)"
STOPSIGNAL SIGTERM STOPSIGNAL SIGTERM
RUN set -eux && \ RUN set -eux && \
addgroup zabbix && \ addgroup -S -g 1000 zabbix && \
adduser -S \ adduser -S \
-D -G zabbix \ -D -G zabbix \
-u 999 \
-h /var/lib/zabbix/ \ -h /var/lib/zabbix/ \
-H \ -H \
zabbix && \ zabbix && \