From 6bde28aac3f85905b6e7f5cdcf91b0381034a45c Mon Sep 17 00:00:00 2001 From: root Date: Thu, 22 Feb 2018 14:37:03 -0800 Subject: [PATCH] Fix Apache on Ubuntu startup command --- agent/alpine/docker-entrypoint.sh | 2 +- agent/centos/docker-entrypoint.sh | 2 +- agent/ubuntu/docker-entrypoint.sh | 2 +- java-gateway/alpine/docker-entrypoint.sh | 2 +- java-gateway/centos/docker-entrypoint.sh | 2 +- java-gateway/ubuntu/docker-entrypoint.sh | 2 +- proxy-mysql/alpine/docker-entrypoint.sh | 2 +- proxy-mysql/centos/docker-entrypoint.sh | 2 +- proxy-mysql/ubuntu/docker-entrypoint.sh | 2 +- proxy-sqlite3/alpine/docker-entrypoint.sh | 2 +- proxy-sqlite3/centos/docker-entrypoint.sh | 2 +- proxy-sqlite3/ubuntu/docker-entrypoint.sh | 2 +- server-mysql/alpine/docker-entrypoint.sh | 2 +- server-mysql/centos/docker-entrypoint.sh | 2 +- server-mysql/ubuntu/docker-entrypoint.sh | 2 +- server-pgsql/alpine/docker-entrypoint.sh | 2 +- server-pgsql/centos/docker-entrypoint.sh | 2 +- server-pgsql/ubuntu/docker-entrypoint.sh | 2 +- web-apache-mysql/alpine/docker-entrypoint.sh | 2 +- web-apache-mysql/centos/docker-entrypoint.sh | 2 +- web-apache-mysql/ubuntu/docker-entrypoint.sh | 2 +- web-apache-pgsql/alpine/docker-entrypoint.sh | 2 +- web-apache-pgsql/centos/docker-entrypoint.sh | 2 +- web-apache-pgsql/ubuntu/docker-entrypoint.sh | 2 +- web-nginx-mysql/alpine/docker-entrypoint.sh | 2 +- web-nginx-mysql/centos/docker-entrypoint.sh | 2 +- web-nginx-mysql/ubuntu/docker-entrypoint.sh | 2 +- web-nginx-pgsql/alpine/docker-entrypoint.sh | 2 +- web-nginx-pgsql/centos/docker-entrypoint.sh | 2 +- web-nginx-pgsql/ubuntu/docker-entrypoint.sh | 2 +- 30 files changed, 30 insertions(+), 30 deletions(-) diff --git a/agent/alpine/docker-entrypoint.sh b/agent/alpine/docker-entrypoint.sh index 97cc4ae2c..6e11befc2 100755 --- a/agent/alpine/docker-entrypoint.sh +++ b/agent/alpine/docker-entrypoint.sh @@ -924,7 +924,7 @@ elif [ "$zbx_type" == "frontend" ] && [ "$zbx_opt_type" == "apache" ]; then 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 + exec /bin/bash -c "source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND" else echo "Unknown Web-server. Exiting..." exit 1 diff --git a/agent/centos/docker-entrypoint.sh b/agent/centos/docker-entrypoint.sh index 97cc4ae2c..6e11befc2 100755 --- a/agent/centos/docker-entrypoint.sh +++ b/agent/centos/docker-entrypoint.sh @@ -924,7 +924,7 @@ elif [ "$zbx_type" == "frontend" ] && [ "$zbx_opt_type" == "apache" ]; then 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 + exec /bin/bash -c "source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND" else echo "Unknown Web-server. Exiting..." exit 1 diff --git a/agent/ubuntu/docker-entrypoint.sh b/agent/ubuntu/docker-entrypoint.sh index 97cc4ae2c..6e11befc2 100755 --- a/agent/ubuntu/docker-entrypoint.sh +++ b/agent/ubuntu/docker-entrypoint.sh @@ -924,7 +924,7 @@ elif [ "$zbx_type" == "frontend" ] && [ "$zbx_opt_type" == "apache" ]; then 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 + exec /bin/bash -c "source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND" else echo "Unknown Web-server. Exiting..." exit 1 diff --git a/java-gateway/alpine/docker-entrypoint.sh b/java-gateway/alpine/docker-entrypoint.sh index 97cc4ae2c..6e11befc2 100755 --- a/java-gateway/alpine/docker-entrypoint.sh +++ b/java-gateway/alpine/docker-entrypoint.sh @@ -924,7 +924,7 @@ elif [ "$zbx_type" == "frontend" ] && [ "$zbx_opt_type" == "apache" ]; then 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 + exec /bin/bash -c "source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND" else echo "Unknown Web-server. Exiting..." exit 1 diff --git a/java-gateway/centos/docker-entrypoint.sh b/java-gateway/centos/docker-entrypoint.sh index 97cc4ae2c..6e11befc2 100755 --- a/java-gateway/centos/docker-entrypoint.sh +++ b/java-gateway/centos/docker-entrypoint.sh @@ -924,7 +924,7 @@ elif [ "$zbx_type" == "frontend" ] && [ "$zbx_opt_type" == "apache" ]; then 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 + exec /bin/bash -c "source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND" else echo "Unknown Web-server. Exiting..." exit 1 diff --git a/java-gateway/ubuntu/docker-entrypoint.sh b/java-gateway/ubuntu/docker-entrypoint.sh index 97cc4ae2c..6e11befc2 100755 --- a/java-gateway/ubuntu/docker-entrypoint.sh +++ b/java-gateway/ubuntu/docker-entrypoint.sh @@ -924,7 +924,7 @@ elif [ "$zbx_type" == "frontend" ] && [ "$zbx_opt_type" == "apache" ]; then 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 + exec /bin/bash -c "source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND" else echo "Unknown Web-server. Exiting..." exit 1 diff --git a/proxy-mysql/alpine/docker-entrypoint.sh b/proxy-mysql/alpine/docker-entrypoint.sh index 97cc4ae2c..6e11befc2 100755 --- a/proxy-mysql/alpine/docker-entrypoint.sh +++ b/proxy-mysql/alpine/docker-entrypoint.sh @@ -924,7 +924,7 @@ elif [ "$zbx_type" == "frontend" ] && [ "$zbx_opt_type" == "apache" ]; then 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 + exec /bin/bash -c "source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND" else echo "Unknown Web-server. Exiting..." exit 1 diff --git a/proxy-mysql/centos/docker-entrypoint.sh b/proxy-mysql/centos/docker-entrypoint.sh index 97cc4ae2c..6e11befc2 100755 --- a/proxy-mysql/centos/docker-entrypoint.sh +++ b/proxy-mysql/centos/docker-entrypoint.sh @@ -924,7 +924,7 @@ elif [ "$zbx_type" == "frontend" ] && [ "$zbx_opt_type" == "apache" ]; then 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 + exec /bin/bash -c "source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND" else echo "Unknown Web-server. Exiting..." exit 1 diff --git a/proxy-mysql/ubuntu/docker-entrypoint.sh b/proxy-mysql/ubuntu/docker-entrypoint.sh index 97cc4ae2c..6e11befc2 100755 --- a/proxy-mysql/ubuntu/docker-entrypoint.sh +++ b/proxy-mysql/ubuntu/docker-entrypoint.sh @@ -924,7 +924,7 @@ elif [ "$zbx_type" == "frontend" ] && [ "$zbx_opt_type" == "apache" ]; then 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 + exec /bin/bash -c "source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND" else echo "Unknown Web-server. Exiting..." exit 1 diff --git a/proxy-sqlite3/alpine/docker-entrypoint.sh b/proxy-sqlite3/alpine/docker-entrypoint.sh index 97cc4ae2c..6e11befc2 100755 --- a/proxy-sqlite3/alpine/docker-entrypoint.sh +++ b/proxy-sqlite3/alpine/docker-entrypoint.sh @@ -924,7 +924,7 @@ elif [ "$zbx_type" == "frontend" ] && [ "$zbx_opt_type" == "apache" ]; then 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 + exec /bin/bash -c "source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND" else echo "Unknown Web-server. Exiting..." exit 1 diff --git a/proxy-sqlite3/centos/docker-entrypoint.sh b/proxy-sqlite3/centos/docker-entrypoint.sh index 97cc4ae2c..6e11befc2 100755 --- a/proxy-sqlite3/centos/docker-entrypoint.sh +++ b/proxy-sqlite3/centos/docker-entrypoint.sh @@ -924,7 +924,7 @@ elif [ "$zbx_type" == "frontend" ] && [ "$zbx_opt_type" == "apache" ]; then 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 + exec /bin/bash -c "source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND" else echo "Unknown Web-server. Exiting..." exit 1 diff --git a/proxy-sqlite3/ubuntu/docker-entrypoint.sh b/proxy-sqlite3/ubuntu/docker-entrypoint.sh index 97cc4ae2c..6e11befc2 100755 --- a/proxy-sqlite3/ubuntu/docker-entrypoint.sh +++ b/proxy-sqlite3/ubuntu/docker-entrypoint.sh @@ -924,7 +924,7 @@ elif [ "$zbx_type" == "frontend" ] && [ "$zbx_opt_type" == "apache" ]; then 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 + exec /bin/bash -c "source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND" else echo "Unknown Web-server. Exiting..." exit 1 diff --git a/server-mysql/alpine/docker-entrypoint.sh b/server-mysql/alpine/docker-entrypoint.sh index 97cc4ae2c..6e11befc2 100755 --- a/server-mysql/alpine/docker-entrypoint.sh +++ b/server-mysql/alpine/docker-entrypoint.sh @@ -924,7 +924,7 @@ elif [ "$zbx_type" == "frontend" ] && [ "$zbx_opt_type" == "apache" ]; then 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 + exec /bin/bash -c "source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND" else echo "Unknown Web-server. Exiting..." exit 1 diff --git a/server-mysql/centos/docker-entrypoint.sh b/server-mysql/centos/docker-entrypoint.sh index 97cc4ae2c..6e11befc2 100755 --- a/server-mysql/centos/docker-entrypoint.sh +++ b/server-mysql/centos/docker-entrypoint.sh @@ -924,7 +924,7 @@ elif [ "$zbx_type" == "frontend" ] && [ "$zbx_opt_type" == "apache" ]; then 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 + exec /bin/bash -c "source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND" else echo "Unknown Web-server. Exiting..." exit 1 diff --git a/server-mysql/ubuntu/docker-entrypoint.sh b/server-mysql/ubuntu/docker-entrypoint.sh index 97cc4ae2c..6e11befc2 100755 --- a/server-mysql/ubuntu/docker-entrypoint.sh +++ b/server-mysql/ubuntu/docker-entrypoint.sh @@ -924,7 +924,7 @@ elif [ "$zbx_type" == "frontend" ] && [ "$zbx_opt_type" == "apache" ]; then 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 + exec /bin/bash -c "source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND" else echo "Unknown Web-server. Exiting..." exit 1 diff --git a/server-pgsql/alpine/docker-entrypoint.sh b/server-pgsql/alpine/docker-entrypoint.sh index 97cc4ae2c..6e11befc2 100755 --- a/server-pgsql/alpine/docker-entrypoint.sh +++ b/server-pgsql/alpine/docker-entrypoint.sh @@ -924,7 +924,7 @@ elif [ "$zbx_type" == "frontend" ] && [ "$zbx_opt_type" == "apache" ]; then 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 + exec /bin/bash -c "source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND" else echo "Unknown Web-server. Exiting..." exit 1 diff --git a/server-pgsql/centos/docker-entrypoint.sh b/server-pgsql/centos/docker-entrypoint.sh index 97cc4ae2c..6e11befc2 100755 --- a/server-pgsql/centos/docker-entrypoint.sh +++ b/server-pgsql/centos/docker-entrypoint.sh @@ -924,7 +924,7 @@ elif [ "$zbx_type" == "frontend" ] && [ "$zbx_opt_type" == "apache" ]; then 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 + exec /bin/bash -c "source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND" else echo "Unknown Web-server. Exiting..." exit 1 diff --git a/server-pgsql/ubuntu/docker-entrypoint.sh b/server-pgsql/ubuntu/docker-entrypoint.sh index 97cc4ae2c..6e11befc2 100755 --- a/server-pgsql/ubuntu/docker-entrypoint.sh +++ b/server-pgsql/ubuntu/docker-entrypoint.sh @@ -924,7 +924,7 @@ elif [ "$zbx_type" == "frontend" ] && [ "$zbx_opt_type" == "apache" ]; then 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 + exec /bin/bash -c "source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND" else echo "Unknown Web-server. Exiting..." exit 1 diff --git a/web-apache-mysql/alpine/docker-entrypoint.sh b/web-apache-mysql/alpine/docker-entrypoint.sh index 97cc4ae2c..6e11befc2 100755 --- a/web-apache-mysql/alpine/docker-entrypoint.sh +++ b/web-apache-mysql/alpine/docker-entrypoint.sh @@ -924,7 +924,7 @@ elif [ "$zbx_type" == "frontend" ] && [ "$zbx_opt_type" == "apache" ]; then 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 + exec /bin/bash -c "source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND" else echo "Unknown Web-server. Exiting..." exit 1 diff --git a/web-apache-mysql/centos/docker-entrypoint.sh b/web-apache-mysql/centos/docker-entrypoint.sh index 97cc4ae2c..6e11befc2 100755 --- a/web-apache-mysql/centos/docker-entrypoint.sh +++ b/web-apache-mysql/centos/docker-entrypoint.sh @@ -924,7 +924,7 @@ elif [ "$zbx_type" == "frontend" ] && [ "$zbx_opt_type" == "apache" ]; then 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 + exec /bin/bash -c "source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND" else echo "Unknown Web-server. Exiting..." exit 1 diff --git a/web-apache-mysql/ubuntu/docker-entrypoint.sh b/web-apache-mysql/ubuntu/docker-entrypoint.sh index 97cc4ae2c..6e11befc2 100755 --- a/web-apache-mysql/ubuntu/docker-entrypoint.sh +++ b/web-apache-mysql/ubuntu/docker-entrypoint.sh @@ -924,7 +924,7 @@ elif [ "$zbx_type" == "frontend" ] && [ "$zbx_opt_type" == "apache" ]; then 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 + exec /bin/bash -c "source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND" else echo "Unknown Web-server. Exiting..." exit 1 diff --git a/web-apache-pgsql/alpine/docker-entrypoint.sh b/web-apache-pgsql/alpine/docker-entrypoint.sh index 97cc4ae2c..6e11befc2 100755 --- a/web-apache-pgsql/alpine/docker-entrypoint.sh +++ b/web-apache-pgsql/alpine/docker-entrypoint.sh @@ -924,7 +924,7 @@ elif [ "$zbx_type" == "frontend" ] && [ "$zbx_opt_type" == "apache" ]; then 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 + exec /bin/bash -c "source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND" else echo "Unknown Web-server. Exiting..." exit 1 diff --git a/web-apache-pgsql/centos/docker-entrypoint.sh b/web-apache-pgsql/centos/docker-entrypoint.sh index 97cc4ae2c..6e11befc2 100755 --- a/web-apache-pgsql/centos/docker-entrypoint.sh +++ b/web-apache-pgsql/centos/docker-entrypoint.sh @@ -924,7 +924,7 @@ elif [ "$zbx_type" == "frontend" ] && [ "$zbx_opt_type" == "apache" ]; then 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 + exec /bin/bash -c "source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND" else echo "Unknown Web-server. Exiting..." exit 1 diff --git a/web-apache-pgsql/ubuntu/docker-entrypoint.sh b/web-apache-pgsql/ubuntu/docker-entrypoint.sh index 97cc4ae2c..6e11befc2 100755 --- a/web-apache-pgsql/ubuntu/docker-entrypoint.sh +++ b/web-apache-pgsql/ubuntu/docker-entrypoint.sh @@ -924,7 +924,7 @@ elif [ "$zbx_type" == "frontend" ] && [ "$zbx_opt_type" == "apache" ]; then 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 + exec /bin/bash -c "source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND" else echo "Unknown Web-server. Exiting..." exit 1 diff --git a/web-nginx-mysql/alpine/docker-entrypoint.sh b/web-nginx-mysql/alpine/docker-entrypoint.sh index 97cc4ae2c..6e11befc2 100755 --- a/web-nginx-mysql/alpine/docker-entrypoint.sh +++ b/web-nginx-mysql/alpine/docker-entrypoint.sh @@ -924,7 +924,7 @@ elif [ "$zbx_type" == "frontend" ] && [ "$zbx_opt_type" == "apache" ]; then 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 + exec /bin/bash -c "source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND" else echo "Unknown Web-server. Exiting..." exit 1 diff --git a/web-nginx-mysql/centos/docker-entrypoint.sh b/web-nginx-mysql/centos/docker-entrypoint.sh index 97cc4ae2c..6e11befc2 100755 --- a/web-nginx-mysql/centos/docker-entrypoint.sh +++ b/web-nginx-mysql/centos/docker-entrypoint.sh @@ -924,7 +924,7 @@ elif [ "$zbx_type" == "frontend" ] && [ "$zbx_opt_type" == "apache" ]; then 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 + exec /bin/bash -c "source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND" else echo "Unknown Web-server. Exiting..." exit 1 diff --git a/web-nginx-mysql/ubuntu/docker-entrypoint.sh b/web-nginx-mysql/ubuntu/docker-entrypoint.sh index 97cc4ae2c..6e11befc2 100755 --- a/web-nginx-mysql/ubuntu/docker-entrypoint.sh +++ b/web-nginx-mysql/ubuntu/docker-entrypoint.sh @@ -924,7 +924,7 @@ elif [ "$zbx_type" == "frontend" ] && [ "$zbx_opt_type" == "apache" ]; then 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 + exec /bin/bash -c "source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND" else echo "Unknown Web-server. Exiting..." exit 1 diff --git a/web-nginx-pgsql/alpine/docker-entrypoint.sh b/web-nginx-pgsql/alpine/docker-entrypoint.sh index 97cc4ae2c..6e11befc2 100755 --- a/web-nginx-pgsql/alpine/docker-entrypoint.sh +++ b/web-nginx-pgsql/alpine/docker-entrypoint.sh @@ -924,7 +924,7 @@ elif [ "$zbx_type" == "frontend" ] && [ "$zbx_opt_type" == "apache" ]; then 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 + exec /bin/bash -c "source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND" else echo "Unknown Web-server. Exiting..." exit 1 diff --git a/web-nginx-pgsql/centos/docker-entrypoint.sh b/web-nginx-pgsql/centos/docker-entrypoint.sh index 97cc4ae2c..6e11befc2 100755 --- a/web-nginx-pgsql/centos/docker-entrypoint.sh +++ b/web-nginx-pgsql/centos/docker-entrypoint.sh @@ -924,7 +924,7 @@ elif [ "$zbx_type" == "frontend" ] && [ "$zbx_opt_type" == "apache" ]; then 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 + exec /bin/bash -c "source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND" else echo "Unknown Web-server. Exiting..." exit 1 diff --git a/web-nginx-pgsql/ubuntu/docker-entrypoint.sh b/web-nginx-pgsql/ubuntu/docker-entrypoint.sh index 97cc4ae2c..6e11befc2 100755 --- a/web-nginx-pgsql/ubuntu/docker-entrypoint.sh +++ b/web-nginx-pgsql/ubuntu/docker-entrypoint.sh @@ -924,7 +924,7 @@ elif [ "$zbx_type" == "frontend" ] && [ "$zbx_opt_type" == "apache" ]; then 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 + exec /bin/bash -c "source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND" else echo "Unknown Web-server. Exiting..." exit 1