From f3cd2d25cd954b53f87a4516004d59d18b117719 Mon Sep 17 00:00:00 2001 From: adrien <16813527+dauriata@users.noreply.github.com> Date: Tue, 20 Sep 2022 20:06:46 +0200 Subject: [PATCH] fix apache2 pid path for alpine --- docker/apache/alpine/conf/bin/service.d/httpd.sh | 2 +- docker/php-apache/7.1-alpine/conf/bin/service.d/httpd.sh | 2 +- docker/php-apache/7.2-alpine/conf/bin/service.d/httpd.sh | 2 +- docker/php-apache/7.3-alpine/conf/bin/service.d/httpd.sh | 2 +- docker/php-apache/7.4-alpine/conf/bin/service.d/httpd.sh | 2 +- docker/php-apache/8.0-alpine/conf/bin/service.d/httpd.sh | 2 +- provisioning/apache/alpine/bin/service.d/httpd.sh | 2 +- provisioning/php-apache/alpine/bin/service.d/httpd.sh | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/docker/apache/alpine/conf/bin/service.d/httpd.sh b/docker/apache/alpine/conf/bin/service.d/httpd.sh index f88544c62..f5048c25c 100644 --- a/docker/apache/alpine/conf/bin/service.d/httpd.sh +++ b/docker/apache/alpine/conf/bin/service.d/httpd.sh @@ -8,6 +8,6 @@ source /opt/docker/bin/config.sh includeScriptDir "/opt/docker/bin/service.d/httpd.d/" # Apache gets grumpy about PID files pre-existing -rm -f /var/run/httpd/httpd.pid +rm -f /var/run/apache2/httpd.pid exec /usr/sbin/apachectl -DFOREGROUND $SERVICE_APACHE_OPTS diff --git a/docker/php-apache/7.1-alpine/conf/bin/service.d/httpd.sh b/docker/php-apache/7.1-alpine/conf/bin/service.d/httpd.sh index f88544c62..f5048c25c 100644 --- a/docker/php-apache/7.1-alpine/conf/bin/service.d/httpd.sh +++ b/docker/php-apache/7.1-alpine/conf/bin/service.d/httpd.sh @@ -8,6 +8,6 @@ source /opt/docker/bin/config.sh includeScriptDir "/opt/docker/bin/service.d/httpd.d/" # Apache gets grumpy about PID files pre-existing -rm -f /var/run/httpd/httpd.pid +rm -f /var/run/apache2/httpd.pid exec /usr/sbin/apachectl -DFOREGROUND $SERVICE_APACHE_OPTS diff --git a/docker/php-apache/7.2-alpine/conf/bin/service.d/httpd.sh b/docker/php-apache/7.2-alpine/conf/bin/service.d/httpd.sh index f88544c62..f5048c25c 100644 --- a/docker/php-apache/7.2-alpine/conf/bin/service.d/httpd.sh +++ b/docker/php-apache/7.2-alpine/conf/bin/service.d/httpd.sh @@ -8,6 +8,6 @@ source /opt/docker/bin/config.sh includeScriptDir "/opt/docker/bin/service.d/httpd.d/" # Apache gets grumpy about PID files pre-existing -rm -f /var/run/httpd/httpd.pid +rm -f /var/run/apache2/httpd.pid exec /usr/sbin/apachectl -DFOREGROUND $SERVICE_APACHE_OPTS diff --git a/docker/php-apache/7.3-alpine/conf/bin/service.d/httpd.sh b/docker/php-apache/7.3-alpine/conf/bin/service.d/httpd.sh index f88544c62..f5048c25c 100644 --- a/docker/php-apache/7.3-alpine/conf/bin/service.d/httpd.sh +++ b/docker/php-apache/7.3-alpine/conf/bin/service.d/httpd.sh @@ -8,6 +8,6 @@ source /opt/docker/bin/config.sh includeScriptDir "/opt/docker/bin/service.d/httpd.d/" # Apache gets grumpy about PID files pre-existing -rm -f /var/run/httpd/httpd.pid +rm -f /var/run/apache2/httpd.pid exec /usr/sbin/apachectl -DFOREGROUND $SERVICE_APACHE_OPTS diff --git a/docker/php-apache/7.4-alpine/conf/bin/service.d/httpd.sh b/docker/php-apache/7.4-alpine/conf/bin/service.d/httpd.sh index f88544c62..f5048c25c 100644 --- a/docker/php-apache/7.4-alpine/conf/bin/service.d/httpd.sh +++ b/docker/php-apache/7.4-alpine/conf/bin/service.d/httpd.sh @@ -8,6 +8,6 @@ source /opt/docker/bin/config.sh includeScriptDir "/opt/docker/bin/service.d/httpd.d/" # Apache gets grumpy about PID files pre-existing -rm -f /var/run/httpd/httpd.pid +rm -f /var/run/apache2/httpd.pid exec /usr/sbin/apachectl -DFOREGROUND $SERVICE_APACHE_OPTS diff --git a/docker/php-apache/8.0-alpine/conf/bin/service.d/httpd.sh b/docker/php-apache/8.0-alpine/conf/bin/service.d/httpd.sh index f88544c62..f5048c25c 100644 --- a/docker/php-apache/8.0-alpine/conf/bin/service.d/httpd.sh +++ b/docker/php-apache/8.0-alpine/conf/bin/service.d/httpd.sh @@ -8,6 +8,6 @@ source /opt/docker/bin/config.sh includeScriptDir "/opt/docker/bin/service.d/httpd.d/" # Apache gets grumpy about PID files pre-existing -rm -f /var/run/httpd/httpd.pid +rm -f /var/run/apache2/httpd.pid exec /usr/sbin/apachectl -DFOREGROUND $SERVICE_APACHE_OPTS diff --git a/provisioning/apache/alpine/bin/service.d/httpd.sh b/provisioning/apache/alpine/bin/service.d/httpd.sh index f88544c62..f5048c25c 100644 --- a/provisioning/apache/alpine/bin/service.d/httpd.sh +++ b/provisioning/apache/alpine/bin/service.d/httpd.sh @@ -8,6 +8,6 @@ source /opt/docker/bin/config.sh includeScriptDir "/opt/docker/bin/service.d/httpd.d/" # Apache gets grumpy about PID files pre-existing -rm -f /var/run/httpd/httpd.pid +rm -f /var/run/apache2/httpd.pid exec /usr/sbin/apachectl -DFOREGROUND $SERVICE_APACHE_OPTS diff --git a/provisioning/php-apache/alpine/bin/service.d/httpd.sh b/provisioning/php-apache/alpine/bin/service.d/httpd.sh index f88544c62..f5048c25c 100644 --- a/provisioning/php-apache/alpine/bin/service.d/httpd.sh +++ b/provisioning/php-apache/alpine/bin/service.d/httpd.sh @@ -8,6 +8,6 @@ source /opt/docker/bin/config.sh includeScriptDir "/opt/docker/bin/service.d/httpd.d/" # Apache gets grumpy about PID files pre-existing -rm -f /var/run/httpd/httpd.pid +rm -f /var/run/apache2/httpd.pid exec /usr/sbin/apachectl -DFOREGROUND $SERVICE_APACHE_OPTS