Simplify PHP 8.4 detection, remove conditional dependency logic in Dockerfiles, add proper error printing for Swoole build errors

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

Author: Radiergummi

Dockerfile

@@ -35,18 +35,14 @@ 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} \
+      libcurl4-openssl-dev \
       libmemcached-dev \
       libsqlite3-dev \
       liburing-dev \
@@ -93,7 +89,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_8_4:-}" = "true" ]; then
+    if php --version | grep -q "PHP 8\.4"; then
       docker-php-ext-install -j${num_cpu} opcache
     fi
     # endregion
@@ -114,18 +110,15 @@ RUN --mount=type=bind,from=pie,source=/pie,target=/usr/bin/pie \
     # endregion
 
     # region Install Swoole with extra features
-    # TODO: Remove this condition when Swoole supports PHP 8.5+
-    if [ "${php_8_4:-}" = "true" ]; then
-        pie install -j${num_cpu} swoole/swoole \
-          --enable-swoole-sqlite \
-          --enable-swoole-pgsql \
-          --enable-swoole-curl \
-          --enable-sockets \
-          --enable-openssl \
-          --enable-iouring \
-          --enable-brotli \
-        ;
-    fi
+    pie install -j${num_cpu} swoole/swoole \
+      --enable-swoole-sqlite \
+      --enable-swoole-pgsql \
+      --enable-uring-socket \
+      --enable-swoole-curl \
+      --enable-sockets \
+      --enable-iouring \
+      --enable-brotli \
+    || (cat /tmp/pie_make_output_* 2>&1; exit 2)
     # endregion
 EOF
 

alpine.Dockerfile

@@ -16,10 +16,6 @@ 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 \
@@ -41,13 +37,13 @@ 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 \
       sqlite-dev \
       pcre2-dev \
       libuv-dev \
+      curl-dev \
       pcre-dev \
       icu-dev \
       git \
@@ -87,7 +83,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_8_4:-}" = "true" ]; then
+    if php --version | grep -q "PHP 8\.4"; then
       docker-php-ext-install -j${num_cpu} opcache
     fi
     # endregion
@@ -108,18 +104,15 @@ RUN --mount=type=bind,from=pie,source=/pie,target=/usr/bin/pie \
     # endregion
 
     # 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
-        pie install -j${num_cpu} swoole/swoole \
-          --enable-swoole-sqlite \
-          --enable-swoole-pgsql \
-          --enable-swoole-curl \
-          --enable-sockets \
-          --enable-openssl \
-          --enable-iouring \
-          --enable-brotli \
-        ;
-    fi
+    pie install -j${num_cpu} swoole/swoole \
+      --enable-swoole-sqlite \
+      --enable-swoole-pgsql \
+      --enable-uring-socket \
+      --enable-swoole-curl \
+      --enable-sockets \
+      --enable-iouring \
+      --enable-brotli \
+    || (cat /tmp/pie_make_output_* 2>&1; exit 2)
     # endregion
 
     docker-php-source delete