remving default PHP-FPM PHP conf + linking apache2 and fpm with the default php conf

Author: Julien Neuhart

Dockerfile.slim.apache

@@ -69,9 +69,15 @@ RUN echo '%sudo ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
 
 ENV TEMPLATE_PHP_INI=development
 
-# Let's remove the default php.ini files (they will be copied from TEMPLATE_PHP_INI)
-RUN rm /etc/php/${PHP_VERSION}/cli/php.ini &&\
-    rm /etc/php/${PHP_VERSION}/apache2/php.ini
+# Let's remove the default CLI php.ini file (it will be copied from TEMPLATE_PHP_INI)
+RUN rm /etc/php/${PHP_VERSION}/cli/php.ini
+
+
+# Let's remove the default Apache php.ini file (it will be copied from TEMPLATE_PHP_INI)
+RUN rm /etc/php/${PHP_VERSION}/apache2/php.ini
+
+
+
 
 
 # |--------------------------------------------------------------------------

Dockerfile.slim.cli

@@ -69,9 +69,12 @@ RUN echo '%sudo ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
 
 ENV TEMPLATE_PHP_INI=development
 
-# Let's remove the default php.ini files (they will be copied from TEMPLATE_PHP_INI)
-RUN rm /etc/php/${PHP_VERSION}/cli/php.ini &&\
-    rm /etc/php/${PHP_VERSION}/apache2/php.ini
+# Let's remove the default CLI php.ini file (it will be copied from TEMPLATE_PHP_INI)
+RUN rm /etc/php/${PHP_VERSION}/cli/php.ini
+
+
+
+
 
 
 # |--------------------------------------------------------------------------

Dockerfile.slim.fpm

@@ -69,9 +69,15 @@ RUN echo '%sudo ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
 
 ENV TEMPLATE_PHP_INI=development
 
-# Let's remove the default php.ini files (they will be copied from TEMPLATE_PHP_INI)
-RUN rm /etc/php/${PHP_VERSION}/cli/php.ini &&\
-    rm /etc/php/${PHP_VERSION}/apache2/php.ini
+# Let's remove the default CLI php.ini file (it will be copied from TEMPLATE_PHP_INI)
+RUN rm /etc/php/${PHP_VERSION}/cli/php.ini
+
+
+
+
+# Let's remove the default PHP-FPM php.ini file (it will be copied from TEMPLATE_PHP_INI)
+RUN rm /etc/php/${PHP_VERSION}/fpm/php.ini
+
 
 
 # |--------------------------------------------------------------------------

utils/Dockerfile.slim.blueprint

@@ -71,9 +71,18 @@ RUN echo '%sudo ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
 
 ENV TEMPLATE_PHP_INI=development
 
-# Let's remove the default php.ini files (they will be copied from TEMPLATE_PHP_INI)
-RUN rm /etc/php/${PHP_VERSION}/cli/php.ini &&\
-    rm /etc/php/${PHP_VERSION}/apache2/php.ini
+# Let's remove the default CLI php.ini file (it will be copied from TEMPLATE_PHP_INI)
+RUN rm /etc/php/${PHP_VERSION}/cli/php.ini
+
+{{if eq $variant "apache" }}
+# Let's remove the default Apache php.ini file (it will be copied from TEMPLATE_PHP_INI)
+RUN rm /etc/php/${PHP_VERSION}/apache2/php.ini
+{{end}}
+
+{{if eq $variant "fpm" }}
+# Let's remove the default PHP-FPM php.ini file (it will be copied from TEMPLATE_PHP_INI)
+RUN rm /etc/php/${PHP_VERSION}/fpm/php.ini
+{{end}}
 
 
 # |--------------------------------------------------------------------------

utils/docker-entrypoint-as-root.sh

@@ -7,11 +7,18 @@ touch /opt/container_started
 
 # Let's apply the requested php.ini file
 
-# TODO: APACHE AND PHP-FPM
 if [ ! -f /etc/php/${PHP_VERSION}/cli/php.ini ] || [ -L /etc/php/${PHP_VERSION}/cli/php.ini ]; then
     ln -sf /usr/lib/php/${PHP_VERSION}/php.ini-${TEMPLATE_PHP_INI} /etc/php/${PHP_VERSION}/cli/php.ini
 fi
 
+if [[ "$IMAGE_VARIANT" == "apache" ]]; then
+    ln -sf /usr/lib/php/${PHP_VERSION}/php.ini-${TEMPLATE_PHP_INI} /etc/php/${PHP_VERSION}/apache2/php.ini
+fi
+
+if [[ "$IMAGE_VARIANT" == "fpm" ]]; then
+    ln -sf /usr/lib/php/${PHP_VERSION}/php.ini-${TEMPLATE_PHP_INI} /etc/php/${PHP_VERSION}/fpm/php.ini
+fi
+
 # Let's find the user to use for commands.
 # If $DOCKER_USER, let's use this. Otherwise, let's find it.
 if [[ "$DOCKER_USER" == "" ]]; then