Upgrade debian to v12; Upgrade alpine to 3.20; Added PHP 8.5

matyhtf · matyhtf · commit 872c9b533530 · 2025-11-24T17:35:48.000+08:00
diff --git a/8.1-alpine/Dockerfile b/8.1-alpine/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:8.1-alpine3.18
+FROM php:8.1-alpine3.20
 LABEL maintainer="Swoole Team <team@swoole.com>"
 
 RUN apk update
diff --git a/8.1-zts-alpine/Dockerfile b/8.1-zts-alpine/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:8.1-zts-alpine3.18
+FROM php:8.1-zts-alpine3.20
 LABEL maintainer="Swoole Team <team@swoole.com>"
 
 RUN apk update
diff --git a/8.1-zts/Dockerfile b/8.1-zts/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:8.1-zts-bullseye
+FROM php:8.1-zts-bookworm
 LABEL maintainer="Swoole Team <team@swoole.com>"
 
 RUN apt update -y
diff --git a/8.1/Dockerfile b/8.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:8.1-bullseye
+FROM php:8.1-bookworm
 LABEL maintainer="Swoole Team <team@swoole.com>"
 
 RUN apt update -y
diff --git a/8.2-alpine/Dockerfile b/8.2-alpine/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:8.2-alpine3.18
+FROM php:8.2-alpine3.20
 LABEL maintainer="Swoole Team <team@swoole.com>"
 
 RUN apk update
diff --git a/8.2-zts-alpine/Dockerfile b/8.2-zts-alpine/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:8.2-zts-alpine3.18
+FROM php:8.2-zts-alpine3.20
 LABEL maintainer="Swoole Team <team@swoole.com>"
 
 RUN apk update
diff --git a/8.2-zts/Dockerfile b/8.2-zts/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:8.2-zts-bullseye
+FROM php:8.2-zts-bookworm
 LABEL maintainer="Swoole Team <team@swoole.com>"
 
 RUN apt update -y
diff --git a/8.2/Dockerfile b/8.2/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:8.2-bullseye
+FROM php:8.2-bookworm
 LABEL maintainer="Swoole Team <team@swoole.com>"
 
 RUN apt update -y
diff --git a/8.3-alpine/Dockerfile b/8.3-alpine/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:8.3-alpine3.18
+FROM php:8.3-alpine3.20
 LABEL maintainer="Swoole Team <team@swoole.com>"
 
 RUN apk update
diff --git a/8.3-zts-alpine/Dockerfile b/8.3-zts-alpine/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:8.3-zts-alpine3.18
+FROM php:8.3-zts-alpine3.20
 LABEL maintainer="Swoole Team <team@swoole.com>"
 
 RUN apk update
diff --git a/8.3-zts/Dockerfile b/8.3-zts/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:8.3-zts-bullseye
+FROM php:8.3-zts-bookworm
 LABEL maintainer="Swoole Team <team@swoole.com>"
 
 RUN apt update -y
diff --git a/8.3/Dockerfile b/8.3/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:8.3-bullseye
+FROM php:8.3-bookworm
 LABEL maintainer="Swoole Team <team@swoole.com>"
 
 RUN apt update -y
diff --git a/8.4-alpine/Dockerfile b/8.4-alpine/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:8.4.0RC2-alpine3.20
+FROM php:8.4-alpine3.20
 LABEL maintainer="Swoole Team <team@swoole.com>"
 
 RUN apk update
diff --git a/8.4-zts-alpine/Dockerfile b/8.4-zts-alpine/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:8.4.0RC2-zts-alpine3.20
+FROM php:8.4-zts-alpine3.20
 LABEL maintainer="Swoole Team <team@swoole.com>"
 
 RUN apk update
diff --git a/8.4-zts/Dockerfile b/8.4-zts/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:8.4.0RC2-zts-bullseye
+FROM php:8.4-zts-bookworm
 LABEL maintainer="Swoole Team <team@swoole.com>"
 
 RUN apt update -y
