Update for PHP 8.4 compatibility

- Fix Dockerfile to use correct package sources for PHP 8
- Add line ending normalization for install.sh
- Update gd extension config (remove invalid --enable-swoole-curl)
- Update redis extension for PHP 8.4+ (use latest pecl version)
- Update event extension for OpenSSL 3.x compatibility
- Add swoole 6.1.6 support for PHP 8.4+

Co-Authored-By: Claude <noreply@anthropic.com>

Author: Tinywan

Dockerfile

@@ -13,14 +13,15 @@ RUN sed -i "s/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g" /etc/apk/repositories
 RUN cat /etc/issue
 
 # [php74] Add basics first
-RUN apk update && apk add bash curl ca-certificates openssl openssh git libxml2-dev tzdata icu-dev openntpd libedit-dev libzip-dev libjpeg-turbo-dev libpng-dev freetype-dev autoconf dpkg-dev dpkg file g++ gcc libc-dev make pkgconf re2c pcre-dev libffi-dev libressl-dev libevent-dev zlib-dev libtool automake supervisor
+# RUN apk update && apk add bash curl ca-certificates openssl openssh git libxml2-dev tzdata icu-dev openntpd libedit-dev libzip-dev libjpeg-turbo-dev libpng-dev freetype-dev autoconf dpkg-dev dpkg file g++ gcc libc-dev make pkgconf re2c pcre-dev libffi-dev libressl-dev libevent-dev zlib-dev libtool automake supervisor
 
 # [php8] Add basics first
-# RUN apt-get update && apt-get upgrade && apt-get install bash curl ca-certificates openssl openssh git nano libxml2-dev tzdata icu-dev openntpd libedit-dev libzip-dev libjpeg62-turbo-dev libpng12-dev libfreetype6-dev autoconf dpkg-dev dpkg file g++ gcc libc-dev make pkgconf re2c pcre-dev openssl-dev libffi-dev libressl-dev libevent-dev zlib-dev libtool automake supervisor
+RUN apk update && apk add bash curl ca-certificates openssl openssh git nano libxml2-dev tzdata icu-dev openntpd libedit-dev libzip-dev libjpeg-turbo-dev libpng-dev freetype-dev autoconf dpkg-dev dpkg file g++ gcc libc-dev make pkgconf re2c pcre-dev openssl-dev libffi-dev libevent-dev zlib-dev libtool automake supervisor
 
 COPY ./extension /tmp/extension
 WORKDIR /tmp/extension
-RUN chmod +x install.sh \
+RUN sed -i 's/\r$//' install.sh \
+    && chmod +x install.sh \
     && sh install.sh \
     && rm -rf /tmp/extension
 

extension/install.sh

@@ -194,7 +194,7 @@ if [[ -z "${EXTENSIONS##*,gd,*}" ]]; then
         libjpeg-turbo \
         libjpeg-turbo-dev \
         libwebp-dev &&
-        docker-php-ext-configure gd --enable-gd --with-freetype --with-jpeg --with-webp --enable-swoole-curl &&
+        docker-php-ext-configure gd --enable-gd --with-freetype --with-jpeg --with-webp &&
         docker-php-ext-install gd &&
         apk del \
             freetype-dev \
@@ -455,12 +455,13 @@ fi
 
 if [[ -z "${EXTENSIONS##*,redis,*}" ]]; then
     echo "---------- Install redis ----------"
-    isPhpVersionGreaterOrEqual 8 0
+    isPhpVersionGreaterOrEqual 8 4
     if [[ "$?" = "1" ]]; then
-        installExtensionFromTgz redis-5.3.7
-    else
-        printf "\n" | pecl install redis-4.3.0
+        # PHP 8.4+ requires newer redis version
+        printf "\n" | pecl install redis
         docker-php-ext-enable redis
+    else
+        installExtensionFromTgz redis-5.3.7
     fi
 fi
 
@@ -520,7 +521,9 @@ if [[ -z "${EXTENSIONS##*,event,*}" ]]; then
     fi
 
     echo "---------- Install event again ----------"
-    installExtensionFromTgz event-3.0.5 "--ini-name event.ini"
+    # Use pecl to get latest version compatible with OpenSSL 3.x
+    printf "\n" | pecl install event
+    docker-php-ext-enable event
 fi
 
 if [[ -z "${EXTENSIONS##*,mongodb,*}" ]]; then
@@ -542,8 +545,14 @@ fi
 
 if [[ -z "${EXTENSIONS##*,swoole,*}" ]]; then
     echo "---------- Install Swoole ----------"
-    pecl install swoole-5.1.5
-    docker-php-ext-enable swoole
+    isPhpVersionGreaterOrEqual 8 4
+    if [[ "$?" = "1" ]]; then
+        # PHP 8.4+ requires swoole 6.x
+        installExtensionFromTgz swoole-6.1.6
+    else
+        pecl install swoole-5.1.5
+        docker-php-ext-enable swoole
+    fi
 fi
 
 if [[ -z "${EXTENSIONS##*,zip,*}" ]]; then