feat: 支持 php8.4, 基础镜像升级为 ubuntu 24.04

Author: jetsung

.github/workflows/build-push.yml

@@ -10,9 +10,13 @@ on:
         type: string
       nginx:
         description: "nginx version"
-        default: "1.24.0"
+        default: "1.26.2"
         required: true
         type: string
+      php84:
+        description: "php8.4 image. e.g: 8.4.010"
+        default: ""
+        type: string        
       php83:
         description: "php8.3 image. e.g: 8.3.000"
         default: ""
@@ -32,8 +36,10 @@ jobs:
     strategy:
       matrix:
         nginx: ["${{ inputs.nginx }}"]
-        php: ["8.3", "8.2", "8.1"]
+        php: ["8.4", "8.3", "8.2", "8.1"]
         include:
+          - php: "8.4"
+            tag: ${{ inputs.php84 }}
           - php: "8.3"
             tag: ${{ inputs.php83 }}
           - php: "8.2"
@@ -66,7 +72,7 @@ jobs:
           IFS=' ' read -ra IMAGE <<< "$IMAGES"
           for element in "${IMAGE[@]}"; do
             LAT_VER=''
-            if [[ "${{ matrix.php }}" == "8.3" ]]; then
+            if [[ "${{ matrix.php }}" == "8.4" ]]; then
               LAT_VER="${element}:latest,"
             fi
             PRE_VER="${element}:${{ matrix.php }},"
@@ -106,7 +112,7 @@ jobs:
         uses: docker/setup-buildx-action@v3
         if: steps.meta.outputs.IMAGE_TAGS != ''
       - name: Build and push
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         if: steps.meta.outputs.IMAGE_TAGS != ''
         with:
           platforms: ${{ inputs.platforms }}

.github/workflows/test.yml

@@ -10,9 +10,13 @@ on:
         type: string
       nginx:
         description: "nginx version"
-        default: "1.24.0"
+        default: "1.26.2"
         required: true
         type: string
+      php84:
+        description: "e.g: 8.4.010"
+        default: ""
+        type: string
       php83:
         description: "e.g: 8.3.000"
         default: ""
@@ -32,8 +36,10 @@ jobs:
     strategy:
       matrix:
         nginx: ["${{ inputs.nginx }}"]
-        php: ["8.3", "8.2", "8.1"]
+        php: ["8.4", "8.3", "8.2", "8.1"]
         include:
+          - php: "8.4"
+            tag: ${{ inputs.php84 }}
           - php: "8.3"
             tag: ${{ inputs.php83 }}
           - php: "8.2"
@@ -72,7 +78,7 @@ jobs:
           IFS=' ' read -ra IMAGE <<< "$IMAGES"
           for element in "${IMAGE[@]}"; do
             LAT_VER=''
-            if [[ "${{ matrix.php }}" == "8.3" ]]; then
+            if [[ "${{ matrix.php }}" == "8.4" ]]; then
               LAT_VER="${element}:latest,"
             fi
             PRE_VER="${element}:${{ matrix.php }},"

CHANGELOG.md

@@ -2,6 +2,11 @@
 
 - Since [46fa6a0](https://github.com/jetsung/docker-nginx-php/tree/46fa6a0f2621a4369e3f369ce165383a81115b61)
 
+---
+Associated tags: `8.2.270, 8.3.150, 8.4.010`
+
+Base: `ubuntu:24.04`
+
 ---
 
 ## 2022.01.22

Dockerfile

@@ -1,11 +1,11 @@
-FROM ubuntu:20.04
+FROM ubuntu:24.04
 LABEL maintainer="Jetsung Chan<jetsungchan@gmail.com>"
-ARG NGINX_VERSION=1.21.5
-ARG PHP_VERSION=8.1.0
+ARG NGINX_VERSION=1.26.2
+ARG PHP_VERSION=8.4.1
 ENV NGX_WWW_ROOT /data/wwwroot
 ENV NGX_LOG_ROOT /data/wwwlogs
 ENV TMP /tmp/nginx-php/
-ENV DEBIAN_FRONTEND=noninteractive
+ENV DEBIAN_FRONTEND noninteractive
 RUN mkdir -p /data/{wwwroot,wwwlogs,}
 RUN set -eux \
   ; \
@@ -27,18 +27,18 @@ RUN set -eux \
   curl \
   supervisor ; \
   mkdir -p "${TMP}" && cd "${TMP}" ; \
-  curl -Lk --retry 3 "https://github.com/kkos/oniguruma/releases/download/v6.9.7.1/onig-6.9.7.1.tar.gz" | gunzip | tar x \
+  curl -Lk --retry 3 "https://github.com/kkos/oniguruma/releases/download/v6.9.9/onig-6.9.9.tar.gz" | gunzip | tar x \
   ; \
   # curl -Lk --retry 3 "https://github.com/jedisct1/libsodium/releases/download/1.0.18-RELEASE/libsodium-1.0.18.tar.gz" | gunzip | tar x \
   # curl -Lk --retry 3 "https://download.libsodium.org/libsodium/releases/libsodium-1.0.18.tar.gz" | gunzip | tar x \
   # ; \
-  curl -Lk --retry 3 https://pecl.php.net/get/redis-5.3.7.tgz | gunzip | tar x \
+  curl -Lk --retry 3 https://pecl.php.net/get/redis-6.1.0.tgz | gunzip | tar x \
   ; \
   curl -Lk --retry 3 "https://nginx.org/download/nginx-${NGINX_VERSION}.tar.gz" | gunzip | tar x \
   ; \
   curl -Lk --retry 3 "https://php.net/distributions/php-${PHP_VERSION}.tar.gz" | gunzip | tar x \
   ; \
-  cd onig-6.9.7 ; \
+  cd onig-6.9.9 ; \
   ./configure --prefix=/usr ; \
   make && make install ; \
   # cd .. ; \
@@ -109,7 +109,7 @@ RUN set -eux \
   mv composer.phar /usr/local/bin/composer ; \
   chmod +x /usr/local/bin/composer ; \
   EXTENSION_DIR=$(php-config --extension-dir) ; \
-  cd redis-5.3.7 ; \
+  cd redis-6.1.0 ; \
   phpize ; \
   ./configure --with-php-config=/usr/local/php/bin/php-config ; \
   make && make install ; \

README.md

@@ -6,7 +6,8 @@ English | [简体中文](./README_CN.md)
 
 | Name    | Version |  Docker tag  |
 | :------ | :------ | :----------: |
-| **PHP** | 8.3.x   | latest / 8.3 |
+| **PHP** | 8.4.x   | latest / 8.4 |
+| **PHP** | 8.3.x   |     8.3      |
 | **PHP** | 8.2.x   |     8.2      |
 | **PHP** | 8.1.x   |     8.1      |
 

README_CN.md

@@ -6,7 +6,8 @@
 
 | 名称    | 版本  | Docker 标签  |
 | :------ | :---- | :----------: |
-| **PHP** | 8.3.x | latest / 8.3 |
+| **PHP** | 8.4.x | latest / 8.4 |
+| **PHP** | 8.3.x |     8.3      |
 | **PHP** | 8.2.x |     8.2      |
 | **PHP** | 8.1.x |     8.1      |