diff --git a/8.4/Dockerfile b/8.4/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:8.4.0RC2-bullseye
+FROM php:8.4-bookworm
 LABEL maintainer="Swoole Team <team@swoole.com>"
 
 RUN apt update -y
diff --git a/8.5-alpine/Dockerfile b/8.5-alpine/Dockerfile
@@ -0,0 +1,65 @@
+FROM php:8.5-alpine3.20
+LABEL maintainer="Swoole Team <team@swoole.com>"
+
+RUN apk update
+
+# common tools
+RUN apk add --no-cache \
+    bash \
+    curl \
+    wget \
+    zip \
+    unzip \
+    git \
+    vim \
+    linux-headers
+
+# dev tools
+RUN apk add --no-cache \
+    autoconf \
+    automake \
+    c-ares \
+    c-ares-dev \
+    dpkg \
+    dpkg-dev \
+    file \
+    g++ \
+    gcc \
+    libgcc \
+    libstdc++ \
+    libtool \
+    make \
+    openssl \
+    openssl-dev \
+    brotli-dev \
+    pcre-dev \
+    pkgconf \
+    re2c \
+    zlib \
+    zlib-dev \
+    libcurl \
+    libpq \
+    unixodbc-dev \
+    curl-dev
+
+# extensions
+RUN CFLAGS="$CFLAGS -D_GNU_SOURCE" docker-php-ext-install \
+    pdo_mysql \
+    mysqli \
+    opcache \
+    sockets \
+    pcntl && \
+    echo "opcache.enable_cli=1" >> /usr/local/etc/php/conf.d/docker-php-ext-opcache.ini && \
+    pecl install redis && docker-php-ext-enable redis
+
+# install composer
+ENV COMPOSER_ALLOW_SUPERUSER 1
+RUN curl -sS https://getcomposer.org/installer | php && \
+    mv composer.phar /usr/local/bin/composer && \
+    composer self-update --clean-backups
+
+# dev tools
+RUN apk add --no-cache \
+    gdb \
+    strace \
+    valgrind
diff --git a/8.5-zts-alpine/Dockerfile b/8.5-zts-alpine/Dockerfile
@@ -0,0 +1,65 @@
+FROM php:8.5-zts-alpine3.20
+LABEL maintainer="Swoole Team <team@swoole.com>"
+
+RUN apk update
+
+# common tools
+RUN apk add --no-cache \
+    bash \
+    curl \
+    wget \
+    zip \
+    unzip \
+    git \
+    vim \
+    linux-headers
+
+# dev tools
+RUN apk add --no-cache \
+    autoconf \
+    automake \
+    c-ares \
+    c-ares-dev \
+    dpkg \
+    dpkg-dev \
+    file \
+    g++ \
+    gcc \
+    libgcc \
+    libstdc++ \
+    libtool \
+    make \
+    openssl \
+    openssl-dev \
+    brotli-dev \
+    pcre-dev \
+    pkgconf \
+    re2c \
+    zlib \
+    zlib-dev \
+    libcurl \
+    libpq \
+    unixodbc-dev \
+    curl-dev
+
+# extensions
+RUN CFLAGS="$CFLAGS -D_GNU_SOURCE" docker-php-ext-install \
+    pdo_mysql \
+    mysqli \
+    opcache \
+    sockets \
+    pcntl && \
+    echo "opcache.enable_cli=1" >> /usr/local/etc/php/conf.d/docker-php-ext-opcache.ini && \
+    pecl install redis && docker-php-ext-enable redis
+
+# install composer
+ENV COMPOSER_ALLOW_SUPERUSER 1
+RUN curl -sS https://getcomposer.org/installer | php && \
+    mv composer.phar /usr/local/bin/composer && \
+    composer self-update --clean-backups
+
+# dev tools
+RUN apk add --no-cache \
+    gdb \
+    strace \
+    valgrind
diff --git a/8.5-zts/Dockerfile b/8.5-zts/Dockerfile
@@ -0,0 +1,52 @@
+FROM php:8.5-zts-bookworm
+LABEL maintainer="Swoole Team <team@swoole.com>"
+
+RUN apt update -y
+
+RUN apt install -y \
+    procps \
+    libfreetype6-dev \
+    libjpeg62-turbo-dev \
+    libpng-dev \
+    openssl \
+    libssh-dev \
+    libpcre3 \
+    libpcre3-dev \
+    libonig-dev \
+    libcurl4-openssl-dev \
+    libc-ares-dev \
+    libbrotli-dev \
+    libpq-dev \
+    unixodbc-dev \
+    odbc-mariadb \
+    curl \
+    wget \
+    zip \
+    unzip \
+    git \
+    vim
+
+RUN CFLAGS="$CFLAGS -D_GNU_SOURCE" docker-php-ext-install \
+    gd \
+    pdo_mysql \
+    mysqli \
+    opcache \
+    sockets \
+    pcntl && \
+    echo "opcache.enable_cli=1" >> /usr/local/etc/php/conf.d/docker-php-ext-opcache.ini && \
+    pecl install redis && docker-php-ext-enable redis
+
+# install composer
+ENV COMPOSER_ALLOW_SUPERUSER 1
+RUN curl -sS https://getcomposer.org/installer | php && \
+    mv composer.phar /usr/local/bin/composer && \
+    composer self-update --clean-backups
+
+# dev-tools
+RUN apt install -y \
+    gdb \
+    strace \
+    valgrind
+
+# clean up
+RUN apt autoremove && apt clean
diff --git a/8.5/Dockerfile b/8.5/Dockerfile
@@ -0,0 +1,52 @@
+FROM php:8.5-bookworm
+LABEL maintainer="Swoole Team <team@swoole.com>"
+
+RUN apt update -y
+
+RUN apt install -y \
+    procps \
+    libfreetype6-dev \
+    libjpeg62-turbo-dev \
+    libpng-dev \
+    openssl \
+    libssh-dev \
+    libpcre3 \
+    libpcre3-dev \
+    libonig-dev \
+    libcurl4-openssl-dev \
+    libc-ares-dev \
+    libbrotli-dev \
+    libpq-dev \
+    unixodbc-dev \
+    odbc-mariadb \
+    curl \
+    wget \
+    zip \
+    unzip \
+    git \
+    vim
+
+RUN CFLAGS="$CFLAGS -D_GNU_SOURCE" docker-php-ext-install \
+    gd \
+    pdo_mysql \
+    mysqli \
+    opcache \
+    sockets \
+    pcntl && \
+    echo "opcache.enable_cli=1" >> /usr/local/etc/php/conf.d/docker-php-ext-opcache.ini && \
+    pecl install redis && docker-php-ext-enable redis
+
+# install composer
+ENV COMPOSER_ALLOW_SUPERUSER 1
+RUN curl -sS https://getcomposer.org/installer | php && \
+    mv composer.phar /usr/local/bin/composer && \
+    composer self-update --clean-backups
+
+# dev-tools
+RUN apt install -y \
+    gdb \
+    strace \
+    valgrind
+
+# clean up
+RUN apt autoremove && apt clean
diff --git a/generator b/generator
@@ -1,24 +1,18 @@
 #!/usr/bin/env php
 <?php
 
