Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
strategy:
fail-fast: false
matrix:
php_version: ['8.4', '8.3','8.2','8.1']
php_version: ['8.5', '8.4', '8.3','8.2','8.1']
variant: ['apache','cli','fpm']
# builder: [ {arch: "amd64", os: "ubuntu-latest"}, {arch: "arm64", os: "macos-latest"}]
builder: [ {arch: "amd64", os: "ubuntu-24.04"}, {arch: "arm64", os: "ubuntu-24.04"}]
Expand Down Expand Up @@ -65,7 +65,7 @@ jobs:
strategy:
fail-fast: false
matrix:
php_version: ['8.4', '8.3','8.2','8.1']
php_version: ['8.5', '8.4', '8.3','8.2','8.1']
variant: ['apache','cli','fpm']
steps:
- name: Checkout
Expand Down
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
# Change Log
## Version 5

### Minor changes

* **2025-11-26**
* Support for PHP 8.5

### Initial

**2025-01-27**
* Upgrade the base version from Ubuntu 20.04 to 24.04
* Default blackfire version is now the version 2 (v1 is still available with BLACKFIRE_VERSION=1 at buildtime but with securities issues)
Expand Down
9 changes: 7 additions & 2 deletions Dockerfile.slim.apache
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,17 @@ RUN apt update \
openssh-client \
&& apt clean \
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/*
RUN apt update \
# Note: From PHP 8.5, opcache is built-in and php${PHP_VERSION}-opcache package doesn't exist
RUN OPCACHE_PACKAGE="" \
&& if [ "${PHP_VERSION}" != "8.5" ]; then \
OPCACHE_PACKAGE="php${PHP_VERSION}-opcache"; \
fi \
&& apt update \
&& apt install -y --no-install-recommends \
php${PHP_VERSION}-cli \
php${PHP_VERSION}-curl \
php${PHP_VERSION}-mbstring \
php${PHP_VERSION}-opcache \
${OPCACHE_PACKAGE} \
php${PHP_VERSION}-readline \
php${PHP_VERSION}-xml \
php${PHP_VERSION}-zip \
Expand Down
9 changes: 7 additions & 2 deletions Dockerfile.slim.cli
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,17 @@ RUN apt update \
openssh-client \
&& apt clean \
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/*
RUN apt update \
# Note: From PHP 8.5, opcache is built-in and php${PHP_VERSION}-opcache package doesn't exist
RUN OPCACHE_PACKAGE="" \
&& if [ "${PHP_VERSION}" != "8.5" ]; then \
OPCACHE_PACKAGE="php${PHP_VERSION}-opcache"; \
fi \
&& apt update \
&& apt install -y --no-install-recommends \
php${PHP_VERSION}-cli \
php${PHP_VERSION}-curl \
php${PHP_VERSION}-mbstring \
php${PHP_VERSION}-opcache \
${OPCACHE_PACKAGE} \
php${PHP_VERSION}-readline \
php${PHP_VERSION}-xml \
php${PHP_VERSION}-zip \
Expand Down
9 changes: 7 additions & 2 deletions Dockerfile.slim.fpm
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,17 @@ RUN apt update \
openssh-client \
&& apt clean \
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/*
RUN apt update \
# Note: From PHP 8.5, opcache is built-in and php${PHP_VERSION}-opcache package doesn't exist
RUN OPCACHE_PACKAGE="" \
&& if [ "${PHP_VERSION}" != "8.5" ]; then \
OPCACHE_PACKAGE="php${PHP_VERSION}-opcache"; \
fi \
&& apt update \
&& apt install -y --no-install-recommends \
php${PHP_VERSION}-cli \
php${PHP_VERSION}-curl \
php${PHP_VERSION}-mbstring \
php${PHP_VERSION}-opcache \
${OPCACHE_PACKAGE} \
php${PHP_VERSION}-readline \
php${PHP_VERSION}-xml \
php${PHP_VERSION}-zip \
Expand Down
10 changes: 8 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ blueprint: ## Generate all blueprints file
@if ! type orbit >/dev/null 2>&1; then echo "Missing orbit dependency, please install from https://github.com/gulien/orbit/"; exit 1; fi
orbit run generate

test-latest: test-8.4 ## Test the latest build only
test-latest: test-8.5 ## Test the latest build only

_test-prerequisites: blueprint
docker pull ubuntu:20.04
Expand All @@ -18,10 +18,11 @@ test-legacy-quick: ## Test 7.4, 8.0 and 8.1 quickly
VERSION=7.4 VARIANT=cli $(MAKE) _test-version-quick
VERSION=8.0 VARIANT=cli $(MAKE) _test-version-quick
VERSION=8.1 VARIANT=cli $(MAKE) _test-version-quick
test-quick: ## Test 8.2, 8.3 and 8.4 quickly
test-quick: ## Test 8.2, 8.3, 8.4 and 8.5 quickly
VERSION=8.2 VARIANT=cli $(MAKE) _test-version-quick
VERSION=8.3 VARIANT=cli $(MAKE) _test-version-quick
VERSION=8.4 VARIANT=cli $(MAKE) _test-version-quick
VERSION=8.5 VARIANT=cli $(MAKE) _test-version-quick

test-8.3: ## Test php8.3 build only
VERSION=8.3 VARIANT=cli $(MAKE) _test-version
Expand All @@ -38,6 +39,11 @@ test-8.1: ## Test php8.1 build only
VERSION=8.1 VARIANT=apache $(MAKE) _test-version
VERSION=8.1 VARIANT=fpm $(MAKE) _test-version

test-8.5: ## Test php8.5 build only
VERSION=8.5 VARIANT=cli $(MAKE) _test-version
VERSION=8.5 VARIANT=apache $(MAKE) _test-version
VERSION=8.5 VARIANT=fpm $(MAKE) _test-version

test-8.4: ## Test php8.4 build only
VERSION=8.4 VARIANT=cli $(MAKE) _test-version
VERSION=8.4 VARIANT=apache $(MAKE) _test-version
Expand Down
20 changes: 17 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,23 @@ This repository contains a set of developer-friendly, general purpose PHP images



| Name | PHP version | type |variant | NodeJS version | Size
| Name | PHP version | type |variant | NodeJS version | Size
|-------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------|--------------------------------------------|--------|-----------------|------
| [thecodingmachine/php:8.5-v5-apache](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.apache) | `8.5.x` | fat | apache | *N/A* | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.5-v5-apache.svg)](https://microbadger.com/images/thecodingmachine/php:8.5-v5-apache)
| [thecodingmachine/php:8.5-v5-apache-node20](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.apache.node) | `8.5.x` | fat | apache | `20.x` | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.5-v5-apache-node20.svg)](https://microbadger.com/images/thecodingmachine/php:8.5-v5-apache-node20)
| [thecodingmachine/php:8.5-v5-apache-node22](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.apache.node) | `8.5.x` | fat | apache | `22.x` | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.5-v5-apache-node22.svg)](https://microbadger.com/images/thecodingmachine/php:8.5-v5-apache-node22)
| [thecodingmachine/php:8.5-v5-apache-node24](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.apache.node) | `8.5.x` | fat | apache | `24.x` | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.5-v5-apache-node24.svg)](https://microbadger.com/images/thecodingmachine/php:8.5-v5-apache-node24)
| [thecodingmachine/php:8.5-v5-fpm](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.fpm) | `8.5.x` | fat | fpm | *N/A* | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.5-v5-fpm.svg)](https://microbadger.com/images/thecodingmachine/php:8.5-v5-fpm)
| [thecodingmachine/php:8.5-v5-fpm-node20](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.fpm.node) | `8.5.x` | fat | fpm | `20.x` | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.5-v5-fpm-node20.svg)](https://microbadger.com/images/thecodingmachine/php:8.5-v5-fpm-node20)
| [thecodingmachine/php:8.5-v5-fpm-node22](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.fpm.node) | `8.5.x` | fat | fpm | `22.x` | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.5-v5-fpm-node22.svg)](https://microbadger.com/images/thecodingmachine/php:8.5-v5-fpm-node22)
| [thecodingmachine/php:8.5-v5-fpm-node24](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.fpm.node) | `8.5.x` | fat | fpm | `24.x` | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.5-v5-fpm-node24.svg)](https://microbadger.com/images/thecodingmachine/php:8.5-v5-fpm-node24)
| [thecodingmachine/php:8.5-v5-cli](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.cli) | `8.5.x` | fat | cli | *N/A* | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.5-v5-cli.svg)](https://microbadger.com/images/thecodingmachine/php:8.5-v5-cli)
| [thecodingmachine/php:8.5-v5-cli-node20](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.cli.node) | `8.5.x` | fat | cli | `20.x` | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.5-v5-cli-node20.svg)](https://microbadger.com/images/thecodingmachine/php:8.5-v5-cli-node20)
| [thecodingmachine/php:8.5-v5-cli-node22](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.cli.node) | `8.5.x` | fat | cli | `22.x` | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.5-v5-cli-node22.svg)](https://microbadger.com/images/thecodingmachine/php:8.5-v5-cli-node22)
| [thecodingmachine/php:8.5-v5-cli-node24](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.cli.node) | `8.5.x` | fat | cli | `24.x` | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.5-v5-cli-node24.svg)](https://microbadger.com/images/thecodingmachine/php:8.5-v5-cli-node24)
| [thecodingmachine/php:8.5-v5-slim-apache](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.slim.apache) | `8.5.x` | slim | apache | *N/A* | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.5-v5-slim-apache.svg)](https://microbadger.com/images/thecodingmachine/php:8.5-v5-slim-apache)
| [thecodingmachine/php:8.5-v5-slim-fpm](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.slim.fpm) | `8.5.x` | slim | fpm | *N/A* | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.5-v5-slim-fpm.svg)](https://microbadger.com/images/thecodingmachine/php:8.5-v5-slim-fpm)
| [thecodingmachine/php:8.5-v5-slim-cli](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.slim.cli) | `8.5.x` | slim | cli | *N/A* | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.5-v5-slim-cli.svg)](https://microbadger.com/images/thecodingmachine/php:8.5-v5-slim-cli)
| [thecodingmachine/php:8.4-v5-apache](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.apache) | `8.4.x` | fat | apache | *N/A* | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.4-v5-apache.svg)](https://microbadger.com/images/thecodingmachine/php:8.4-v5-apache)
| [thecodingmachine/php:8.4-v5-apache-node20](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.apache.node) | `8.4.x` | fat | apache | `20.x` | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.4-v5-apache-node20.svg)](https://microbadger.com/images/thecodingmachine/php:8.4-v5-apache-node20)
| [thecodingmachine/php:8.4-v5-apache-node22](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.apache.node) | `8.4.x` | fat | apache | `22.x` | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.4-v5-apache-node22.svg)](https://microbadger.com/images/thecodingmachine/php:8.4-v5-apache-node22)
Expand Down Expand Up @@ -151,8 +166,7 @@ This list can be outdated, you can verify by executing : `docker run --rm -it th
**Note**:

- *ev* is not available in PHP 8.1+
- *rdkafka* and *snmp* are not available in all `ARM64` images (build time is too long : it's possible to install manually as required)
- *blackfire* not supported yet in PHP8.4 : https://support.blackfire.platform.sh/hc/en-us/articles/4740726712082-PHP-versions-Platforms-support
- *rdkafka* and *snmp* are not available in all `ARM64` images (build time is too long : it's possible to install manually as required)

### Enabling/disabling extensions in the fat image

Expand Down
Loading