Merge branch 'php7dot4' into php8dot0

Author: lucassabreu

Dockerfile

@@ -21,6 +21,8 @@ ENV XDEBUG_REMOTE_PORT=9000
 ENV PHP_EXTENSION_WDDX=1
 ENV PHP_OPENSSL=1
 
+ENV CONTAINER_STARTED_LOCK=/var/lock/container.started
+
 RUN apt-get update && apt-get install -y --no-install-recommends wget vim supervisor libfreetype6-dev libjpeg-dev libjpeg62-turbo-dev \
     libmcrypt-dev libpng-dev libssl-dev libaio1 git libcurl4-openssl-dev libxslt-dev \
     libldap2-dev libicu-dev libc-client-dev libkrb5-dev libsqlite3-dev libedit-dev \
@@ -89,7 +91,10 @@ COPY configs/php-errors.ini /usr/local/etc/php/conf.d/php-errors.ini
 COPY apache-run.sh /usr/bin/apache-run
 COPY ./bin /usr/bin/
 
-RUN chmod a+x /usr/bin/apache-run /usr/bin/xdebug-set-mode
+RUN touch /usr/bin/post-startup-hook && chmod a+x \
+    /usr/bin/apache-run \
+    /usr/bin/xdebug-set-mode \
+    /usr/bin/post-startup-hook
 
 USER www-data
 

apache-run.sh

@@ -1,10 +1,15 @@
 #!/bin/bash
 
+set -e
+
+rm -f $CONTAINER_STARTED_LOCK
+
 if [[ ${XDEBUG_ENABLED} == true ]]; then
     sudo -E xdebug-set-mode ${XDEBUG_MODE:-debug}
 fi
 
 sudo -E newrelic-setup
+sudo -E opcache-setup
 
 if [[ ${SESSION_HANDLER} == true ]]; then
     echo "session.save_handler = ${SESSION_HANDLER_NAME}" | sudo tee -a /usr/local/etc/php/conf.d/session-handler.ini
@@ -19,4 +24,8 @@ sudo rm -rf var/cache/* var/logs/* &&
     sudo chown -R www-data:www-data /var/www/html/var/logs && chmod 777 /var/www/html/var/logs &&
     sudo chown -R www-data:www-data /var/www/html/var/sessions && chmod 777 /var/www/html/var/sessions
 
+post-startup-hook
+
+touch $CONTAINER_STARTED_LOCK
+
 exec apache2-foreground

bin/opcache-setup

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+if [[ ${OPCACHE_ENABLED} == true ]]; then
+    echo "opcache.enable=1" >> /usr/local/etc/php/conf.d/docker-php-ext-opcache.ini
+    echo "opcache.max_accelerated_files=$(echo $[ 1000 + $(find . -type f -name "*.php" | wc -l) ])" >> /usr/local/etc/php/conf.d/docker-php-ext-opcache.ini
+else
+    echo "opcache.enable=0" >> /usr/local/etc/php/conf.d/docker-php-ext-opcache.ini
+fi

bin/wait-startup

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+set -e
+
+while [ ! -f $CONTAINER_STARTED_LOCK ]; do
+    echo "Esperando startup do container..."
+    sleep 5
+done
+
+echo "Startup do container concluída."