Fix debug mode with unprivileged images (Fixes #327)

Author: jaydrogers

src/common/etc/entrypoint.d/1-debug-mode.sh

@@ -5,8 +5,8 @@ if [ "$DISABLE_DEFAULT_CONFIG" = false ]; then
     set_php_ini (){
         php_ini_setting=$1
         php_ini_value=$2
-        php_ini_debug_file="$PHP_INI_DIR/php.ini"
-        php_fpm_debug_conf_file="/usr/local/etc/php-fpm.d/zzz-fpm-debug.conf"
+        php_ini_debug_file="$PHP_INI_DIR/conf.d/zzz-serversideup-docker-php-debug.ini"
+        php_fpm_debug_conf_file="/usr/local/etc/php-fpm.d/zzz-docker-php-serversideup-fpm-debug.conf"
 
         echo "$php_ini_setting = $php_ini_value" >> "$php_ini_debug_file"
         echo "ℹ️ NOTICE ($script_name): INI - $php_ini_setting has been set to \"$php_ini_value\"."

src/common/usr/local/bin/docker-php-serversideup-set-file-permissions

@@ -53,14 +53,14 @@ else
     exit 1
 fi
 
-# Function to change ownership of directories
 change_ownership() {
-    for dir in "$@"; do
-        if [ -d "$dir" ]; then
-            chown -R "$OWNER" "$dir"
-            echo "$script_name: Ownership of $dir changed to $OWNER."
+    for path in "$@"; do
+        if [ -e "$path" ]; then
+            chown -R "$OWNER" "$path"
+            echo "$script_name: Ownership of $path changed to $OWNER."
         else
-            echo "$script_name: Directory not found: $dir"
+            echo "$script_name: Directory not found: $path"
+            exit 1
         fi
     done
 }
@@ -69,11 +69,17 @@ change_ownership() {
 case "$OS" in
     debian)
         case "$SERVICE" in
+            cli)
+                DIRS="/var/www/ $PHP_INI_DIR/conf.d/zzz-serversideup-docker-php-debug.ini"
+                ;;
+            fpm)
+                DIRS="/var/www/ /usr/local/etc/php-fpm.d/zzz-docker-php-serversideup-fpm-debug.conf $PHP_INI_DIR/conf.d/zzz-serversideup-docker-php-debug.ini"
+                ;;
             apache)
-                DIRS="/etc/apache2 /etc/ssl/private /var/log/apache2 /var/www/"
+                DIRS="/etc/apache2 /etc/ssl/private /var/log/apache2 /var/www/ /usr/local/etc/php-fpm.d/zzz-docker-php-serversideup-fpm-debug.conf $PHP_INI_DIR/conf.d/zzz-serversideup-docker-php-debug.ini"
                 ;;
             nginx)
-                DIRS="/etc/nginx/ /var/log/nginx /etc/ssl/private /var/cache/nginx/ /var/www/"
+                DIRS="/etc/nginx/ /var/log/nginx /etc/ssl/private /var/cache/nginx/ /var/www/ /usr/local/etc/php-fpm.d/zzz-docker-php-serversideup-fpm-debug.conf $PHP_INI_DIR/conf.d/zzz-serversideup-docker-php-debug.ini"
                 ;;
             unit)
                 DIRS="/var/log/unit /var/run/unit /etc/unit /etc/ssl/private/ /var/lib/unit/ /var/www/"
@@ -86,11 +92,17 @@ case "$OS" in
         ;;
     alpine)
         case "$SERVICE" in
+            cli)
+                DIRS="/var/www/ $PHP_INI_DIR/conf.d/zzz-serversideup-docker-php-debug.ini"
+                ;;
+            fpm)
+                DIRS="/var/www/ /usr/local/etc/php-fpm.d/zzz-docker-php-serversideup-fpm-debug.conf $PHP_INI_DIR/conf.d/zzz-serversideup-docker-php-debug.ini"
+                ;;
             apache)
-                DIRS="/etc/apache2 /etc/ssl/private /var/www/"
+                DIRS="/etc/apache2 /etc/ssl/private /var/www/ /usr/local/etc/php-fpm.d/zzz-docker-php-serversideup-fpm-debug.conf $PHP_INI_DIR/conf.d/zzz-serversideup-docker-php-debug.ini"
                 ;;
             nginx)
-                DIRS="/etc/nginx/ /var/log/nginx /etc/ssl/private /var/lib/nginx /var/www/"
+                DIRS="/etc/nginx/ /var/log/nginx /etc/ssl/private /var/lib/nginx /var/www/ /usr/local/etc/php-fpm.d/zzz-docker-php-serversideup-fpm-debug.conf $PHP_INI_DIR/conf.d/zzz-serversideup-docker-php-debug.ini"
                 ;;
             *)
                 echo "$script_name: Unsupported SERVICE: $SERVICE"

src/common/usr/local/etc/php/conf.d/zzz-serversideup-docker-php-debug.ini

@@ -0,0 +1,4 @@
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+; This is an intentionally empty file. It is used as a placeholder
+; for setting proper file permissions when DEBUG mode is enabled.
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

src/php-fpm.d/usr/local/etc/php-fpm.d/zzz-docker-php-serversideup-fpm-debug.conf

@@ -0,0 +1,4 @@
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+; This is an intentionally empty file. It is used as a placeholder
+; for setting proper file permissions when DEBUG mode is enabled.
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

src/variations/cli/Dockerfile

@@ -68,6 +68,8 @@ RUN docker-php-serversideup-dep-install-alpine "${DEPENDENCY_PACKAGES_ALPINE}" &
 # install composer from Composer's official Docker image
 COPY --from=composer:2 /usr/bin/composer /usr/bin/composer
 
+RUN docker-php-serversideup-set-file-permissions --owner www-data:www-data --service cli
+
 WORKDIR ${APP_BASE_DIR}
 
 USER www-data

src/variations/fpm/Dockerfile

@@ -78,6 +78,8 @@ COPY src/php-fpm.d/ /
 # install composer from Composer's official Docker image
 COPY --from=composer:2 /usr/bin/composer /usr/bin/composer
 
+RUN docker-php-serversideup-set-file-permissions --owner www-data:www-data --service fpm
+
 ENTRYPOINT ["docker-php-serversideup-entrypoint"]
 
 STOPSIGNAL SIGQUIT