Merge pull request #24 from ToshY/feature/23-php-85

add php 8.5 support

Author: ToshY

.github/workflows/release.yml

@@ -20,6 +20,7 @@ on:
           - '8.2'
           - '8.3'
           - '8.4'
+          - '8.5'
       force:
         type: choice
         description: 'Force recreate images'
@@ -30,7 +31,7 @@ on:
           - 'false'
 
 env:
-  PHP_VERSIONS: '8.1,8.2,8.3,8.4'
+  PHP_VERSIONS: '8.1,8.2,8.3,8.4,8.5'
   GHCR_SLUG: ghcr.io/toshy/php
 
 jobs:

.github/workflows/security.yml

@@ -15,15 +15,18 @@ jobs:
           - ghcr.io/toshy/php:8.1-fpm-bookworm
           - ghcr.io/toshy/php:8.2-fpm-bookworm
           - ghcr.io/toshy/php:8.3-fpm-bookworm
-          - ghcr.io/toshy/php:fpm-bookworm
+          - ghcr.io/toshy/php:8.4-fpm-bookworm
+          - ghcr.io/toshy/php:fpm-trixie
           - ghcr.io/toshy/php:8.1-fpm-bookworm-ffmpeg
           - ghcr.io/toshy/php:8.2-fpm-bookworm-ffmpeg
           - ghcr.io/toshy/php:8.3-fpm-bookworm-ffmpeg
-          - ghcr.io/toshy/php:fpm-bookworm-ffmpeg
+          - ghcr.io/toshy/php:8.4-fpm-bookworm-ffmpeg
+          - ghcr.io/toshy/php:fpm-trixie-ffmpeg
           - ghcr.io/toshy/php:8.1-fpm-bookworm-otel
           - ghcr.io/toshy/php:8.2-fpm-bookworm-otel
           - ghcr.io/toshy/php:8.3-fpm-bookworm-otel
-          - ghcr.io/toshy/php:fpm-bookworm-otel
+          - ghcr.io/toshy/php:8.4-fpm-bookworm-otel
+          - ghcr.io/toshy/php:fpm-trixie-otel
     steps:
       - name: Scan for vulnerabilities
         uses: crazy-max/ghaction-container-scan@v3

Taskfile.yml

@@ -32,9 +32,9 @@ tasks:
     summary: |
       Example:
 
-      task act:push:version pv="8.4.10"
+      task act:push:version pv="8.5.0"
     vars:
-      PHP_VERSIONS: '{{ .pv | default "8.4.10"}}'
+      PHP_VERSIONS: '{{ .pv | default "8.5.0"}}'
     cmds:
       - act push --input version={{.PHP_VERSIONS}}
 
@@ -57,14 +57,14 @@ tasks:
   bake:
     desc: Bake
     vars:
-      PHP_VERSIONS: '{{ .pv | default "8.1.33,8.2.29,8.3.25,8.4.12"}}'
+      PHP_VERSIONS: '{{ .pv | default "8.1.33,8.2.29,8.3.28,8.4.15,8.5.0"}}'
     cmds:
       - PHP_VERSIONS={{.PHP_VERSIONS}} docker buildx bake --set *.platform=linux/amd64
 
   bake:print:
     desc: Bake print options without building
     vars:
-      PHP_VERSIONS: '{{ .pv | default "8.1.33,8.2.29,8.3.25,8.4.12"}}'
+      PHP_VERSIONS: '{{ .pv | default "8.1.33,8.2.29,8.3.28,8.4.15,8.5.0"}}'
     cmds:
       - PHP_VERSIONS={{.PHP_VERSIONS}} docker buildx bake --print | $JQ
 
@@ -73,12 +73,12 @@ tasks:
     desc: Trivy
     vars:
       TRIVY_VERSION: '{{ .tv | default "latest" }}'
-      PHP_BASE: '{{ .pv | default "8.4.12-fpm-bookworm"}}'
+      PHP_BASE: '{{ .pv | default "8.5.0-fpm-trixie"}}'
       TARGET: '{{ .t | default "ffmpeg" }}'
     cmds:
       - |
         docker build \
