From ec2a1ea370a82dde4cb203697874d5b9f25ad0ef Mon Sep 17 00:00:00 2001 From: STAM Date: Wed, 11 Dec 2024 19:47:53 +0300 Subject: [PATCH] web fixes --- linux/ecosystem/apache2/php5.5/Dockerfile | 2 +- .../apache2/php5.5/docker-entrypoint.sh | 48 ++++++++++++++----- linux/ecosystem/apache2/php5.6/Dockerfile | 2 +- .../apache2/php5.6/docker-entrypoint.sh | 48 ++++++++++++++----- linux/ecosystem/apache2/php7.0/Dockerfile | 2 +- .../apache2/php7.0/docker-entrypoint.sh | 48 ++++++++++++++----- linux/ecosystem/apache2/php7.1/Dockerfile | 2 +- .../apache2/php7.1/docker-entrypoint.sh | 48 ++++++++++++++----- linux/ecosystem/apache2/php7.2/Dockerfile | 2 +- .../apache2/php7.2/docker-entrypoint.sh | 48 ++++++++++++++----- linux/ecosystem/apache2/php7.3/Dockerfile | 2 +- .../apache2/php7.3/docker-entrypoint.sh | 48 ++++++++++++++----- linux/ecosystem/apache2/php7.4/Dockerfile | 2 +- .../apache2/php7.4/docker-entrypoint.sh | 48 ++++++++++++++----- linux/ecosystem/apache2/php8.0/Dockerfile | 2 +- .../apache2/php8.0/docker-entrypoint.sh | 48 ++++++++++++++----- linux/ecosystem/apache2/php8.1/Dockerfile | 2 +- .../apache2/php8.1/docker-entrypoint.sh | 48 ++++++++++++++----- linux/ecosystem/apache2/php8.2/Dockerfile | 2 +- .../apache2/php8.2/docker-entrypoint.sh | 48 ++++++++++++++----- linux/ecosystem/apache2/php8.3/Dockerfile | 2 +- .../apache2/php8.3/docker-entrypoint.sh | 48 ++++++++++++++----- linux/ecosystem/apache2/php8.4/Dockerfile | 2 +- .../apache2/php8.4/docker-entrypoint.sh | 48 ++++++++++++++----- .../debian/12-bookworm/php/php5.6/Dockerfile | 2 +- .../debian/12-bookworm/php/php7.0/Dockerfile | 4 +- .../debian/12-bookworm/php/php7.1/Dockerfile | 4 +- .../debian/12-bookworm/php/php7.2/Dockerfile | 4 +- .../debian/12-bookworm/php/php7.3/Dockerfile | 4 +- .../debian/12-bookworm/php/php7.4/Dockerfile | 4 +- .../debian/12-bookworm/php/php8.0/Dockerfile | 4 +- .../debian/12-bookworm/php/php8.1/Dockerfile | 4 +- .../debian/12-bookworm/php/php8.2/Dockerfile | 4 +- .../debian/12-bookworm/php/php8.3/Dockerfile | 4 +- .../debian/12-bookworm/php/php8.4/Dockerfile | 2 +- linux/ecosystem/nginx/1.14.2/php/Dockerfile | 2 +- linux/ecosystem/nginx/1.15.12/php/Dockerfile | 2 +- linux/ecosystem/nginx/1.16.1/php/Dockerfile | 2 +- linux/ecosystem/nginx/1.17.10/php/Dockerfile | 2 +- linux/ecosystem/nginx/1.18.0/php/Dockerfile | 2 +- linux/ecosystem/nginx/1.19.10/php/Dockerfile | 2 +- linux/ecosystem/nginx/1.20.1/php/Dockerfile | 2 +- linux/ecosystem/nginx/1.21.3/php/Dockerfile | 2 +- linux/ecosystem/nginx/1.21.6/php/Dockerfile | 2 +- .../nginx/latest/mainline/php/Dockerfile | 2 +- .../nginx/latest/quic/php/Dockerfile | 2 +- 46 files changed, 475 insertions(+), 187 deletions(-) diff --git a/linux/ecosystem/apache2/php5.5/Dockerfile b/linux/ecosystem/apache2/php5.5/Dockerfile index 1acf25e76..960ccbc29 100644 --- a/linux/ecosystem/apache2/php5.5/Dockerfile +++ b/linux/ecosystem/apache2/php5.5/Dockerfile @@ -94,7 +94,7 @@ RUN updatedb RUN chown -Rf www-data:www-data /var/www #Final config -VOLUME ["/var/www"] +VOLUME ["/var/www", "/var/log/apache2", "/var/run/apache2"] WORKDIR /var/www/ EXPOSE 80 443 diff --git a/linux/ecosystem/apache2/php5.5/docker-entrypoint.sh b/linux/ecosystem/apache2/php5.5/docker-entrypoint.sh index b421b8648..5fe464552 100755 --- a/linux/ecosystem/apache2/php5.5/docker-entrypoint.sh +++ b/linux/ecosystem/apache2/php5.5/docker-entrypoint.sh @@ -1,18 +1,42 @@ #!/bin/bash -if [[ -z "${FIX_WWW_DATA}" ]]; then - echo "[apache2] env FIX_WWW_DATA is not set. Skipping..." -elif [ "${FIX_WWW_DATA}" == "false" ]; then - echo "[apache2] env FIX_WWW_DATA is set to false. Skipping..." -elif [ "${FIX_WWW_DATA}" == "true" ]; then - echo "[apache2] Changing permissions for /var/www path. Dont worry, please wait." - chown www-data:www-data /var/www -R - echo "[apache2] Done" -else - echo "[apache2] env FIX_WWW_DATA is set to strange value. Skipping..." -fi +set -e echo "[apache2] Starting up" -source /etc/apache2/envvars + +case "${FIX_WWW_DATA}" in + "") + echo "[apache2] env FIX_WWW_DATA is not set. Skipping..." + ;; + "false") + echo "[apache2] env FIX_WWW_DATA is set to false. Skipping..." + ;; + "true") + echo "[apache2] Changing permissions for /var/www path. Please wait." + if [ -d "/var/www" ]; then + chown www-data:www-data /var/www -R + if [ $? -eq 0 ]; then + echo "[apache2] Permissions changed successfully." + else + echo "[apache2] Error changing permissions for /var/www." + exit 1 + fi + else + echo "[apache2] /var/www directory not found. Skipping permission change." + fi + ;; + *) + echo "[apache2] env FIX_WWW_DATA is set to an invalid value. Skipping..." + ;; +esac + +if [ -f /etc/apache2/envvars ]; then + source /etc/apache2/envvars +else + echo "[apache2] Warning: /etc/apache2/envvars not found." +fi + tail -F /var/log/apache2/* & + +echo "[apache2] Starting Apache in the foreground." exec apache2 -D FOREGROUND diff --git a/linux/ecosystem/apache2/php5.6/Dockerfile b/linux/ecosystem/apache2/php5.6/Dockerfile index 503815739..768f53f96 100644 --- a/linux/ecosystem/apache2/php5.6/Dockerfile +++ b/linux/ecosystem/apache2/php5.6/Dockerfile @@ -93,7 +93,7 @@ RUN updatedb RUN chown -Rf www-data:www-data /var/www #Final config -VOLUME ["/var/www"] +VOLUME ["/var/www", "/var/log/apache2", "/var/run/apache2"] WORKDIR /var/www/ EXPOSE 80 443 diff --git a/linux/ecosystem/apache2/php5.6/docker-entrypoint.sh b/linux/ecosystem/apache2/php5.6/docker-entrypoint.sh index b421b8648..5fe464552 100755 --- a/linux/ecosystem/apache2/php5.6/docker-entrypoint.sh +++ b/linux/ecosystem/apache2/php5.6/docker-entrypoint.sh @@ -1,18 +1,42 @@ #!/bin/bash -if [[ -z "${FIX_WWW_DATA}" ]]; then - echo "[apache2] env FIX_WWW_DATA is not set. Skipping..." -elif [ "${FIX_WWW_DATA}" == "false" ]; then - echo "[apache2] env FIX_WWW_DATA is set to false. Skipping..." -elif [ "${FIX_WWW_DATA}" == "true" ]; then - echo "[apache2] Changing permissions for /var/www path. Dont worry, please wait." - chown www-data:www-data /var/www -R - echo "[apache2] Done" -else - echo "[apache2] env FIX_WWW_DATA is set to strange value. Skipping..." -fi +set -e echo "[apache2] Starting up" -source /etc/apache2/envvars + +case "${FIX_WWW_DATA}" in + "") + echo "[apache2] env FIX_WWW_DATA is not set. Skipping..." + ;; + "false") + echo "[apache2] env FIX_WWW_DATA is set to false. Skipping..." + ;; + "true") + echo "[apache2] Changing permissions for /var/www path. Please wait." + if [ -d "/var/www" ]; then + chown www-data:www-data /var/www -R + if [ $? -eq 0 ]; then + echo "[apache2] Permissions changed successfully." + else + echo "[apache2] Error changing permissions for /var/www." + exit 1 + fi + else + echo "[apache2] /var/www directory not found. Skipping permission change." + fi + ;; + *) + echo "[apache2] env FIX_WWW_DATA is set to an invalid value. Skipping..." + ;; +esac + +if [ -f /etc/apache2/envvars ]; then + source /etc/apache2/envvars +else + echo "[apache2] Warning: /etc/apache2/envvars not found." +fi + tail -F /var/log/apache2/* & + +echo "[apache2] Starting Apache in the foreground." exec apache2 -D FOREGROUND diff --git a/linux/ecosystem/apache2/php7.0/Dockerfile b/linux/ecosystem/apache2/php7.0/Dockerfile index 221751b4f..a0bd8c015 100644 --- a/linux/ecosystem/apache2/php7.0/Dockerfile +++ b/linux/ecosystem/apache2/php7.0/Dockerfile @@ -126,7 +126,7 @@ RUN updatedb RUN chown -Rf www-data:www-data /var/www #Final config -VOLUME ["/var/www"] +VOLUME ["/var/www", "/var/log/apache2", "/var/run/apache2"] WORKDIR /var/www/ EXPOSE 80 443 diff --git a/linux/ecosystem/apache2/php7.0/docker-entrypoint.sh b/linux/ecosystem/apache2/php7.0/docker-entrypoint.sh index b421b8648..5fe464552 100755 --- a/linux/ecosystem/apache2/php7.0/docker-entrypoint.sh +++ b/linux/ecosystem/apache2/php7.0/docker-entrypoint.sh @@ -1,18 +1,42 @@ #!/bin/bash -if [[ -z "${FIX_WWW_DATA}" ]]; then - echo "[apache2] env FIX_WWW_DATA is not set. Skipping..." -elif [ "${FIX_WWW_DATA}" == "false" ]; then - echo "[apache2] env FIX_WWW_DATA is set to false. Skipping..." -elif [ "${FIX_WWW_DATA}" == "true" ]; then - echo "[apache2] Changing permissions for /var/www path. Dont worry, please wait." - chown www-data:www-data /var/www -R - echo "[apache2] Done" -else - echo "[apache2] env FIX_WWW_DATA is set to strange value. Skipping..." -fi +set -e echo "[apache2] Starting up" -source /etc/apache2/envvars + +case "${FIX_WWW_DATA}" in + "") + echo "[apache2] env FIX_WWW_DATA is not set. Skipping..." + ;; + "false") + echo "[apache2] env FIX_WWW_DATA is set to false. Skipping..." + ;; + "true") + echo "[apache2] Changing permissions for /var/www path. Please wait." + if [ -d "/var/www" ]; then + chown www-data:www-data /var/www -R + if [ $? -eq 0 ]; then + echo "[apache2] Permissions changed successfully." + else + echo "[apache2] Error changing permissions for /var/www." + exit 1 + fi + else + echo "[apache2] /var/www directory not found. Skipping permission change." + fi + ;; + *) + echo "[apache2] env FIX_WWW_DATA is set to an invalid value. Skipping..." + ;; +esac + +if [ -f /etc/apache2/envvars ]; then + source /etc/apache2/envvars +else + echo "[apache2] Warning: /etc/apache2/envvars not found." +fi + tail -F /var/log/apache2/* & + +echo "[apache2] Starting Apache in the foreground." exec apache2 -D FOREGROUND diff --git a/linux/ecosystem/apache2/php7.1/Dockerfile b/linux/ecosystem/apache2/php7.1/Dockerfile index 54e9acca2..775d2aa03 100644 --- a/linux/ecosystem/apache2/php7.1/Dockerfile +++ b/linux/ecosystem/apache2/php7.1/Dockerfile @@ -126,7 +126,7 @@ RUN updatedb RUN chown -Rf www-data:www-data /var/www #Final config -VOLUME ["/var/www"] +VOLUME ["/var/www", "/var/log/apache2", "/var/run/apache2"] WORKDIR /var/www/ EXPOSE 80 443 diff --git a/linux/ecosystem/apache2/php7.1/docker-entrypoint.sh b/linux/ecosystem/apache2/php7.1/docker-entrypoint.sh index b421b8648..5fe464552 100755 --- a/linux/ecosystem/apache2/php7.1/docker-entrypoint.sh +++ b/linux/ecosystem/apache2/php7.1/docker-entrypoint.sh @@ -1,18 +1,42 @@ #!/bin/bash -if [[ -z "${FIX_WWW_DATA}" ]]; then - echo "[apache2] env FIX_WWW_DATA is not set. Skipping..." -elif [ "${FIX_WWW_DATA}" == "false" ]; then - echo "[apache2] env FIX_WWW_DATA is set to false. Skipping..." -elif [ "${FIX_WWW_DATA}" == "true" ]; then - echo "[apache2] Changing permissions for /var/www path. Dont worry, please wait." - chown www-data:www-data /var/www -R - echo "[apache2] Done" -else - echo "[apache2] env FIX_WWW_DATA is set to strange value. Skipping..." -fi +set -e echo "[apache2] Starting up" -source /etc/apache2/envvars + +case "${FIX_WWW_DATA}" in + "") + echo "[apache2] env FIX_WWW_DATA is not set. Skipping..." + ;; + "false") + echo "[apache2] env FIX_WWW_DATA is set to false. Skipping..." + ;; + "true") + echo "[apache2] Changing permissions for /var/www path. Please wait." + if [ -d "/var/www" ]; then + chown www-data:www-data /var/www -R + if [ $? -eq 0 ]; then + echo "[apache2] Permissions changed successfully." + else + echo "[apache2] Error changing permissions for /var/www." + exit 1 + fi + else + echo "[apache2] /var/www directory not found. Skipping permission change." + fi + ;; + *) + echo "[apache2] env FIX_WWW_DATA is set to an invalid value. Skipping..." + ;; +esac + +if [ -f /etc/apache2/envvars ]; then + source /etc/apache2/envvars +else + echo "[apache2] Warning: /etc/apache2/envvars not found." +fi + tail -F /var/log/apache2/* & + +echo "[apache2] Starting Apache in the foreground." exec apache2 -D FOREGROUND diff --git a/linux/ecosystem/apache2/php7.2/Dockerfile b/linux/ecosystem/apache2/php7.2/Dockerfile index b970c66b1..d9749168c 100644 --- a/linux/ecosystem/apache2/php7.2/Dockerfile +++ b/linux/ecosystem/apache2/php7.2/Dockerfile @@ -126,7 +126,7 @@ RUN updatedb RUN chown -Rf www-data:www-data /var/www #Final config -VOLUME ["/var/www"] +VOLUME ["/var/www", "/var/log/apache2", "/var/run/apache2"] WORKDIR /var/www/ EXPOSE 80 443 diff --git a/linux/ecosystem/apache2/php7.2/docker-entrypoint.sh b/linux/ecosystem/apache2/php7.2/docker-entrypoint.sh index b421b8648..5fe464552 100755 --- a/linux/ecosystem/apache2/php7.2/docker-entrypoint.sh +++ b/linux/ecosystem/apache2/php7.2/docker-entrypoint.sh @@ -1,18 +1,42 @@ #!/bin/bash -if [[ -z "${FIX_WWW_DATA}" ]]; then - echo "[apache2] env FIX_WWW_DATA is not set. Skipping..." -elif [ "${FIX_WWW_DATA}" == "false" ]; then - echo "[apache2] env FIX_WWW_DATA is set to false. Skipping..." -elif [ "${FIX_WWW_DATA}" == "true" ]; then - echo "[apache2] Changing permissions for /var/www path. Dont worry, please wait." - chown www-data:www-data /var/www -R - echo "[apache2] Done" -else - echo "[apache2] env FIX_WWW_DATA is set to strange value. Skipping..." -fi +set -e echo "[apache2] Starting up" -source /etc/apache2/envvars + +case "${FIX_WWW_DATA}" in + "") + echo "[apache2] env FIX_WWW_DATA is not set. Skipping..." + ;; + "false") + echo "[apache2] env FIX_WWW_DATA is set to false. Skipping..." + ;; + "true") + echo "[apache2] Changing permissions for /var/www path. Please wait." + if [ -d "/var/www" ]; then + chown www-data:www-data /var/www -R + if [ $? -eq 0 ]; then + echo "[apache2] Permissions changed successfully." + else + echo "[apache2] Error changing permissions for /var/www." + exit 1 + fi + else + echo "[apache2] /var/www directory not found. Skipping permission change." + fi + ;; + *) + echo "[apache2] env FIX_WWW_DATA is set to an invalid value. Skipping..." + ;; +esac + +if [ -f /etc/apache2/envvars ]; then + source /etc/apache2/envvars +else + echo "[apache2] Warning: /etc/apache2/envvars not found." +fi + tail -F /var/log/apache2/* & + +echo "[apache2] Starting Apache in the foreground." exec apache2 -D FOREGROUND diff --git a/linux/ecosystem/apache2/php7.3/Dockerfile b/linux/ecosystem/apache2/php7.3/Dockerfile index af089fca3..7de1f0f81 100644 --- a/linux/ecosystem/apache2/php7.3/Dockerfile +++ b/linux/ecosystem/apache2/php7.3/Dockerfile @@ -127,7 +127,7 @@ RUN updatedb RUN chown -Rf www-data:www-data /var/www #Final config -VOLUME ["/var/www"] +VOLUME ["/var/www", "/var/log/apache2", "/var/run/apache2"] WORKDIR /var/www/ EXPOSE 80 443 diff --git a/linux/ecosystem/apache2/php7.3/docker-entrypoint.sh b/linux/ecosystem/apache2/php7.3/docker-entrypoint.sh index b421b8648..5fe464552 100755 --- a/linux/ecosystem/apache2/php7.3/docker-entrypoint.sh +++ b/linux/ecosystem/apache2/php7.3/docker-entrypoint.sh @@ -1,18 +1,42 @@ #!/bin/bash -if [[ -z "${FIX_WWW_DATA}" ]]; then - echo "[apache2] env FIX_WWW_DATA is not set. Skipping..." -elif [ "${FIX_WWW_DATA}" == "false" ]; then - echo "[apache2] env FIX_WWW_DATA is set to false. Skipping..." -elif [ "${FIX_WWW_DATA}" == "true" ]; then - echo "[apache2] Changing permissions for /var/www path. Dont worry, please wait." - chown www-data:www-data /var/www -R - echo "[apache2] Done" -else - echo "[apache2] env FIX_WWW_DATA is set to strange value. Skipping..." -fi +set -e echo "[apache2] Starting up" -source /etc/apache2/envvars + +case "${FIX_WWW_DATA}" in + "") + echo "[apache2] env FIX_WWW_DATA is not set. Skipping..." + ;; + "false") + echo "[apache2] env FIX_WWW_DATA is set to false. Skipping..." + ;; + "true") + echo "[apache2] Changing permissions for /var/www path. Please wait." + if [ -d "/var/www" ]; then + chown www-data:www-data /var/www -R + if [ $? -eq 0 ]; then + echo "[apache2] Permissions changed successfully." + else + echo "[apache2] Error changing permissions for /var/www." + exit 1 + fi + else + echo "[apache2] /var/www directory not found. Skipping permission change." + fi + ;; + *) + echo "[apache2] env FIX_WWW_DATA is set to an invalid value. Skipping..." + ;; +esac + +if [ -f /etc/apache2/envvars ]; then + source /etc/apache2/envvars +else + echo "[apache2] Warning: /etc/apache2/envvars not found." +fi + tail -F /var/log/apache2/* & + +echo "[apache2] Starting Apache in the foreground." exec apache2 -D FOREGROUND diff --git a/linux/ecosystem/apache2/php7.4/Dockerfile b/linux/ecosystem/apache2/php7.4/Dockerfile index 4361e868c..3c4adb1cc 100644 --- a/linux/ecosystem/apache2/php7.4/Dockerfile +++ b/linux/ecosystem/apache2/php7.4/Dockerfile @@ -133,7 +133,7 @@ RUN updatedb RUN chown -Rf www-data:www-data /var/www #Final config -VOLUME ["/var/www"] +VOLUME ["/var/www", "/var/log/apache2", "/var/run/apache2"] WORKDIR /var/www/ EXPOSE 80 443 diff --git a/linux/ecosystem/apache2/php7.4/docker-entrypoint.sh b/linux/ecosystem/apache2/php7.4/docker-entrypoint.sh index b421b8648..5fe464552 100755 --- a/linux/ecosystem/apache2/php7.4/docker-entrypoint.sh +++ b/linux/ecosystem/apache2/php7.4/docker-entrypoint.sh @@ -1,18 +1,42 @@ #!/bin/bash -if [[ -z "${FIX_WWW_DATA}" ]]; then - echo "[apache2] env FIX_WWW_DATA is not set. Skipping..." -elif [ "${FIX_WWW_DATA}" == "false" ]; then - echo "[apache2] env FIX_WWW_DATA is set to false. Skipping..." -elif [ "${FIX_WWW_DATA}" == "true" ]; then - echo "[apache2] Changing permissions for /var/www path. Dont worry, please wait." - chown www-data:www-data /var/www -R - echo "[apache2] Done" -else - echo "[apache2] env FIX_WWW_DATA is set to strange value. Skipping..." -fi +set -e echo "[apache2] Starting up" -source /etc/apache2/envvars + +case "${FIX_WWW_DATA}" in + "") + echo "[apache2] env FIX_WWW_DATA is not set. Skipping..." + ;; + "false") + echo "[apache2] env FIX_WWW_DATA is set to false. Skipping..." + ;; + "true") + echo "[apache2] Changing permissions for /var/www path. Please wait." + if [ -d "/var/www" ]; then + chown www-data:www-data /var/www -R + if [ $? -eq 0 ]; then + echo "[apache2] Permissions changed successfully." + else + echo "[apache2] Error changing permissions for /var/www." + exit 1 + fi + else + echo "[apache2] /var/www directory not found. Skipping permission change." + fi + ;; + *) + echo "[apache2] env FIX_WWW_DATA is set to an invalid value. Skipping..." + ;; +esac + +if [ -f /etc/apache2/envvars ]; then + source /etc/apache2/envvars +else + echo "[apache2] Warning: /etc/apache2/envvars not found." +fi + tail -F /var/log/apache2/* & + +echo "[apache2] Starting Apache in the foreground." exec apache2 -D FOREGROUND diff --git a/linux/ecosystem/apache2/php8.0/Dockerfile b/linux/ecosystem/apache2/php8.0/Dockerfile index 8bc4eabb7..ac9f924bd 100644 --- a/linux/ecosystem/apache2/php8.0/Dockerfile +++ b/linux/ecosystem/apache2/php8.0/Dockerfile @@ -127,7 +127,7 @@ RUN updatedb RUN chown -Rf www-data:www-data /var/www #Final config -VOLUME ["/var/www"] +VOLUME ["/var/www", "/var/log/apache2", "/var/run/apache2"] WORKDIR /var/www/ EXPOSE 80 443 diff --git a/linux/ecosystem/apache2/php8.0/docker-entrypoint.sh b/linux/ecosystem/apache2/php8.0/docker-entrypoint.sh index b421b8648..5fe464552 100755 --- a/linux/ecosystem/apache2/php8.0/docker-entrypoint.sh +++ b/linux/ecosystem/apache2/php8.0/docker-entrypoint.sh @@ -1,18 +1,42 @@ #!/bin/bash -if [[ -z "${FIX_WWW_DATA}" ]]; then - echo "[apache2] env FIX_WWW_DATA is not set. Skipping..." -elif [ "${FIX_WWW_DATA}" == "false" ]; then - echo "[apache2] env FIX_WWW_DATA is set to false. Skipping..." -elif [ "${FIX_WWW_DATA}" == "true" ]; then - echo "[apache2] Changing permissions for /var/www path. Dont worry, please wait." - chown www-data:www-data /var/www -R - echo "[apache2] Done" -else - echo "[apache2] env FIX_WWW_DATA is set to strange value. Skipping..." -fi +set -e echo "[apache2] Starting up" -source /etc/apache2/envvars + +case "${FIX_WWW_DATA}" in + "") + echo "[apache2] env FIX_WWW_DATA is not set. Skipping..." + ;; + "false") + echo "[apache2] env FIX_WWW_DATA is set to false. Skipping..." + ;; + "true") + echo "[apache2] Changing permissions for /var/www path. Please wait." + if [ -d "/var/www" ]; then + chown www-data:www-data /var/www -R + if [ $? -eq 0 ]; then + echo "[apache2] Permissions changed successfully." + else + echo "[apache2] Error changing permissions for /var/www." + exit 1 + fi + else + echo "[apache2] /var/www directory not found. Skipping permission change." + fi + ;; + *) + echo "[apache2] env FIX_WWW_DATA is set to an invalid value. Skipping..." + ;; +esac + +if [ -f /etc/apache2/envvars ]; then + source /etc/apache2/envvars +else + echo "[apache2] Warning: /etc/apache2/envvars not found." +fi + tail -F /var/log/apache2/* & + +echo "[apache2] Starting Apache in the foreground." exec apache2 -D FOREGROUND diff --git a/linux/ecosystem/apache2/php8.1/Dockerfile b/linux/ecosystem/apache2/php8.1/Dockerfile index 6405fc3ad..b531e9b16 100644 --- a/linux/ecosystem/apache2/php8.1/Dockerfile +++ b/linux/ecosystem/apache2/php8.1/Dockerfile @@ -127,7 +127,7 @@ RUN updatedb RUN chown -Rf www-data:www-data /var/www #Final config -VOLUME ["/var/www"] +VOLUME ["/var/www", "/var/log/apache2", "/var/run/apache2"] WORKDIR /var/www/ EXPOSE 80 443 diff --git a/linux/ecosystem/apache2/php8.1/docker-entrypoint.sh b/linux/ecosystem/apache2/php8.1/docker-entrypoint.sh index b421b8648..5fe464552 100755 --- a/linux/ecosystem/apache2/php8.1/docker-entrypoint.sh +++ b/linux/ecosystem/apache2/php8.1/docker-entrypoint.sh @@ -1,18 +1,42 @@ #!/bin/bash -if [[ -z "${FIX_WWW_DATA}" ]]; then - echo "[apache2] env FIX_WWW_DATA is not set. Skipping..." -elif [ "${FIX_WWW_DATA}" == "false" ]; then - echo "[apache2] env FIX_WWW_DATA is set to false. Skipping..." -elif [ "${FIX_WWW_DATA}" == "true" ]; then - echo "[apache2] Changing permissions for /var/www path. Dont worry, please wait." - chown www-data:www-data /var/www -R - echo "[apache2] Done" -else - echo "[apache2] env FIX_WWW_DATA is set to strange value. Skipping..." -fi +set -e echo "[apache2] Starting up" -source /etc/apache2/envvars + +case "${FIX_WWW_DATA}" in + "") + echo "[apache2] env FIX_WWW_DATA is not set. Skipping..." + ;; + "false") + echo "[apache2] env FIX_WWW_DATA is set to false. Skipping..." + ;; + "true") + echo "[apache2] Changing permissions for /var/www path. Please wait." + if [ -d "/var/www" ]; then + chown www-data:www-data /var/www -R + if [ $? -eq 0 ]; then + echo "[apache2] Permissions changed successfully." + else + echo "[apache2] Error changing permissions for /var/www." + exit 1 + fi + else + echo "[apache2] /var/www directory not found. Skipping permission change." + fi + ;; + *) + echo "[apache2] env FIX_WWW_DATA is set to an invalid value. Skipping..." + ;; +esac + +if [ -f /etc/apache2/envvars ]; then + source /etc/apache2/envvars +else + echo "[apache2] Warning: /etc/apache2/envvars not found." +fi + tail -F /var/log/apache2/* & + +echo "[apache2] Starting Apache in the foreground." exec apache2 -D FOREGROUND diff --git a/linux/ecosystem/apache2/php8.2/Dockerfile b/linux/ecosystem/apache2/php8.2/Dockerfile index ef0d5333b..704dcbb07 100644 --- a/linux/ecosystem/apache2/php8.2/Dockerfile +++ b/linux/ecosystem/apache2/php8.2/Dockerfile @@ -127,7 +127,7 @@ RUN updatedb RUN chown -Rf www-data:www-data /var/www #Final config -VOLUME ["/var/www"] +VOLUME ["/var/www", "/var/log/apache2", "/var/run/apache2"] WORKDIR /var/www/ EXPOSE 80 443 diff --git a/linux/ecosystem/apache2/php8.2/docker-entrypoint.sh b/linux/ecosystem/apache2/php8.2/docker-entrypoint.sh index b421b8648..5fe464552 100755 --- a/linux/ecosystem/apache2/php8.2/docker-entrypoint.sh +++ b/linux/ecosystem/apache2/php8.2/docker-entrypoint.sh @@ -1,18 +1,42 @@ #!/bin/bash -if [[ -z "${FIX_WWW_DATA}" ]]; then - echo "[apache2] env FIX_WWW_DATA is not set. Skipping..." -elif [ "${FIX_WWW_DATA}" == "false" ]; then - echo "[apache2] env FIX_WWW_DATA is set to false. Skipping..." -elif [ "${FIX_WWW_DATA}" == "true" ]; then - echo "[apache2] Changing permissions for /var/www path. Dont worry, please wait." - chown www-data:www-data /var/www -R - echo "[apache2] Done" -else - echo "[apache2] env FIX_WWW_DATA is set to strange value. Skipping..." -fi +set -e echo "[apache2] Starting up" -source /etc/apache2/envvars + +case "${FIX_WWW_DATA}" in + "") + echo "[apache2] env FIX_WWW_DATA is not set. Skipping..." + ;; + "false") + echo "[apache2] env FIX_WWW_DATA is set to false. Skipping..." + ;; + "true") + echo "[apache2] Changing permissions for /var/www path. Please wait." + if [ -d "/var/www" ]; then + chown www-data:www-data /var/www -R + if [ $? -eq 0 ]; then + echo "[apache2] Permissions changed successfully." + else + echo "[apache2] Error changing permissions for /var/www." + exit 1 + fi + else + echo "[apache2] /var/www directory not found. Skipping permission change." + fi + ;; + *) + echo "[apache2] env FIX_WWW_DATA is set to an invalid value. Skipping..." + ;; +esac + +if [ -f /etc/apache2/envvars ]; then + source /etc/apache2/envvars +else + echo "[apache2] Warning: /etc/apache2/envvars not found." +fi + tail -F /var/log/apache2/* & + +echo "[apache2] Starting Apache in the foreground." exec apache2 -D FOREGROUND diff --git a/linux/ecosystem/apache2/php8.3/Dockerfile b/linux/ecosystem/apache2/php8.3/Dockerfile index ad62de5ac..add1c6f7e 100644 --- a/linux/ecosystem/apache2/php8.3/Dockerfile +++ b/linux/ecosystem/apache2/php8.3/Dockerfile @@ -127,7 +127,7 @@ RUN updatedb RUN chown -Rf www-data:www-data /var/www #Final config -VOLUME ["/var/www"] +VOLUME ["/var/www", "/var/log/apache2", "/var/run/apache2"] WORKDIR /var/www/ EXPOSE 80 443 diff --git a/linux/ecosystem/apache2/php8.3/docker-entrypoint.sh b/linux/ecosystem/apache2/php8.3/docker-entrypoint.sh index b421b8648..5fe464552 100755 --- a/linux/ecosystem/apache2/php8.3/docker-entrypoint.sh +++ b/linux/ecosystem/apache2/php8.3/docker-entrypoint.sh @@ -1,18 +1,42 @@ #!/bin/bash -if [[ -z "${FIX_WWW_DATA}" ]]; then - echo "[apache2] env FIX_WWW_DATA is not set. Skipping..." -elif [ "${FIX_WWW_DATA}" == "false" ]; then - echo "[apache2] env FIX_WWW_DATA is set to false. Skipping..." -elif [ "${FIX_WWW_DATA}" == "true" ]; then - echo "[apache2] Changing permissions for /var/www path. Dont worry, please wait." - chown www-data:www-data /var/www -R - echo "[apache2] Done" -else - echo "[apache2] env FIX_WWW_DATA is set to strange value. Skipping..." -fi +set -e echo "[apache2] Starting up" -source /etc/apache2/envvars + +case "${FIX_WWW_DATA}" in + "") + echo "[apache2] env FIX_WWW_DATA is not set. Skipping..." + ;; + "false") + echo "[apache2] env FIX_WWW_DATA is set to false. Skipping..." + ;; + "true") + echo "[apache2] Changing permissions for /var/www path. Please wait." + if [ -d "/var/www" ]; then + chown www-data:www-data /var/www -R + if [ $? -eq 0 ]; then + echo "[apache2] Permissions changed successfully." + else + echo "[apache2] Error changing permissions for /var/www." + exit 1 + fi + else + echo "[apache2] /var/www directory not found. Skipping permission change." + fi + ;; + *) + echo "[apache2] env FIX_WWW_DATA is set to an invalid value. Skipping..." + ;; +esac + +if [ -f /etc/apache2/envvars ]; then + source /etc/apache2/envvars +else + echo "[apache2] Warning: /etc/apache2/envvars not found." +fi + tail -F /var/log/apache2/* & + +echo "[apache2] Starting Apache in the foreground." exec apache2 -D FOREGROUND diff --git a/linux/ecosystem/apache2/php8.4/Dockerfile b/linux/ecosystem/apache2/php8.4/Dockerfile index 2baeee73e..88a96a75f 100644 --- a/linux/ecosystem/apache2/php8.4/Dockerfile +++ b/linux/ecosystem/apache2/php8.4/Dockerfile @@ -127,7 +127,7 @@ RUN updatedb RUN chown -Rf www-data:www-data /var/www #Final config -VOLUME ["/var/www"] +VOLUME ["/var/www", "/var/log/apache2", "/var/run/apache2"] WORKDIR /var/www/ EXPOSE 80 443 diff --git a/linux/ecosystem/apache2/php8.4/docker-entrypoint.sh b/linux/ecosystem/apache2/php8.4/docker-entrypoint.sh index b421b8648..5fe464552 100755 --- a/linux/ecosystem/apache2/php8.4/docker-entrypoint.sh +++ b/linux/ecosystem/apache2/php8.4/docker-entrypoint.sh @@ -1,18 +1,42 @@ #!/bin/bash -if [[ -z "${FIX_WWW_DATA}" ]]; then - echo "[apache2] env FIX_WWW_DATA is not set. Skipping..." -elif [ "${FIX_WWW_DATA}" == "false" ]; then - echo "[apache2] env FIX_WWW_DATA is set to false. Skipping..." -elif [ "${FIX_WWW_DATA}" == "true" ]; then - echo "[apache2] Changing permissions for /var/www path. Dont worry, please wait." - chown www-data:www-data /var/www -R - echo "[apache2] Done" -else - echo "[apache2] env FIX_WWW_DATA is set to strange value. Skipping..." -fi +set -e echo "[apache2] Starting up" -source /etc/apache2/envvars + +case "${FIX_WWW_DATA}" in + "") + echo "[apache2] env FIX_WWW_DATA is not set. Skipping..." + ;; + "false") + echo "[apache2] env FIX_WWW_DATA is set to false. Skipping..." + ;; + "true") + echo "[apache2] Changing permissions for /var/www path. Please wait." + if [ -d "/var/www" ]; then + chown www-data:www-data /var/www -R + if [ $? -eq 0 ]; then + echo "[apache2] Permissions changed successfully." + else + echo "[apache2] Error changing permissions for /var/www." + exit 1 + fi + else + echo "[apache2] /var/www directory not found. Skipping permission change." + fi + ;; + *) + echo "[apache2] env FIX_WWW_DATA is set to an invalid value. Skipping..." + ;; +esac + +if [ -f /etc/apache2/envvars ]; then + source /etc/apache2/envvars +else + echo "[apache2] Warning: /etc/apache2/envvars not found." +fi + tail -F /var/log/apache2/* & + +echo "[apache2] Starting Apache in the foreground." exec apache2 -D FOREGROUND diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/php/php5.6/Dockerfile b/linux/ecosystem/epicmorg/debian/12-bookworm/php/php5.6/Dockerfile index 1f8ac5364..d090c9f96 100644 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/php/php5.6/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/php/php5.6/Dockerfile @@ -108,7 +108,7 @@ RUN apt-get update && \ php5.6-zmq \ smbclient libsmbclient \ sendmail && \ - ln -sf /etc/ssl/dhparam.pem /etc/php/dhparam.pem && \ + ln -sfv /etc/ssl/dhparam.pem /etc/php/dhparam.pem && \ update-alternatives --set php /usr/bin/php5.6 && \ # pear clear-cache && \ pear update-channels && \ diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/php/php7.0/Dockerfile b/linux/ecosystem/epicmorg/debian/12-bookworm/php/php7.0/Dockerfile index e1454cad2..5e1b581d0 100644 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/php/php7.0/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/php/php7.0/Dockerfile @@ -163,7 +163,7 @@ RUN apt-get update && \ php7.0-pgsql \ php7.0-phpdbg \ php7.0-pinba \ - php7.0-pq \ +# php7.0-pq \ php7.0-propro \ php7.0-protobuf \ php7.0-ps \ @@ -201,7 +201,7 @@ RUN apt-get update && \ php7.0-zstd \ smbclient libsmbclient \ sendmail && \ - ln -sf /etc/ssl/dhparam.pem /etc/php/dhparam.pem && \ + ln -sfv /etc/ssl/dhparam.pem /etc/php/dhparam.pem && \ update-alternatives --set php /usr/bin/php7.0 && \ # pear clear-cache && \ pear update-channels && \ diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/php/php7.1/Dockerfile b/linux/ecosystem/epicmorg/debian/12-bookworm/php/php7.1/Dockerfile index 4762ee833..fb5ef13eb 100644 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/php/php7.1/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/php/php7.1/Dockerfile @@ -164,7 +164,7 @@ RUN apt-get update && \ php7.1-pgsql \ php7.1-phpdbg \ php7.1-pinba \ - php7.1-pq \ +# php7.1-pq \ php7.1-propro \ php7.1-protobuf \ php7.1-ps \ @@ -203,7 +203,7 @@ RUN apt-get update && \ php7.1-zstd \ smbclient libsmbclient \ sendmail && \ - ln -sf /etc/ssl/dhparam.pem /etc/php/dhparam.pem && \ + ln -sfv /etc/ssl/dhparam.pem /etc/php/dhparam.pem && \ update-alternatives --set php /usr/bin/php7.1 && \ # pear clear-cache && \ pear update-channels && \ diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/php/php7.2/Dockerfile b/linux/ecosystem/epicmorg/debian/12-bookworm/php/php7.2/Dockerfile index 29f920371..1ca179f8a 100644 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/php/php7.2/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/php/php7.2/Dockerfile @@ -166,7 +166,7 @@ RUN apt-get update && \ php7.2-phalcon4 \ php7.2-phpdbg \ php7.2-pinba \ - php7.2-pq \ +# php7.2-pq \ php7.2-propro \ php7.2-protobuf \ php7.2-ps \ @@ -204,7 +204,7 @@ RUN apt-get update && \ php7.2-zstd \ smbclient libsmbclient \ sendmail && \ - ln -sf /etc/ssl/dhparam.pem /etc/php/dhparam.pem && \ + ln -sfv /etc/ssl/dhparam.pem /etc/php/dhparam.pem && \ update-alternatives --set php /usr/bin/php7.2 && \ # pear clear-cache && \ pear update-channels && \ diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/php/php7.3/Dockerfile b/linux/ecosystem/epicmorg/debian/12-bookworm/php/php7.3/Dockerfile index caca40e62..f34b10fe2 100644 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/php/php7.3/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/php/php7.3/Dockerfile @@ -166,7 +166,7 @@ RUN apt-get update && \ php7.3-phalcon4 \ php7.3-phpdbg \ php7.3-pinba \ - php7.3-pq \ +# php7.3-pq \ php7.3-propro \ php7.3-protobuf \ php7.3-ps \ @@ -205,7 +205,7 @@ RUN apt-get update && \ php7.3-zstd \ smbclient libsmbclient \ sendmail && \ - ln -sf /etc/ssl/dhparam.pem /etc/php/dhparam.pem && \ + ln -sfv /etc/ssl/dhparam.pem /etc/php/dhparam.pem && \ update-alternatives --set php /usr/bin/php7.3 && \ # pear clear-cache && \ pear update-channels && \ diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/php/php7.4/Dockerfile b/linux/ecosystem/epicmorg/debian/12-bookworm/php/php7.4/Dockerfile index 3b3b481dd..27413149b 100644 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/php/php7.4/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/php/php7.4/Dockerfile @@ -174,7 +174,7 @@ RUN apt-get update && \ # php7.4-phalcon5 \ php7.4-phpdbg \ php7.4-pinba \ - php7.4-pq \ +# php7.4-pq \ php7.4-propro \ php7.4-protobuf \ php7.4-ps \ @@ -212,7 +212,7 @@ RUN apt-get update && \ php7.4-zstd \ smbclient libsmbclient \ sendmail && \ - ln -sf /etc/ssl/dhparam.pem /etc/php/dhparam.pem && \ + ln -sfv /etc/ssl/dhparam.pem /etc/php/dhparam.pem && \ update-alternatives --set php /usr/bin/php7.4 && \ # pear clear-cache && \ pear update-channels && \ diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/php/php8.0/Dockerfile b/linux/ecosystem/epicmorg/debian/12-bookworm/php/php8.0/Dockerfile index 18f4deafe..6571bd75f 100644 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/php/php8.0/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/php/php8.0/Dockerfile @@ -72,7 +72,7 @@ RUN apt-get update && \ php8.0-phalcon5 \ php8.0-phpdbg \ php8.0-pinba \ - php8.0-pq \ +# php8.0-pq \ php8.0-propro \ php8.0-protobuf \ php8.0-ps \ @@ -110,7 +110,7 @@ RUN apt-get update && \ php8.0-zstd \ smbclient libsmbclient \ sendmail && \ - ln -sf /etc/ssl/dhparam.pem /etc/php/dhparam.pem && \ + ln -sfv /etc/ssl/dhparam.pem /etc/php/dhparam.pem && \ update-alternatives --set php /usr/bin/php8.0 && \ # pear clear-cache && \ pear update-channels && \ diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/php/php8.1/Dockerfile b/linux/ecosystem/epicmorg/debian/12-bookworm/php/php8.1/Dockerfile index 82c013c35..d32eeabc8 100644 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/php/php8.1/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/php/php8.1/Dockerfile @@ -72,7 +72,7 @@ RUN apt-get update && \ php8.1-phalcon5 \ php8.1-phpdbg \ php8.1-pinba \ - php8.1-pq \ +# php8.1-pq \ php8.1-propro \ php8.1-protobuf \ php8.1-ps \ @@ -110,7 +110,7 @@ RUN apt-get update && \ php8.1-zstd \ smbclient libsmbclient \ sendmail && \ - ln -sf /etc/ssl/dhparam.pem /etc/php/dhparam.pem && \ + ln -sfv /etc/ssl/dhparam.pem /etc/php/dhparam.pem && \ update-alternatives --set php /usr/bin/php8.1 && \ # pear clear-cache && \ pear update-channels && \ diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/php/php8.2/Dockerfile b/linux/ecosystem/epicmorg/debian/12-bookworm/php/php8.2/Dockerfile index 209a8bced..4795f929a 100644 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/php/php8.2/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/php/php8.2/Dockerfile @@ -72,7 +72,7 @@ RUN apt-get update && \ php8.2-phalcon5 \ php8.2-phpdbg \ php8.2-pinba \ - php8.2-pq \ +# php8.2-pq \ php8.2-propro \ php8.2-protobuf \ php8.2-ps \ @@ -110,7 +110,7 @@ RUN apt-get update && \ php8.2-zstd \ smbclient libsmbclient \ sendmail && \ - ln -sf /etc/ssl/dhparam.pem /etc/php/dhparam.pem && \ + ln -sfv /etc/ssl/dhparam.pem /etc/php/dhparam.pem && \ update-alternatives --set php /usr/bin/php8.2 && \ # pear clear-cache && \ pear update-channels && \ diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/php/php8.3/Dockerfile b/linux/ecosystem/epicmorg/debian/12-bookworm/php/php8.3/Dockerfile index d1080c95d..4f7835d44 100644 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/php/php8.3/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/php/php8.3/Dockerfile @@ -71,7 +71,7 @@ RUN apt-get update && \ php8.3-phalcon5 \ php8.3-phpdbg \ php8.3-pinba \ - php8.3-pq \ +# php8.3-pq \ php8.3-protobuf \ php8.3-ps \ php8.3-pspell \ @@ -107,7 +107,7 @@ RUN apt-get update && \ php8.3-zstd \ smbclient libsmbclient \ sendmail && \ - ln -sf /etc/ssl/dhparam.pem /etc/php/dhparam.pem && \ + ln -sfv /etc/ssl/dhparam.pem /etc/php/dhparam.pem && \ update-alternatives --set php /usr/bin/php8.3 && \ # pear clear-cache && \ pear update-channels && \ diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/php/php8.4/Dockerfile b/linux/ecosystem/epicmorg/debian/12-bookworm/php/php8.4/Dockerfile index 094924c1c..849d7f0e0 100644 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/php/php8.4/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/php/php8.4/Dockerfile @@ -54,7 +54,7 @@ RUN apt-get update && \ php8.4-zip \ smbclient libsmbclient \ sendmail && \ - ln -sf /etc/ssl/dhparam.pem /etc/php/dhparam.pem && \ + ln -sfv /etc/ssl/dhparam.pem /etc/php/dhparam.pem && \ update-alternatives --set php /usr/bin/php8.4 && \ # pear clear-cache && \ pear update-channels && \ diff --git a/linux/ecosystem/nginx/1.14.2/php/Dockerfile b/linux/ecosystem/nginx/1.14.2/php/Dockerfile index ff8d3eca9..ac4a9309d 100644 --- a/linux/ecosystem/nginx/1.14.2/php/Dockerfile +++ b/linux/ecosystem/nginx/1.14.2/php/Dockerfile @@ -190,7 +190,7 @@ RUN apt-get update && \ xmlwriter \ xsl \ yaml && \ - ln -sf /etc/ssl/dhparam.pem /etc/php/dhparam.pem && \ + ln -sfv /etc/ssl/dhparam.pem /etc/php/dhparam.pem && \ php -v ################################################################## diff --git a/linux/ecosystem/nginx/1.15.12/php/Dockerfile b/linux/ecosystem/nginx/1.15.12/php/Dockerfile index ff8d3eca9..ac4a9309d 100644 --- a/linux/ecosystem/nginx/1.15.12/php/Dockerfile +++ b/linux/ecosystem/nginx/1.15.12/php/Dockerfile @@ -190,7 +190,7 @@ RUN apt-get update && \ xmlwriter \ xsl \ yaml && \ - ln -sf /etc/ssl/dhparam.pem /etc/php/dhparam.pem && \ + ln -sfv /etc/ssl/dhparam.pem /etc/php/dhparam.pem && \ php -v ################################################################## diff --git a/linux/ecosystem/nginx/1.16.1/php/Dockerfile b/linux/ecosystem/nginx/1.16.1/php/Dockerfile index ff8d3eca9..ac4a9309d 100644 --- a/linux/ecosystem/nginx/1.16.1/php/Dockerfile +++ b/linux/ecosystem/nginx/1.16.1/php/Dockerfile @@ -190,7 +190,7 @@ RUN apt-get update && \ xmlwriter \ xsl \ yaml && \ - ln -sf /etc/ssl/dhparam.pem /etc/php/dhparam.pem && \ + ln -sfv /etc/ssl/dhparam.pem /etc/php/dhparam.pem && \ php -v ################################################################## diff --git a/linux/ecosystem/nginx/1.17.10/php/Dockerfile b/linux/ecosystem/nginx/1.17.10/php/Dockerfile index ff8d3eca9..ac4a9309d 100644 --- a/linux/ecosystem/nginx/1.17.10/php/Dockerfile +++ b/linux/ecosystem/nginx/1.17.10/php/Dockerfile @@ -190,7 +190,7 @@ RUN apt-get update && \ xmlwriter \ xsl \ yaml && \ - ln -sf /etc/ssl/dhparam.pem /etc/php/dhparam.pem && \ + ln -sfv /etc/ssl/dhparam.pem /etc/php/dhparam.pem && \ php -v ################################################################## diff --git a/linux/ecosystem/nginx/1.18.0/php/Dockerfile b/linux/ecosystem/nginx/1.18.0/php/Dockerfile index ff8d3eca9..ac4a9309d 100644 --- a/linux/ecosystem/nginx/1.18.0/php/Dockerfile +++ b/linux/ecosystem/nginx/1.18.0/php/Dockerfile @@ -190,7 +190,7 @@ RUN apt-get update && \ xmlwriter \ xsl \ yaml && \ - ln -sf /etc/ssl/dhparam.pem /etc/php/dhparam.pem && \ + ln -sfv /etc/ssl/dhparam.pem /etc/php/dhparam.pem && \ php -v ################################################################## diff --git a/linux/ecosystem/nginx/1.19.10/php/Dockerfile b/linux/ecosystem/nginx/1.19.10/php/Dockerfile index ff8d3eca9..ac4a9309d 100644 --- a/linux/ecosystem/nginx/1.19.10/php/Dockerfile +++ b/linux/ecosystem/nginx/1.19.10/php/Dockerfile @@ -190,7 +190,7 @@ RUN apt-get update && \ xmlwriter \ xsl \ yaml && \ - ln -sf /etc/ssl/dhparam.pem /etc/php/dhparam.pem && \ + ln -sfv /etc/ssl/dhparam.pem /etc/php/dhparam.pem && \ php -v ################################################################## diff --git a/linux/ecosystem/nginx/1.20.1/php/Dockerfile b/linux/ecosystem/nginx/1.20.1/php/Dockerfile index ff8d3eca9..ac4a9309d 100644 --- a/linux/ecosystem/nginx/1.20.1/php/Dockerfile +++ b/linux/ecosystem/nginx/1.20.1/php/Dockerfile @@ -190,7 +190,7 @@ RUN apt-get update && \ xmlwriter \ xsl \ yaml && \ - ln -sf /etc/ssl/dhparam.pem /etc/php/dhparam.pem && \ + ln -sfv /etc/ssl/dhparam.pem /etc/php/dhparam.pem && \ php -v ################################################################## diff --git a/linux/ecosystem/nginx/1.21.3/php/Dockerfile b/linux/ecosystem/nginx/1.21.3/php/Dockerfile index ff8d3eca9..ac4a9309d 100644 --- a/linux/ecosystem/nginx/1.21.3/php/Dockerfile +++ b/linux/ecosystem/nginx/1.21.3/php/Dockerfile @@ -190,7 +190,7 @@ RUN apt-get update && \ xmlwriter \ xsl \ yaml && \ - ln -sf /etc/ssl/dhparam.pem /etc/php/dhparam.pem && \ + ln -sfv /etc/ssl/dhparam.pem /etc/php/dhparam.pem && \ php -v ################################################################## diff --git a/linux/ecosystem/nginx/1.21.6/php/Dockerfile b/linux/ecosystem/nginx/1.21.6/php/Dockerfile index ff8d3eca9..ac4a9309d 100644 --- a/linux/ecosystem/nginx/1.21.6/php/Dockerfile +++ b/linux/ecosystem/nginx/1.21.6/php/Dockerfile @@ -190,7 +190,7 @@ RUN apt-get update && \ xmlwriter \ xsl \ yaml && \ - ln -sf /etc/ssl/dhparam.pem /etc/php/dhparam.pem && \ + ln -sfv /etc/ssl/dhparam.pem /etc/php/dhparam.pem && \ php -v ################################################################## diff --git a/linux/ecosystem/nginx/latest/mainline/php/Dockerfile b/linux/ecosystem/nginx/latest/mainline/php/Dockerfile index b86c83210..0cd618250 100644 --- a/linux/ecosystem/nginx/latest/mainline/php/Dockerfile +++ b/linux/ecosystem/nginx/latest/mainline/php/Dockerfile @@ -161,7 +161,7 @@ RUN apt-get update && \ php7.4-geoip \ smbclient libsmbclient \ sendmail && \ - ln -sf /etc/ssl/dhparam.pem /etc/php/dhparam.pem && \ + ln -sfv /etc/ssl/dhparam.pem /etc/php/dhparam.pem && \ update-alternatives --set php /usr/bin/php7.4 && \ pear upgrade && \ pear update-channels && \ diff --git a/linux/ecosystem/nginx/latest/quic/php/Dockerfile b/linux/ecosystem/nginx/latest/quic/php/Dockerfile index 7412dc82e..06270fff3 100644 --- a/linux/ecosystem/nginx/latest/quic/php/Dockerfile +++ b/linux/ecosystem/nginx/latest/quic/php/Dockerfile @@ -190,7 +190,7 @@ RUN apt-get update && \ xmlwriter \ xsl \ yaml && \ - ln -sf /etc/ssl/dhparam.pem /etc/php/dhparam.pem && \ + ln -sfv /etc/ssl/dhparam.pem /etc/php/dhparam.pem && \ php -v ##################################################################