mirror of
https://github.com/zabbix/zabbix-docker.git
synced 2025-08-10 00:47:51 +02:00
Merge pull request #238 from zabbix/master
Removed supervisord from single application images
This commit is contained in:
Alexey Pustovalov
GitHub
@ -7,9 +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"
|
||||
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=java-gateway ZBX_DB_TYPE=none ZBX_OPT_TYPE=none
|
||||
|
||||
LABEL org.label-schema.name="zabbix-java-gateway-ubuntu" \
|
||||
LABEL org.label-schema.name="zabbix-${ZBX_TYPE}-ubuntu" \
|
||||
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" \
|
||||
@ -33,7 +34,6 @@ RUN locale-gen $LC_ALL && \
|
||||
chown --quiet -R zabbix:root /etc/zabbix && \
|
||||
apt-get ${APT_FLAGS_COMMON} update && \
|
||||
apt-get ${APT_FLAGS_PERSISTANT} install \
|
||||
supervisor \
|
||||
openjdk-7-jre-headless 1>/dev/null && \
|
||||
apt-get ${APT_FLAGS_COMMON} autoremove && \
|
||||
apt-get ${APT_FLAGS_COMMON} clean && \
|
||||
@ -47,7 +47,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:ubuntu-${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}:ubuntu-${ZBX_VERSION}"
|
||||
|
||||
RUN apt-get ${APT_FLAGS_COMMON} update && \
|
||||
apt-get ${APT_FLAGS_DEV} install \
|
||||
@ -98,11 +98,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"]
|
||||
|
||||
@ -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
|
||||
@ -872,8 +872,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"
|
||||
@ -894,7 +894,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
|
||||
@ -904,7 +904,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