From ce24027a653521c59284f6975fd873d3377bc2ab Mon Sep 17 00:00:00 2001 From: stackcoder Date: Sun, 19 Jul 2020 04:03:49 +0200 Subject: [PATCH] Match cmd provided by Dockerfile again with entrypoint.sh Signed-off-by: stackcoder --- 17.0/apache/entrypoint.sh | 4 ++-- 17.0/fpm-alpine/entrypoint.sh | 4 ++-- 17.0/fpm/entrypoint.sh | 4 ++-- 18.0/apache/entrypoint.sh | 4 ++-- 18.0/fpm-alpine/entrypoint.sh | 4 ++-- 18.0/fpm/entrypoint.sh | 4 ++-- 19.0/apache/entrypoint.sh | 4 ++-- 19.0/fpm-alpine/entrypoint.sh | 4 ++-- 19.0/fpm/entrypoint.sh | 4 ++-- docker-entrypoint.sh | 4 ++-- 10 files changed, 20 insertions(+), 20 deletions(-) diff --git a/17.0/apache/entrypoint.sh b/17.0/apache/entrypoint.sh index b9ec5fc5..f1dd332c 100755 --- a/17.0/apache/entrypoint.sh +++ b/17.0/apache/entrypoint.sh @@ -43,13 +43,13 @@ file_env() { unset "$fileVar" } -if expr "$1" : "apache" 1>/dev/null; then +if expr "$1" : "apache2-foreground" 1>/dev/null; then if [ -n "${APACHE_DISABLE_REWRITE_IP+x}" ]; then a2disconf remoteip fi fi -if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UPDATE:-0}" -eq 1 ]; then +if expr "$1" : "apache2-foreground" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UPDATE:-0}" -eq 1 ]; then if [ -n "${REDIS_HOST+x}" ]; then echo "Configuring Redis as session handler" diff --git a/17.0/fpm-alpine/entrypoint.sh b/17.0/fpm-alpine/entrypoint.sh index b9ec5fc5..f1dd332c 100755 --- a/17.0/fpm-alpine/entrypoint.sh +++ b/17.0/fpm-alpine/entrypoint.sh @@ -43,13 +43,13 @@ file_env() { unset "$fileVar" } -if expr "$1" : "apache" 1>/dev/null; then +if expr "$1" : "apache2-foreground" 1>/dev/null; then if [ -n "${APACHE_DISABLE_REWRITE_IP+x}" ]; then a2disconf remoteip fi fi -if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UPDATE:-0}" -eq 1 ]; then +if expr "$1" : "apache2-foreground" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UPDATE:-0}" -eq 1 ]; then if [ -n "${REDIS_HOST+x}" ]; then echo "Configuring Redis as session handler" diff --git a/17.0/fpm/entrypoint.sh b/17.0/fpm/entrypoint.sh index b9ec5fc5..f1dd332c 100755 --- a/17.0/fpm/entrypoint.sh +++ b/17.0/fpm/entrypoint.sh @@ -43,13 +43,13 @@ file_env() { unset "$fileVar" } -if expr "$1" : "apache" 1>/dev/null; then +if expr "$1" : "apache2-foreground" 1>/dev/null; then if [ -n "${APACHE_DISABLE_REWRITE_IP+x}" ]; then a2disconf remoteip fi fi -if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UPDATE:-0}" -eq 1 ]; then +if expr "$1" : "apache2-foreground" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UPDATE:-0}" -eq 1 ]; then if [ -n "${REDIS_HOST+x}" ]; then echo "Configuring Redis as session handler" diff --git a/18.0/apache/entrypoint.sh b/18.0/apache/entrypoint.sh index b9ec5fc5..f1dd332c 100755 --- a/18.0/apache/entrypoint.sh +++ b/18.0/apache/entrypoint.sh @@ -43,13 +43,13 @@ file_env() { unset "$fileVar" } -if expr "$1" : "apache" 1>/dev/null; then +if expr "$1" : "apache2-foreground" 1>/dev/null; then if [ -n "${APACHE_DISABLE_REWRITE_IP+x}" ]; then a2disconf remoteip fi fi -if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UPDATE:-0}" -eq 1 ]; then +if expr "$1" : "apache2-foreground" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UPDATE:-0}" -eq 1 ]; then if [ -n "${REDIS_HOST+x}" ]; then echo "Configuring Redis as session handler" diff --git a/18.0/fpm-alpine/entrypoint.sh b/18.0/fpm-alpine/entrypoint.sh index b9ec5fc5..f1dd332c 100755 --- a/18.0/fpm-alpine/entrypoint.sh +++ b/18.0/fpm-alpine/entrypoint.sh @@ -43,13 +43,13 @@ file_env() { unset "$fileVar" } -if expr "$1" : "apache" 1>/dev/null; then +if expr "$1" : "apache2-foreground" 1>/dev/null; then if [ -n "${APACHE_DISABLE_REWRITE_IP+x}" ]; then a2disconf remoteip fi fi -if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UPDATE:-0}" -eq 1 ]; then +if expr "$1" : "apache2-foreground" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UPDATE:-0}" -eq 1 ]; then if [ -n "${REDIS_HOST+x}" ]; then echo "Configuring Redis as session handler" diff --git a/18.0/fpm/entrypoint.sh b/18.0/fpm/entrypoint.sh index b9ec5fc5..f1dd332c 100755 --- a/18.0/fpm/entrypoint.sh +++ b/18.0/fpm/entrypoint.sh @@ -43,13 +43,13 @@ file_env() { unset "$fileVar" } -if expr "$1" : "apache" 1>/dev/null; then +if expr "$1" : "apache2-foreground" 1>/dev/null; then if [ -n "${APACHE_DISABLE_REWRITE_IP+x}" ]; then a2disconf remoteip fi fi -if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UPDATE:-0}" -eq 1 ]; then +if expr "$1" : "apache2-foreground" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UPDATE:-0}" -eq 1 ]; then if [ -n "${REDIS_HOST+x}" ]; then echo "Configuring Redis as session handler" diff --git a/19.0/apache/entrypoint.sh b/19.0/apache/entrypoint.sh index b9ec5fc5..f1dd332c 100755 --- a/19.0/apache/entrypoint.sh +++ b/19.0/apache/entrypoint.sh @@ -43,13 +43,13 @@ file_env() { unset "$fileVar" } -if expr "$1" : "apache" 1>/dev/null; then +if expr "$1" : "apache2-foreground" 1>/dev/null; then if [ -n "${APACHE_DISABLE_REWRITE_IP+x}" ]; then a2disconf remoteip fi fi -if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UPDATE:-0}" -eq 1 ]; then +if expr "$1" : "apache2-foreground" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UPDATE:-0}" -eq 1 ]; then if [ -n "${REDIS_HOST+x}" ]; then echo "Configuring Redis as session handler" diff --git a/19.0/fpm-alpine/entrypoint.sh b/19.0/fpm-alpine/entrypoint.sh index b9ec5fc5..f1dd332c 100755 --- a/19.0/fpm-alpine/entrypoint.sh +++ b/19.0/fpm-alpine/entrypoint.sh @@ -43,13 +43,13 @@ file_env() { unset "$fileVar" } -if expr "$1" : "apache" 1>/dev/null; then +if expr "$1" : "apache2-foreground" 1>/dev/null; then if [ -n "${APACHE_DISABLE_REWRITE_IP+x}" ]; then a2disconf remoteip fi fi -if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UPDATE:-0}" -eq 1 ]; then +if expr "$1" : "apache2-foreground" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UPDATE:-0}" -eq 1 ]; then if [ -n "${REDIS_HOST+x}" ]; then echo "Configuring Redis as session handler" diff --git a/19.0/fpm/entrypoint.sh b/19.0/fpm/entrypoint.sh index b9ec5fc5..f1dd332c 100755 --- a/19.0/fpm/entrypoint.sh +++ b/19.0/fpm/entrypoint.sh @@ -43,13 +43,13 @@ file_env() { unset "$fileVar" } -if expr "$1" : "apache" 1>/dev/null; then +if expr "$1" : "apache2-foreground" 1>/dev/null; then if [ -n "${APACHE_DISABLE_REWRITE_IP+x}" ]; then a2disconf remoteip fi fi -if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UPDATE:-0}" -eq 1 ]; then +if expr "$1" : "apache2-foreground" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UPDATE:-0}" -eq 1 ]; then if [ -n "${REDIS_HOST+x}" ]; then echo "Configuring Redis as session handler" diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index b9ec5fc5..f1dd332c 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -43,13 +43,13 @@ file_env() { unset "$fileVar" } -if expr "$1" : "apache" 1>/dev/null; then +if expr "$1" : "apache2-foreground" 1>/dev/null; then if [ -n "${APACHE_DISABLE_REWRITE_IP+x}" ]; then a2disconf remoteip fi fi -if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UPDATE:-0}" -eq 1 ]; then +if expr "$1" : "apache2-foreground" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UPDATE:-0}" -eq 1 ]; then if [ -n "${REDIS_HOST+x}" ]; then echo "Configuring Redis as session handler"