From 588e754ce11996a3764e942f71f13afe57ea7322 Mon Sep 17 00:00:00 2001
From: Matthew Baggett <matthew@baggett.me>
Date: Thu, 19 Mar 2020 12:58:41 +0100
Subject: [PATCH] Symlink FPM config to CLI & PHPDBG

---
 Dockerfile | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 4466439..2ed3357 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -101,6 +101,7 @@ RUN apt-get -qq update && \
     apt-get autoremove -yqq && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && \
+    # Configure FPM
     sed -i "s/cgi.fix_pathinfo.*/cgi.fix_pathinfo=0/g" /etc/php/$PHP_VERSION/fpm/php.ini && \
     sed -i "s|memory_limit.*|memory_limit = $PHP_MEMORY_LIMIT|g" /etc/php/$PHP_VERSION/fpm/php.ini && \
     sed -i "s/upload_max_filesize.*/upload_max_filesize = $PHP_DATA_MAX_SIZE/g" /etc/php/$PHP_VERSION/fpm/php.ini && \
@@ -114,15 +115,20 @@ RUN apt-get -qq update && \
     sed -i "s|;php_admin_value\[error_log\].*|php_admin_value\[error_log\] = /var/log/fpm-php.log|g" /etc/php/$PHP_VERSION/fpm/pool.d/www.conf && \
     sed -i "s|;php_admin_flag\[log_errors\].*|php_admin_flag\[log_errors\] = on|g" /etc/php/$PHP_VERSION/fpm/pool.d/www.conf && \
     sed -i "s|;php_admin_value\[memory_limit\].*|php_admin_value\[memory_limit\] = $PHP_MEMORY_LIMIT|g" /etc/php/$PHP_VERSION/fpm/pool.d/www.conf && \
-    # Copy fpm config to cli
-    cp /etc/php/$PHP_VERSION/fpm/php.ini /etc/php/$PHP_VERSION/cli/php.ini  && \
+    # Symlink FPM config to CLI & PHPDBG
+    rm /etc/php/$PHP_VERSION/cli/php.ini /etc/php/$PHP_VERSION/phpdbg/php.ini && \
+    ln -s /etc/php/$PHP_VERSION/fpm/php.ini /etc/php/$PHP_VERSION/cli/php.ini && \
+    ln -s /etc/php/$PHP_VERSION/fpm/php.ini /etc/php/$PHP_VERSION/phpdbg/php.ini && \
+    # Configuration hack for PHP5.6
     if test "$PHP_VERSION" = "5.6"  ; then \
         echo "Skipping clear_env"; \
     else \
         echo "clear_env=no" >> /etc/php/$PHP_VERSION/fpm/php-fpm.conf; \
         echo "clear_env=no" >> /etc/php/$PHP_VERSION/fpm/pool.d/www.ini; \
     fi && \
+    # Create run lock dir for php
     mkdir -p /run/php && \
+    # Destroy default html root, and link /app in its place.
     rm -fr /var/www/html && \
     ln -s /app /var/www/html && \
     # Move nginx configuration into place