Removed supervisord from single application images

2025-08-09 08:35:05 +02:00 · 2018-02-22 12:31:38 -08:00
parent d9ffdc0937 6a382c3f34
commit 2dbef36163
108 changed files with 1416 additions and 1766 deletions
--- a/web-apache-mysql/ubuntu/Dockerfile
+++ b/web-apache-mysql/ubuntu/Dockerfile
@ -7,10 +7,10 @@ ARG VCS_REF
 ARG APT_FLAGS_COMMON="-qq -y"
 ARG APT_FLAGS_PERSISTANT="${APT_FLAGS_COMMON} --no-install-recommends"
 ARG APT_FLAGS_DEV="${APT_FLAGS_COMMON} --no-install-recommends"
-ARG DB_TYPE=mysql
-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=frontend ZBX_DB_TYPE=mysql ZBX_OPT_TYPE=apache

-LABEL org.label-schema.name="zabbix-web-apache-${DB_TYPE}-ubuntu" \
+LABEL org.label-schema.name="zabbix-web-${ZBX_OPT_TYPE}-${DB_TYPE}-ubuntu" \
      org.label-schema.vendor="Zabbix LLC" \
      org.label-schema.url="https://zabbix.com/" \
      org.label-schema.description="Zabbix web-interface based on Apache2 web server with MySQL database support" \
@ -42,7 +42,6 @@ RUN locale-gen $LC_ALL && \
            php5-json \
            php5-ldap \
            php5-mysql \
-            supervisor \
            ttf-dejavu-core 1>/dev/null && \
    apt-get ${APT_FLAGS_COMMON} autoremove && \
    apt-get ${APT_FLAGS_COMMON} clean && \
@ -51,12 +50,12 @@ RUN locale-gen $LC_ALL && \
 ARG MAJOR_VERSION=4.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/
-ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE}
+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-web-apache-${DB_TYPE} --link mysql-server:mysql --link zabbix-server:zabbix-server -p 80:80 -d zabbix-web-apache-${DB_TYPE}:ubuntu-${ZBX_VERSION}"
+      org.label-schema.docker.cmd="docker run --name zabbix-web-${ZBX_OPT_TYPE}-${ZBX_DB_TYPE} --link mysql-server:mysql --link zabbix-server:zabbix-server -p 80:80 -d zabbix-web-${ZBX_OPT_TYPE}-${ZBX_DB_TYPE}:ubuntu-${ZBX_VERSION}"

 COPY ["conf/tmp/font-config", "/tmp/font-config"]

@ -99,7 +98,6 @@ WORKDIR /usr/share/zabbix

 VOLUME ["/etc/ssl/apache2"]

-COPY ["conf/etc/supervisor/", "/etc/supervisor/"]
 COPY ["conf/etc/zabbix/apache.conf", "/etc/zabbix/"]
 COPY ["conf/etc/zabbix/apache_ssl.conf", "/etc/zabbix/"]
 COPY ["conf/etc/zabbix/web/zabbix.conf.php", "/etc/zabbix/web/"]
@ -107,5 +105,3 @@ COPY ["conf/etc/php5/apache2/conf.d/99-zabbix.ini", "/etc/php5/apache2/conf.d/"]
 COPY ["docker-entrypoint.sh", "/usr/bin/"]

 ENTRYPOINT ["docker-entrypoint.sh"]
-
-CMD ["frontend", "mysql", "apache"]
--- a/web-apache-mysql/ubuntu/conf/etc/supervisor/conf.d/supervisord_zabbix.conf
+++ b/web-apache-mysql/ubuntu/conf/etc/supervisor/conf.d/supervisord_zabbix.conf
@ -1,16 +0,0 @@
-[supervisord]
-nodaemon = true
-
-[program:apache2]
-command = /bin/bash -c "source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND"
-auto_start = true
-autorestart = true
-
-startsecs=2
-startretries=3
-stopsignal=TERM
-stopwaitsecs=2
-
-redirect_stderr=true
-stdout_logfile = /dev/stdout
-stdout_logfile_maxbytes = 0
--- a/web-apache-mysql/ubuntu/conf/etc/supervisor/supervisord.conf
+++ b/web-apache-mysql/ubuntu/conf/etc/supervisor/supervisord.conf
@ -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
--- a/web-apache-mysql/ubuntu/docker-entrypoint.sh
+++ b/web-apache-mysql/ubuntu/docker-entrypoint.sh
@ -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

 #################################################