Resolve conflict (#1452)

images/runtime/php-fpm/template.base.Dockerfile

@@ -103,31 +103,13 @@ RUN { \
                 echo 'opcache.enable_cli=1'; \
     } > /usr/local/etc/php/conf.d/opcache-recommended.ini
 
+# NOTE: zend_extension=opcache is already configured via docker-php-ext-install, above
 RUN { \
                 echo 'error_log=/var/log/apache2/php-error.log'; \
                 echo 'display_errors=Off'; \
                 echo 'log_errors=On'; \
                 echo 'display_startup_errors=Off'; \
                 echo 'date.timezone=UTC'; \
-                echo 'zend_extension=opcache'; \
-    } > /usr/local/etc/php/conf.d/php.ini
-
-RUN { \
-                echo 'opcache.memory_consumption=128'; \
-                echo 'opcache.interned_strings_buffer=8'; \
-                echo 'opcache.max_accelerated_files=4000'; \
-                echo 'opcache.revalidate_freq=60'; \
-                echo 'opcache.fast_shutdown=1'; \
-                echo 'opcache.enable_cli=1'; \
-    } > /usr/local/etc/php/conf.d/opcache-recommended.ini
-
-RUN { \
-                echo 'error_log=/var/log/apache2/php-error.log'; \
-                echo 'display_errors=Off'; \
-                echo 'log_errors=On'; \
-                echo 'display_startup_errors=Off'; \
-                echo 'date.timezone=UTC'; \
-                echo 'zend_extension=opcache'; \
     } > /usr/local/etc/php/conf.d/php.ini
 
 RUN set -x \

images/runtime/php/7.4/base.bullseye.Dockerfile

@@ -123,13 +123,13 @@ RUN { \
                 echo 'opcache.enable_cli=1'; \
     } > /usr/local/etc/php/conf.d/opcache-recommended.ini
 
+# NOTE: zend_extension=opcache is already configured via docker-php-ext-install, above
 RUN { \
                 echo 'error_log=/var/log/apache2/php-error.log'; \
                 echo 'display_errors=Off'; \
                 echo 'log_errors=On'; \
                 echo 'display_startup_errors=Off'; \
                 echo 'date.timezone=UTC'; \
-                echo 'zend_extension=opcache'; \
     } > /usr/local/etc/php/conf.d/php.ini
 
 RUN set -x \

images/runtime/php/8.0/base.buster.Dockerfile

@@ -117,13 +117,13 @@ RUN { \
                 echo 'opcache.enable_cli=1'; \
     } > /usr/local/etc/php/conf.d/opcache-recommended.ini
 
+# NOTE: zend_extension=opcache is already configured via docker-php-ext-install, above
 RUN { \
                 echo 'error_log=/var/log/apache2/php-error.log'; \
                 echo 'display_errors=Off'; \
                 echo 'log_errors=On'; \
                 echo 'display_startup_errors=Off'; \
                 echo 'date.timezone=UTC'; \
-                echo 'zend_extension=opcache'; \
     } > /usr/local/etc/php/conf.d/php.ini
 
 RUN set -x \

images/runtime/php/8.1/base.buster.Dockerfile

@@ -118,13 +118,13 @@ RUN { \
                 echo 'opcache.enable_cli=1'; \
     } > /usr/local/etc/php/conf.d/opcache-recommended.ini
 
+# NOTE: zend_extension=opcache is already configured via docker-php-ext-install, above
 RUN { \
                 echo 'error_log=/var/log/apache2/php-error.log'; \
                 echo 'display_errors=Off'; \
                 echo 'log_errors=On'; \
                 echo 'display_startup_errors=Off'; \
                 echo 'date.timezone=UTC'; \
-                echo 'zend_extension=opcache'; \
     } > /usr/local/etc/php/conf.d/php.ini
 
 RUN set -x \

images/runtime/php/template.base.Dockerfile

@@ -123,13 +123,13 @@ RUN { \
                 echo 'opcache.enable_cli=1'; \
     } > /usr/local/etc/php/conf.d/opcache-recommended.ini
 
+# NOTE: zend_extension=opcache is already configured via docker-php-ext-install, above
 RUN { \
                 echo 'error_log=/var/log/apache2/php-error.log'; \
                 echo 'display_errors=Off'; \
                 echo 'log_errors=On'; \
                 echo 'display_startup_errors=Off'; \
                 echo 'date.timezone=UTC'; \
-                echo 'zend_extension=opcache'; \
     } > /usr/local/etc/php/conf.d/php.ini
 
 RUN set -x \