mirror of
https://github.com/zabbix/zabbix-docker.git
synced 2025-01-22 05:18:37 +01:00
Fixed docker entrypoint command execution
This commit is contained in:
parent
df44f84b89
commit
7fb5abe44f
@ -181,11 +181,14 @@ prepare_agent() {
|
|||||||
|
|
||||||
#################################################
|
#################################################
|
||||||
|
|
||||||
prepare_agent
|
if [ "${1#-}" != "$1" ]; then
|
||||||
|
set -- /usr/sbin/zabbix_agentd "$@"
|
||||||
|
fi
|
||||||
|
|
||||||
echo "########################################################"
|
if [ "$1" == '/usr/sbin/zabbix_agentd' ]; then
|
||||||
|
prepare_agent
|
||||||
|
fi
|
||||||
|
|
||||||
echo "** Executing '$@'"
|
|
||||||
exec "$@"
|
exec "$@"
|
||||||
|
|
||||||
#################################################
|
#################################################
|
||||||
|
@ -117,11 +117,11 @@ prepare_java_gateway() {
|
|||||||
|
|
||||||
#################################################
|
#################################################
|
||||||
|
|
||||||
prepare_java_gateway
|
if [ "$1" == '/usr/sbin/zabbix_java_gateway' ]; then
|
||||||
|
prepare_java_gateway
|
||||||
|
fi
|
||||||
|
|
||||||
echo "########################################################"
|
|
||||||
|
|
||||||
echo "** Executing '$@'"
|
|
||||||
exec "$@"
|
exec "$@"
|
||||||
|
|
||||||
|
|
||||||
#################################################
|
#################################################
|
||||||
|
@ -391,11 +391,14 @@ prepare_proxy() {
|
|||||||
|
|
||||||
#################################################
|
#################################################
|
||||||
|
|
||||||
prepare_proxy
|
if [ "${1#-}" != "$1" ]; then
|
||||||
|
set -- /usr/sbin/zabbix_proxy "$@"
|
||||||
|
fi
|
||||||
|
|
||||||
echo "########################################################"
|
if [ "$1" == '/usr/sbin/zabbix_proxy' ]; then
|
||||||
|
prepare_proxy
|
||||||
|
fi
|
||||||
|
|
||||||
echo "** Executing '$@'"
|
|
||||||
exec "$@"
|
exec "$@"
|
||||||
|
|
||||||
#################################################
|
#################################################
|
||||||
|
@ -237,11 +237,14 @@ prepare_proxy() {
|
|||||||
|
|
||||||
#################################################
|
#################################################
|
||||||
|
|
||||||
prepare_proxy
|
if [ "${1#-}" != "$1" ]; then
|
||||||
|
set -- /usr/sbin/zabbix_proxy "$@"
|
||||||
|
fi
|
||||||
|
|
||||||
echo "########################################################"
|
if [ "$1" == '/usr/sbin/zabbix_proxy' ]; then
|
||||||
|
prepare_proxy
|
||||||
|
fi
|
||||||
|
|
||||||
echo "** Executing '$@'"
|
|
||||||
exec "$@"
|
exec "$@"
|
||||||
|
|
||||||
#################################################
|
#################################################
|
||||||
|
@ -433,11 +433,14 @@ prepare_server() {
|
|||||||
|
|
||||||
#################################################
|
#################################################
|
||||||
|
|
||||||
prepare_server
|
if [ "${1#-}" != "$1" ]; then
|
||||||
|
set -- /usr/sbin/zabbix_server "$@"
|
||||||
|
fi
|
||||||
|
|
||||||
echo "########################################################"
|
if [ "$1" == '/usr/sbin/zabbix_server' ]; then
|
||||||
|
prepare_server
|
||||||
|
fi
|
||||||
|
|
||||||
echo "** Executing '$@'"
|
|
||||||
exec "$@"
|
exec "$@"
|
||||||
|
|
||||||
#################################################
|
#################################################
|
||||||
|
@ -400,11 +400,14 @@ prepare_server() {
|
|||||||
|
|
||||||
#################################################
|
#################################################
|
||||||
|
|
||||||
prepare_server
|
if [ "${1#-}" != "$1" ]; then
|
||||||
|
set -- /usr/sbin/zabbix_server "$@"
|
||||||
|
fi
|
||||||
|
|
||||||
echo "########################################################"
|
if [ "$1" == '/usr/sbin/zabbix_server' ]; then
|
||||||
|
prepare_server
|
||||||
|
fi
|
||||||
|
|
||||||
echo "** Executing '$@'"
|
|
||||||
exec "$@"
|
exec "$@"
|
||||||
|
|
||||||
#################################################
|
#################################################
|
||||||
|
@ -267,11 +267,10 @@ prepare_web() {
|
|||||||
|
|
||||||
#################################################
|
#################################################
|
||||||
|
|
||||||
prepare_web
|
if [ "$1" == '/usr/sbin/httpd' ]; then
|
||||||
|
prepare_web
|
||||||
|
fi
|
||||||
|
|
||||||
echo "########################################################"
|
|
||||||
|
|
||||||
echo "** Executing '$@'"
|
|
||||||
exec "$@"
|
exec "$@"
|
||||||
|
|
||||||
#################################################
|
#################################################
|
||||||
|
@ -285,11 +285,10 @@ prepare_web() {
|
|||||||
|
|
||||||
#################################################
|
#################################################
|
||||||
|
|
||||||
prepare_web
|
if [ "$1" == '/usr/sbin/httpd' ]; then
|
||||||
|
prepare_web
|
||||||
|
fi
|
||||||
|
|
||||||
echo "########################################################"
|
|
||||||
|
|
||||||
echo "** Executing '$@'"
|
|
||||||
exec "$@"
|
exec "$@"
|
||||||
|
|
||||||
#################################################
|
#################################################
|
||||||
|
Loading…
Reference in New Issue
Block a user