From 84669c28f2175cbe2e3b29f3a51480351cad15e0 Mon Sep 17 00:00:00 2001
From: Christoph Kluge <christoph.kluge@fau.de>
Date: Fri, 10 Sep 2021 17:34:20 +0200
Subject: [PATCH] add opcache, make xdebug install configurable

---
 .env               |  1 +
 docker-compose.yml |  1 +
 php-fpm/Dockerfile | 24 +++++++++++++-----------
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/.env b/.env
index cb0ab08..cbd9902 100644
--- a/.env
+++ b/.env
@@ -9,6 +9,7 @@ APP_ENVIRONMENT=prod
 ########################################################################
 # PHP
 ########################################################################
+PHP_XDEBUG_INIT=false
 PHP_XDEBUG_MODE=debug,develop
 PHP_XDEBUG_CLIENT_PORT=9003
 #> LINUX: 'docker0' interface IP of host
diff --git a/docker-compose.yml b/docker-compose.yml
index 8dfa306..f382705 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -27,6 +27,7 @@ services:
         build:
             context: ./php-fpm
             args:
+                PHP_XDEBUG_INIT: ${PHP_XDEBUG_INIT}
                 PHP_XDEBUG_MODE: ${PHP_XDEBUG_MODE}
                 PHP_XDEBUG_CLIENT_PORT: ${PHP_XDEBUG_CLIENT_PORT}
                 PHP_XDEBUG_CLIENT_HOST: ${PHP_XDEBUG_CLIENT_HOST}
diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile
index 67b9218..5c18add 100644
--- a/php-fpm/Dockerfile
+++ b/php-fpm/Dockerfile
@@ -8,27 +8,29 @@ RUN apk add --no-cache $PHPIZE_DEPS \
     libldap \
     openldap-dev
 
-RUN pecl install xdebug-3.0.4 \
-    && docker-php-ext-enable xdebug
+RUN docker-php-ext-install ldap \ 
+    mysqli \
+    pdo_mysql \
+    opcache
 
-RUN docker-php-ext-install ldap mysqli pdo_mysql
-
-# Enable php8-xdebug if $PHP_XDEBUG_MODE is not empty
+# Enable php8-xdebug if $PHP_XDEBUG_INIT is true
+ARG PHP_XDEBUG_INIT=false
 ARG PHP_XDEBUG_MODE=off
 ARG PHP_XDEBUG_CLIENT_PORT=5902
 ARG PHP_XDEBUG_CLIENT_HOST=host.docker.internal
 COPY xdebug.ini  /etc/php8/conf.d/xdebug.ini.template
-RUN if [[ "$PHP_XDEBUG_MODE" != "" ]]; then \
+COPY error_reporting.ini /usr/local/etc/php/conf.d/error_reporting.ini
+RUN if [[ "$PHP_XDEBUG_INIT" == "true" ]]; then \
+        pecl install xdebug-3.0.4; \
+        docker-php-ext-enable xdebug; \
         export PHP_XDEBUG_MODE=$PHP_XDEBUG_MODE; \
         export PHP_XDEBUG_CLIENT_PORT=$PHP_XDEBUG_CLIENT_PORT; \
         export PHP_XDEBUG_CLIENT_HOST=$PHP_XDEBUG_CLIENT_HOST; \
         envsubst < /etc/php8/conf.d/xdebug.ini.template > /etc/php8/conf.d/xdebug.ini; \
+        cp /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini.back; \
+        cp /etc/php8/conf.d/xdebug.ini /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini; \
+        rm -f /etc/php8/conf.d/xdebug.ini.template; \
     fi
-RUN rm -f /etc/php8/conf.d/xdebug.ini.template
-
-RUN cp /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini.back
-RUN cp /etc/php8/conf.d/xdebug.ini /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
-COPY error_reporting.ini /usr/local/etc/php/conf.d/error_reporting.ini
 
 RUN curl -sS https://getcomposer.org/installer | tee composer-setup.php \
     && php composer-setup.php && rm composer-setup.php* \