-const alpine_version = '3.18';
-const debian_version = 'bullseye';
+const alpine_version = '3.20';
+const debian_version = 'bookworm';
 
 class DockerfileGenerator
 {
-    protected $debian_versions = ['8.1', '8.2', '8.3', '8.4'];
-    protected $alpine_versions = ['8.1-alpine', '8.2-alpine', '8.3-alpine', '8.4-alpine'];
-    protected $alpine_zts_versions = ['8.1-zts-alpine', '8.2-zts-alpine', '8.3-zts-alpine', '8.4-zts-alpine'];
-    protected $debian_zts_versions = ['8.1-zts', '8.2-zts', '8.3-zts', '8.4-zts'];
+    protected array $debian_versions = ['8.1', '8.2', '8.3', '8.4', '8.5'];
+    protected array $alpine_versions = ['8.1-alpine', '8.2-alpine', '8.3-alpine', '8.4-alpine', '8.5-alpine'];
+    protected array $alpine_zts_versions = ['8.1-zts-alpine', '8.2-zts-alpine', '8.3-zts-alpine', '8.4-zts-alpine', '8.5-zts-alpine'];
+    protected array $debian_zts_versions = ['8.1-zts', '8.2-zts', '8.3-zts', '8.4-zts', '8.5-zts'];
+    protected array $baseImageTag = [];
 
-    protected $baseImageTag = [
-        '8.4' => '8.4.0RC2-bullseye',
-        '8.4-zts' => '8.4.0RC2-zts-bullseye',
-        '8.4-alpine' => '8.4.0RC2-alpine3.20',
-        '8.4-zts-alpine' => '8.4.0RC2-zts-alpine3.20',
-    ];
-
-    private function render($version, $type)
+    private function render($version, $type): void
     {
         $v = strstr($version, '-', true) ?: $version;
         $CFLAGS = 'CFLAGS="$CFLAGS -D_GNU_SOURCE"';
@@ -46,7 +40,7 @@ class DockerfileGenerator
         file_put_contents($dockerFile, $content);
     }
 
-    public function make()
+    public function make(): void
     {
         foreach ($this->debian_versions as $v) {
             $this->render($v, 'debian');

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM php:8.1-alpine3.18`
	`1`	`+FROM php:8.1-alpine3.20`
`2`	`2`	`LABEL maintainer="Swoole Team <[email protected]>"`
`3`	`3`
`4`	`4`	`RUN apk update`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM php:8.1-zts-alpine3.18`
	`1`	`+FROM php:8.1-zts-alpine3.20`
`2`	`2`	`LABEL maintainer="Swoole Team <[email protected]>"`
`3`	`3`
`4`	`4`	`RUN apk update`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM php:8.1-zts-bullseye`
	`1`	`+FROM php:8.1-zts-bookworm`
`2`	`2`	`LABEL maintainer="Swoole Team <[email protected]>"`
`3`	`3`
`4`	`4`	`RUN apt update -y`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM php:8.1-bullseye`
	`1`	`+FROM php:8.1-bookworm`
`2`	`2`	`LABEL maintainer="Swoole Team <[email protected]>"`
`3`	`3`
`4`	`4`	`RUN apt update -y`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM php:8.2-alpine3.18`
	`1`	`+FROM php:8.2-alpine3.20`
`2`	`2`	`LABEL maintainer="Swoole Team <[email protected]>"`
`3`	`3`
`4`	`4`	`RUN apk update`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM php:8.2-zts-alpine3.18`
	`1`	`+FROM php:8.2-zts-alpine3.20`
`2`	`2`	`LABEL maintainer="Swoole Team <[email protected]>"`
`3`	`3`
`4`	`4`	`RUN apk update`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM php:8.2-zts-bullseye`
	`1`	`+FROM php:8.2-zts-bookworm`
`2`	`2`	`LABEL maintainer="Swoole Team <[email protected]>"`
`3`	`3`
`4`	`4`	`RUN apt update -y`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM php:8.2-bullseye`
	`1`	`+FROM php:8.2-bookworm`
`2`	`2`	`LABEL maintainer="Swoole Team <[email protected]>"`
`3`	`3`
`4`	`4`	`RUN apt update -y`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM php:8.3-alpine3.18`
	`1`	`+FROM php:8.3-alpine3.20`
`2`	`2`	`LABEL maintainer="Swoole Team <[email protected]>"`
`3`	`3`
`4`	`4`	`RUN apk update`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM php:8.3-zts-alpine3.18`
	`1`	`+FROM php:8.3-zts-alpine3.20`
`2`	`2`	`LABEL maintainer="Swoole Team <[email protected]>"`
`3`	`3`
`4`	`4`	`RUN apk update`