Update Dockerfiles to conditionally install dependencies and extensions for PHP 8.4

Signed-off-by: Moritz Mazetti <moritz@matchory.com>

Author: Radiergummi

Dockerfile

@@ -35,13 +35,18 @@ RUN --mount=type=bind,from=pie,source=/pie,target=/usr/bin/pie \
     --mount=type=cache,target=/var/lib/apt,sharing=locked <<EOF
     set -eux
 
+    if php --version | grep -q "PHP 8\.4"; then
+      php_8_4=true
+    fi
+
     # region Install Dependencies
     export DEBIAN_FRONTEND=noninteractive
     apt-get update
     apt-get install \
         --yes \
         --no-install-recommends \
       ${PHPIZE_DEPS} \
+      ${php_8_4:+libcurl4-openssl-dev} \
       libmemcached-dev \
       libsqlite3-dev \
       liburing-dev \
@@ -88,7 +93,7 @@ RUN --mount=type=bind,from=pie,source=/pie,target=/usr/bin/pie \
     ;
 
     # If we're running on PHP 8.4, install the opcache extension (it's bundled in later versions)
-    if php --version | grep -q "PHP 8\.4"; then
+    if [ "${php_8_4:-}" = "true" ]; then
       docker-php-ext-install -j${num_cpu} opcache
     fi
     # endregion
@@ -110,7 +115,7 @@ RUN --mount=type=bind,from=pie,source=/pie,target=/usr/bin/pie \
 
     # region Install Swoole with extra features
     # TODO: Remove this condition when Swoole supports PHP 8.5+
-    if php --version | grep -q "PHP 8\.4"; then
+    if [ "${php_8_4:-}" = "true" ]; then
         pie install -j${num_cpu} swoole/swoole \
           --enable-swoole-sqlite \
           --enable-swoole-pgsql \

alpine.Dockerfile

@@ -16,6 +16,10 @@ RUN --mount=type=bind,from=pie,source=/pie,target=/usr/bin/pie \
     <<EOF
     set -eux
 
+    if php --version | grep -q "PHP 8\.4"; then
+      php_8_4=true
+    fi
+
     # region Install Dependencies
     apk add \
         --no-cache \
@@ -37,6 +41,7 @@ RUN --mount=type=bind,from=pie,source=/pie,target=/usr/bin/pie \
         --no-cache \
         --virtual .build-deps \
       ${PHPIZE_DEPS} \
+      ${php_8_4:+curl-dev} \
       postgresql-dev \
       linux-headers \
       liburing-dev \
@@ -82,7 +87,7 @@ RUN --mount=type=bind,from=pie,source=/pie,target=/usr/bin/pie \
     ;
 
     # If we're running on PHP 8.4, install the opcache extension (it's bundled in later versions)
-    if php --version | grep -q "PHP 8\.4"; then
+    if [ "${php_8_4:-}" = "true" ]; then
       docker-php-ext-install -j${num_cpu} opcache
     fi
     # endregion