fix: use 7.x.Dockerfile for php7.4

Author: Scarbous

.github/workflows/php.yml

@@ -172,6 +172,7 @@ jobs:
             UBUNTU_VERSION=24.04
             XDEBUG_VERSION=3.1.6
         - version: 7.4
+          file: 7.x.Dockerfile
           build-args: |
             PHP_VERSION=7.4
             UBUNTU_VERSION=20.04

php/7.x.Dockerfile

@@ -11,7 +11,7 @@ ENV DEBIAN_FRONTEND=noninteractive \
 
 ENV PHP_VERSION=${PHP_VERSION} \
     PHP_DISPLAY_ERRORS=1 \
-    PHP_DISPLAY_STARTUP_ERRORS=0 \
+    PHP_DISPLAY_STARTUP_ERRORS=1 \
     PHP_MEMORY_LIMIT=128m \
     PHP_MAX_EXECUTION_TIME=30 \
     PHP_MAX_INPUT_VARS=1500 \
@@ -26,7 +26,7 @@ ENV PHP_VERSION=${PHP_VERSION} \
     PHP_OPCACHE_PRELOAD_USER=www-data \
     PHP_OPCACHE_ENABLE_CLI=0 \
     PHP_OPCACHE_VALIDATE_TIMESTAMPS=1 \
-    PHP_OPCACHE_FILE_CACHE=null \
+    PHP_OPCACHE_FILE_CACHE="/tmp/opcache" \
     PHP_OPCACHE_FILE_CACHE_ONLY=0 \
     PHP_OPCACHE_REVALIDATE_FREQ=2 \
     PHP_REALPATH_CACHE_TTL=120 \
@@ -42,7 +42,11 @@ ENV PHP_VERSION=${PHP_VERSION} \
     PHP_FPM_PM_MIN_SPARE_SERVERS=2 \
     PHP_FPM_PM_MAX_SPARE_SERVERS=4 \
     PHP_FPM_PM_MAX_REQUESTS=1000 \
-    XDEBUG_VERSION=${XDEBUG_VERSION}
+    XDEBUG_VERSION=${XDEBUG_VERSION} \
+    TIDEWAYS_APIKEY="" \
+    TIDEWAYS_AUTO_START=1 \
+    TIDEWAYS_DAEMON="tcp://tideways-daemon:9135" \
+    TIDEWAYS_SAMPLERATE=25
 
 RUN apt-get update && \
     apt-get -y install --no-install-suggests --no-install-recommends \
@@ -54,6 +58,9 @@ RUN apt-get update && \
         gnupg2 \
         locales
 
+RUN echo 'deb [signed-by=/usr/share/keyrings/tideways.gpg] https://packages.tideways.com/apt-packages-main any-version main' | tee /etc/apt/sources.list.d/tideways.list && \
+    curl -L -sS 'https://packages.tideways.com/key.gpg' | gpg --dearmor | tee /usr/share/keyrings/tideways.gpg > /dev/null \
+
 RUN add-apt-repository ppa:ondrej/php -y
 
 RUN apt-get update && \
@@ -77,6 +84,7 @@ RUN apt-get update && \
         php${PHP_VERSION}-curl \
         php${PHP_VERSION}-fpm \
         php${PHP_VERSION}-gd \
+        php${PHP_VERSION}-http \
         php${PHP_VERSION}-igbinary \
         php${PHP_VERSION}-imagick \
         php${PHP_VERSION}-intl \
@@ -91,6 +99,8 @@ RUN apt-get update && \
         php${PHP_VERSION}-xml \
         php${PHP_VERSION}-yaml \
         php${PHP_VERSION}-zip \
+        tideways-php \
+        tideways-cli \
     && apt-get autoremove \
     && find /var/log -type f -name "*.log" -delete \
     && rm -rf /var/lib/apt/lists/* /var/cache/ldconfig/aux-cache \
@@ -115,6 +125,8 @@ RUN ln -s /usr/sbin/php-fpm${PHP_VERSION} /usr/sbin/php-fpm
 RUN mkdir -p "/run/php/" \
     && chown -R www-data:www-data /run/php/ \
     && chmod 755 /run/php/ \
+    && mkdir -p ${PHP_OPCACHE_FILE_CACHE} \
+    && chown -R www-data:www-data ${PHP_OPCACHE_FILE_CACHE} \
     && touch /var/log/xdebug.log \
     && chown www-data:www-data /var/log/xdebug.log