-        --build-context php-base=docker-image://php:8.4.12-fpm-bookworm \
+        --build-context php-base=docker-image://php:{{.PHP_BASE}} \
         --target {{.TARGET}} \
         -t toshy/trivy:{{.PHP_BASE}} .
       - |

docker-bake.hcl

@@ -13,11 +13,11 @@ variable "VERSION" {
 }
 
 variable "PHP_VERSIONS" {
-    default = "8.1,8.2,8.3,8.4"
+    default = "8.1,8.2,8.3,8.4,8.5"
 }
 
 variable "DEFAULT_PHP_VERSION" {
-    default = "8.4"
+    default = "8.5"
 }
 
 variable "DEFAULT_FLAVOR" {
@@ -38,16 +38,16 @@ variable "PHP_OS_MAP" {
         "8.2" = "bookworm"
         "8.3" = "bookworm"
         "8.4" = "bookworm"
-        "8.5" = "bookworm"
+        "8.5" = "trixie"
     }
 }
 
 variable "FLAVOR_OS_MAP" {
     default = {
-        "cli" = "bookworm,alpine"
-        "apache" = "bookworm" # apache flavor has no alpine os image
-        "fpm" = "bookworm,alpine"
-        "zts" = "bookworm,alpine"
+        "cli" = "bookworm,trixie,alpine"
+        "apache" = "bookworm,trixie" # apache flavor has no alpine os image
+        "fpm" = "bookworm,trixie,alpine"
+        "zts" = "bookworm,trixie,alpine"
     }
 }
 

docs/images.md

@@ -49,7 +49,7 @@ unzip
 
 !!!tip "Container"
     ```shell
-    ghcr.io/toshy/php:8.4-fpm-bookworm
+    ghcr.io/toshy/php:8.5-fpm-trixie
     ```
 
 ### FFmpeg
@@ -64,7 +64,7 @@ libimage-exiftool-perl
 
 !!!tip "Container suffixed with `-ffmpeg`"
     ```shell
-    ghcr.io/toshy/php:8.4-fpm-bookworm-ffmpeg
+    ghcr.io/toshy/php:8.5-fpm-trixie-ffmpeg
     ```
 
 !!! info
@@ -87,7 +87,7 @@ protobuf
 
 !!!tip "Container suffixed with `-otel`"
     ```shell
-    ghcr.io/toshy/php:8.4-fpm-bookworm-otel
+    ghcr.io/toshy/php:8.5-fpm-trixie-otel
     ```
 
 !!! info

docs/usage.md

@@ -7,15 +7,15 @@ All images can be pulled from [ghcr.io/toshy/php](https://ghcr.io/toshy/php).
 Run a container.
 
 ```shell
-docker run --rm -it ghcr.io/toshy/php:8.4-cli-bookworm
+docker run --rm -it ghcr.io/toshy/php:8.5-cli-trixie
 ```
 
 ### :simple-docker: Dockerfile
 
 Extend an image.
 
 ```Dockerfile
-FROM ghcr.io/toshy/php:8.4-fpm-bookworm
+FROM ghcr.io/toshy/php:8.5-fpm-trixie
 ```
 
 ### :simple-docker: Compose
@@ -25,7 +25,7 @@ Use as a compose service.
 ```yaml
 services:
   php:
-    image: ghcr.io/toshy/php:8.4-fpm-bookworm
+    image: ghcr.io/toshy/php:8.5-fpm-trixie
 ```
 
 ## :octicons-container-24: Flavors, versions and OS
@@ -35,12 +35,12 @@ services:
 ghcr.io/toshy/php:<version>-<flavor>-<os>(-<target>)
 ```
 
-- Contains the following PHP versions: `8.1`, `8.2`, `8.3`, `8.4`.
+- Contains the following PHP versions: `8.1`, `8.2`, `8.3`, `8.4`, `8.5`.
 - Contains the following flavors: `cli`, `fpm`, `apache`, `zts`
-- Contains the following OS: `bookworm`.
+- Contains the following OS: `bookworm`, `trixie`.
 - Contains the following [targets](images.md#targets): `base`, `ffmpeg`, `otel`.
 
 !!!question
 
-    - The `8.4` version is the default version (also tagged as `latest`).
+    - The `8.5` version is the default version (also tagged as `latest`).
     - The `base` target is the default image and does not have a `target` suffix.