mirror of
https://github.com/zabbix/zabbix-docker.git
synced 2025-08-09 16:45:05 +02:00
Removed supervisord from single application images
This commit is contained in:
root
@ -7,9 +7,10 @@ ARG VCS_REF
|
||||
ARG YUM_FLAGS_COMMON="--quiet -y"
|
||||
ARG YUM_FLAGS_PERSISTANT="${YUM_FLAGS_COMMON}"
|
||||
ARG YUM_FLAGS_DEV="${YUM_FLAGS_COMMON}"
|
||||
ENV TERM=xterm
|
||||
ENV TERM=xterm \
|
||||
ZBX_TYPE=java-gateway ZBX_DB_TYPE=none ZBX_OPT_TYPE=none
|
||||
|
||||
LABEL org.label-schema.name="zabbix-java-gateway-centos" \
|
||||
LABEL org.label-schema.name="zabbix-${ZBX_TYPE}-centos" \
|
||||
org.label-schema.vendor="Zabbix LLC" \
|
||||
org.label-schema.url="https://zabbix.com/" \
|
||||
org.label-schema.description="Zabbix Java Gateway performs native support for monitoring JMX applications" \
|
||||
@ -28,10 +29,8 @@ RUN groupadd --system zabbix && \
|
||||
mkdir -p /etc/zabbix/ && \
|
||||
chown --quiet -R zabbix:root /etc/zabbix && \
|
||||
yum ${YUM_FLAGS_COMMON} makecache && \
|
||||
yum ${YUM_FLAGS_DEV} install epel-release && \
|
||||
yum ${YUM_FLAGS_PERSISTANT} install \
|
||||
java-1.8.0-openjdk-headless \
|
||||
supervisor && \
|
||||
java-1.8.0-openjdk-headless && \
|
||||
yum ${YUM_FLAGS_PERSISTANT} clean all && \
|
||||
rm -rf /var/cache/yum/
|
||||
|
||||
@ -43,7 +42,7 @@ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
|
||||
LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \
|
||||
org.label-schema.version="${ZBX_VERSION}" \
|
||||
org.label-schema.vcs-url="${ZBX_SOURCES}" \
|
||||
org.label-schema.docker.cmd="docker run --name zabbix-java-gateway --link zabbix-server:zabbix-server -p 10052:10052 -d zabbix-java-gateway:centos-${ZBX_VERSION}"
|
||||
org.label-schema.docker.cmd="docker run --name zabbix-${ZBX_TYPE} --link zabbix-server:zabbix-server -p 10052:10052 -d zabbix-${ZBX_TYPE}:centos-${ZBX_VERSION}"
|
||||
|
||||
RUN yum --quiet makecache && \
|
||||
yum ${YUM_FLAGS_DEV} install \
|
||||
@ -87,11 +86,8 @@ EXPOSE 10052/TCP
|
||||
|
||||
WORKDIR /var/lib/zabbix
|
||||
|
||||
COPY ["conf/etc/supervisor/", "/etc/supervisor/"]
|
||||
COPY ["conf/etc/zabbix/zabbix_java_gateway_logback.xml", "/etc/zabbix/"]
|
||||
COPY ["conf/usr/sbin/zabbix_java_gateway", "/usr/sbin/"]
|
||||
COPY ["docker-entrypoint.sh", "/usr/bin/"]
|
||||
|
||||
ENTRYPOINT ["docker-entrypoint.sh"]
|
||||
|
||||
CMD ["java-gateway", "none"]
|
||||
|
||||
@ -1,17 +0,0 @@
|
||||
[supervisord]
|
||||
nodaemon = true
|
||||
|
||||
[program:zabbix_java_gateway]
|
||||
command = /bin/bash /usr/sbin/%(program_name)s
|
||||
user = zabbix
|
||||
auto_start = true
|
||||
autorestart = true
|
||||
|
||||
startsecs=3
|
||||
startretries=3
|
||||
stopsignal=INT
|
||||
stopwaitsecs=2
|
||||
|
||||
redirect_stderr=true
|
||||
stdout_logfile = /dev/stdout
|
||||
stdout_logfile_maxbytes = 0
|
||||
@ -1,35 +0,0 @@
|
||||
; supervisor config file
|
||||
|
||||
[unix_http_server]
|
||||
file = /var/run/supervisor.sock ; (the path to the socket file)
|
||||
chmod = 0700 ; sockef file mode (default 0700)
|
||||
username = zbx
|
||||
password = password
|
||||
|
||||
[supervisord]
|
||||
logfile = /dev/stdout ; (main log file;default $CWD/supervisord.log)
|
||||
pidfile = /var/run/supervisord.pid ; (supervisord pidfile;default supervisord.pid)
|
||||
childlogdir = /tmp ; ('AUTO' child log dir, default $TEMP)
|
||||
critical = critical
|
||||
user = root
|
||||
logfile_maxbytes = 0
|
||||
logfile_backupcount = 0
|
||||
loglevel = info
|
||||
|
||||
; the below section must remain in the config file for RPC
|
||||
; (supervisorctl/web interface) to work, additional interfaces may be
|
||||
; added by defining them in separate rpcinterface: sections
|
||||
[rpcinterface:supervisor]
|
||||
supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
|
||||
|
||||
[supervisorctl]
|
||||
serverurl = unix:///var/run/supervisor.sock ; use a unix:// URL for a unix socket
|
||||
|
||||
; The [include] section can just contain the "files" setting. This
|
||||
; setting can list multiple files (separated by whitespace or
|
||||
; newlines). It can also contain wildcards. The filenames are
|
||||
; interpreted as relative to this file. Included files *cannot*
|
||||
; include files themselves.
|
||||
|
||||
[include]
|
||||
files = /etc/supervisor/conf.d/*.conf
|
||||
@ -11,13 +11,13 @@ fi
|
||||
|
||||
# Type of Zabbix component
|
||||
# Possible values: [server, proxy, agent, web, dev]
|
||||
zbx_type="$1"
|
||||
zbx_type=${ZBX_TYPE}
|
||||
# Type of Zabbix database
|
||||
# Possible values: [mysql, postgresql]
|
||||
zbx_db_type="$2"
|
||||
zbx_db_type=${ZBX_DB_TYPE}
|
||||
# Type of web-server. Valid only with zbx_type = web
|
||||
# Possible values: [apache, nginx]
|
||||
zbx_opt_type="$3"
|
||||
zbx_opt_type=${ZBX_OPT_TYPE}
|
||||
|
||||
# Default Zabbix installation name
|
||||
# Used only by Zabbix web-interface
|
||||
@ -884,8 +884,8 @@ else
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [ -n "$zbx_db_type" ]; then
|
||||
if [ -n "$zbx_opt_type" ]; then
|
||||
if [ "$zbx_db_type" != "none" ]; then
|
||||
if [ "$zbx_opt_type" != "none" ]; then
|
||||
echo "** Deploying Zabbix $zbx_type ($zbx_opt_type) with $zbx_db_type database"
|
||||
else
|
||||
echo "** Deploying Zabbix $zbx_type with $zbx_db_type database"
|
||||
@ -906,7 +906,7 @@ prepare_system "$zbx_type" "$zbx_opt_type"
|
||||
[ "$zbx_type" == "frontend" ] && prepare_web $zbx_opt_type $zbx_db_type
|
||||
[ "${ZBX_ADD_WEB}" == "true" ] && prepare_web ${ZBX_WEB_SERVER} ${ZBX_MAIN_DB}
|
||||
|
||||
[ "$zbx_type" == "agentd" ] && prepare_agent
|
||||
[ "$zbx_type" == "agent" ] && prepare_agent
|
||||
[ "${ZBX_ADD_AGENT}" == "true" ] && prepare_agent
|
||||
|
||||
[ "$zbx_type" == "java-gateway" ] && prepare_java_gateway
|
||||
@ -916,7 +916,37 @@ clear_deploy "$zbx_type"
|
||||
|
||||
echo "########################################################"
|
||||
|
||||
echo "** Executing supervisord"
|
||||
exec /usr/bin/supervisord -c /etc/supervisor/supervisord.conf
|
||||
if [ "$1" != "" ]; then
|
||||
echo "** Executing '$@'"
|
||||
exec "$@"
|
||||
elif [ "$zbx_type" == "agent" ]; then
|
||||
echo "** Starting Zabbix agent"
|
||||
exec su zabbix -s "/bin/bash" -c "/usr/sbin/zabbix_agentd --foreground -c /etc/zabbix/zabbix_agentd.conf"
|
||||
elif [ "$zbx_type" == "proxy" ]; then
|
||||
echo "** Starting Zabbix proxy"
|
||||
exec su zabbix -s "/bin/bash" -c "/usr/sbin/zabbix_proxy --foreground -c /etc/zabbix/zabbix_proxy.conf"
|
||||
elif [ "$zbx_type" == "server" ]; then
|
||||
echo "** Starting Zabbix server"
|
||||
exec su zabbix -s "/bin/bash" -c "/usr/sbin/zabbix_server --foreground -c /etc/zabbix/zabbix_server.conf"
|
||||
elif [ "$zbx_type" == "java-gateway" ]; then
|
||||
echo "** Starting Zabbix Java Gateway"
|
||||
exec su zabbix -s "/bin/bash" -c "/usr/sbin/zabbix_java_gateway"
|
||||
elif [ "$zbx_type" == "frontend" ] && [ "$zbx_opt_type" == "apache" ]; then
|
||||
echo "** Starting Zabbix frontend"
|
||||
if [ -f "/usr/sbin/httpd" ]; then
|
||||
exec /usr/sbin/httpd -D FOREGROUND
|
||||
elif [ -f "/usr/sbin/apache2ctl" ]; then
|
||||
exec source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND
|
||||
else
|
||||
echo "Unknown Web-server. Exiting..."
|
||||
exit 1
|
||||
fi
|
||||
elif [ -f "/usr/bin/supervisord" ]; then
|
||||
echo "** Executing supervisord"
|
||||
exec /usr/bin/supervisord -c /etc/supervisor/supervisord.conf
|
||||
else
|
||||
echo "Unknown instructions. Exiting..."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
#################################################
|
||||
|
||||
Reference in New Issue
Block a user