Fix PHP 7.4 build

azure-pipelines.yml

@@ -50,6 +50,7 @@ steps:
     repository: 'shyim/shopware-nginx'
     command: 'push'
     tags: |
+      php74-xdebug
       php73-xdebug
       php72-xdebug
       php71-xdebug
@@ -91,3 +92,4 @@ steps:
       php71-xdebug
       php72-xdebug
       php73-xdebug
+      php74-xdebug

functions.sh

@@ -17,7 +17,7 @@ modulesPlatform=(base platform)
 modulesLocal=(base local)
 
 phpVersions=(php71 php72 php73 php74)
-xdebugPhpVersions=(php71 php70 php72 php73)
+xdebugPhpVersions=(php71 php70 php72 php73 php74)
 mysqlVersions=(55 56 57 8)
 
 function fixHooks()

images/generate.sh

@@ -25,9 +25,6 @@ for t in ${phpVersions[@]}; do
     node "${DIR}/twig.js" nginx/Dockerfile.twig "{\"phpVersion\": \"$dockerPHP\", \"phpVersionNumeric\": $phpVersionNumeric, \"xdebug\": false}" > nginx/${t}/Dockerfile
 done
 
-# RC has custom name
-node "${DIR}/twig.js" nginx/Dockerfile.twig "{\"phpVersion\": \"rc\", \"phpVersionNumeric\": 7.4, \"xdebug\": false}" > nginx/php74/Dockerfile
-
 for t in ${xdebugPhpVersions[@]}; do
     dockerPHP=$(echo "${t:3:1}.${t:4:1}")
 

images/nginx/Dockerfile.twig

@@ -19,6 +19,8 @@ RUN set -x && \
       libzip-dev \
       libwebp-dev \
       libxml2-dev \
+      libxslt-dev \
+      libffi-dev \
       pcre-dev \
       unzip \
       wget \
@@ -31,11 +33,22 @@ RUN set -x && \
     docker-php-ext-configure zip \
       --with-libzip && \
     docker-php-ext-configure gd \
+    {% if phpVersionNumeric >= 74 %}
+      --enable-gd \
+      --with-freetype \
+      --with-png \
+      --with-jpeg \
+      --with-webp && \
+    {% else %}
       --with-gd \
       --with-freetype-dir=/usr/include/ \
       --with-png-dir=/usr/include/ \
       --with-jpeg-dir=/usr/include/ \
       --with-webp-dir && \
+    {% endif %}
+    {% if phpVersionNumeric >= 74 %}
+    docker-php-ext-configure ffi --with-ffi && \
+    {% endif %}
     docker-php-ext-install -j$(nproc) \
       bcmath \
       gd \
@@ -46,7 +59,7 @@ RUN set -x && \
       bz2 \
       intl \
       soap \
-      zip > /dev/null && \
+      zip {% if phpVersionNumeric >= 74 %} ffi {% endif %} > /dev/null && \
     update-ca-certificates && \
     ln -s /usr/local/bin/php /usr/bin/php && \
     ln -sf /dev/stdout /var/log/nginx/access.log && \