diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 1510fd7..b41c994 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -16,7 +16,7 @@ jobs: strategy: fail-fast: false matrix: - php_version: ['8.5', '8.4', '8.3','8.2','8.1'] + php_version: ['8.5', '8.4', '8.3', '8.2'] variant: ['apache','cli','fpm'] builder: [ {arch: "amd64", os: "ubuntu-24.04"}, {arch: "arm64", os: "ubuntu-24.04-arm"}] runs-on: ${{ matrix.builder.os }} @@ -87,7 +87,7 @@ jobs: strategy: fail-fast: false matrix: - php_version: ['8.5', '8.4', '8.3','8.2','8.1'] + php_version: ['8.5', '8.4', '8.3', '8.2'] variant: ['apache','cli','fpm'] steps: - name: Checkout diff --git a/CHANGELOG.md b/CHANGELOG.md index 781a425..0ff0b1a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,8 @@ * Document the supported PHP and NodeJS versions * Add the `decimal`, `gnupg`, `inotify`, `lz4`, `mcrypt`, `odbc`, `pdo_odbc` and `zstd` extensions on PHP 8.2+ * Remove the unused `weakref` extension (PHP provides `WeakReference` natively since 7.4) + * Support for Node v26 (corepack is now installed with npm since NodeJS no longer bundles it from v25) + * PHP 8.1 and Node v20 (end of life) are no longer built by the main workflow: they are only built by the legacy workflow (Node v20 for PHP 8.1, 8.0 and 7.4) * **2025-11-26** * Support for PHP 8.5 diff --git a/Dockerfile.apache.node b/Dockerfile.apache.node index a84b62a..d7c141f 100644 --- a/Dockerfile.apache.node +++ b/Dockerfile.apache.node @@ -29,6 +29,10 @@ RUN apt update && \ fi && \ apt update && \ apt install -y --no-install-recommends nodejs && \ + if [[ "${NODE_VERSION}" -ge "25" ]]; then \ + # corepack is no longer bundled with NodeJS since v25 + npm install -g corepack; \ + fi && \ if [[ "${NODE_VERSION}" -ge "16" ]]; then \ corepack enable && corepack prepare yarn@stable --activate; \ else \ diff --git a/Dockerfile.cli.node b/Dockerfile.cli.node index dd52141..e367cac 100644 --- a/Dockerfile.cli.node +++ b/Dockerfile.cli.node @@ -29,6 +29,10 @@ RUN apt update && \ fi && \ apt update && \ apt install -y --no-install-recommends nodejs && \ + if [[ "${NODE_VERSION}" -ge "25" ]]; then \ + # corepack is no longer bundled with NodeJS since v25 + npm install -g corepack; \ + fi && \ if [[ "${NODE_VERSION}" -ge "16" ]]; then \ corepack enable && corepack prepare yarn@stable --activate; \ else \ diff --git a/Dockerfile.fpm.node b/Dockerfile.fpm.node index 841843a..3216e22 100644 --- a/Dockerfile.fpm.node +++ b/Dockerfile.fpm.node @@ -29,6 +29,10 @@ RUN apt update && \ fi && \ apt update && \ apt install -y --no-install-recommends nodejs && \ + if [[ "${NODE_VERSION}" -ge "25" ]]; then \ + # corepack is no longer bundled with NodeJS since v25 + npm install -g corepack; \ + fi && \ if [[ "${NODE_VERSION}" -ge "16" ]]; then \ corepack enable && corepack prepare yarn@stable --activate; \ else \ diff --git a/Dockerfile.slim.apache b/Dockerfile.slim.apache index 2063742..8706191 100644 --- a/Dockerfile.slim.apache +++ b/Dockerfile.slim.apache @@ -406,6 +406,10 @@ ONBUILD RUN if [ -n "$NODE_VERSION" ]; then \ fi && \ sudo apt update && \ sudo apt install -y --no-install-recommends nodejs && \ + if [[ "${NODE_VERSION}" -ge "25" ]]; then \ + # corepack is no longer bundled with NodeJS since v25 + sudo npm install -g corepack; \ + fi && \ if [[ "${NODE_VERSION}" -ge "16" ]]; then \ sudo corepack enable && sudo corepack prepare yarn@stable --activate; \ else \ diff --git a/Dockerfile.slim.cli b/Dockerfile.slim.cli index 1530c94..dc40e27 100644 --- a/Dockerfile.slim.cli +++ b/Dockerfile.slim.cli @@ -311,6 +311,10 @@ ONBUILD RUN if [ -n "$NODE_VERSION" ]; then \ fi && \ sudo apt update && \ sudo apt install -y --no-install-recommends nodejs && \ + if [[ "${NODE_VERSION}" -ge "25" ]]; then \ + # corepack is no longer bundled with NodeJS since v25 + sudo npm install -g corepack; \ + fi && \ if [[ "${NODE_VERSION}" -ge "16" ]]; then \ sudo corepack enable && sudo corepack prepare yarn@stable --activate; \ else \ diff --git a/Dockerfile.slim.fpm b/Dockerfile.slim.fpm index 75cc984..99f9299 100644 --- a/Dockerfile.slim.fpm +++ b/Dockerfile.slim.fpm @@ -330,6 +330,10 @@ ONBUILD RUN if [ -n "$NODE_VERSION" ]; then \ fi && \ sudo apt update && \ sudo apt install -y --no-install-recommends nodejs && \ + if [[ "${NODE_VERSION}" -ge "25" ]]; then \ + # corepack is no longer bundled with NodeJS since v25 + sudo npm install -g corepack; \ + fi && \ if [[ "${NODE_VERSION}" -ge "16" ]]; then \ sudo corepack enable && sudo corepack prepare yarn@stable --activate; \ else \ diff --git a/Makefile b/Makefile index fc6d742..6c7e0a2 100644 --- a/Makefile +++ b/Makefile @@ -50,9 +50,9 @@ test-8.4: ## Test php8.4 build only VERSION=8.4 VARIANT=fpm $(MAKE) _test-version test-node: ## Test node builds only - VERSION=8.4 VARIANT=cli NODE=18 $(MAKE) _test-node - VERSION=8.4 VARIANT=cli NODE=20 $(MAKE) _test-node VERSION=8.4 VARIANT=cli NODE=22 $(MAKE) _test-node + VERSION=8.4 VARIANT=cli NODE=24 $(MAKE) _test-node + VERSION=8.4 VARIANT=cli NODE=26 $(MAKE) _test-node _test-node: _test-prerequisites ## Test node for VERSION="" and VARIANT="" docker buildx bake --load \ diff --git a/README.md b/README.md index 8858a43..684615e 100644 --- a/README.md +++ b/README.md @@ -23,62 +23,62 @@ This repository contains a set of developer-friendly, general purpose PHP images | 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-apache-node26](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.apache.node) | `8.5.x` | fat | apache | `26.x` | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.5-v5-apache-node26.svg)](https://microbadger.com/images/thecodingmachine/php:8.5-v5-apache-node26) | [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-fpm-node26](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.fpm.node) | `8.5.x` | fat | fpm | `26.x` | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.5-v5-fpm-node26.svg)](https://microbadger.com/images/thecodingmachine/php:8.5-v5-fpm-node26) | [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-cli-node26](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.cli.node) | `8.5.x` | fat | cli | `26.x` | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.5-v5-cli-node26.svg)](https://microbadger.com/images/thecodingmachine/php:8.5-v5-cli-node26) | [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) | [thecodingmachine/php:8.4-v5-apache-node24](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.apache.node) | `8.4.x` | fat | apache | `24.x` | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.4-v5-apache-node24.svg)](https://microbadger.com/images/thecodingmachine/php:8.4-v5-apache-node24) +| [thecodingmachine/php:8.4-v5-apache-node26](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.apache.node) | `8.4.x` | fat | apache | `26.x` | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.4-v5-apache-node26.svg)](https://microbadger.com/images/thecodingmachine/php:8.4-v5-apache-node26) | [thecodingmachine/php:8.4-v5-fpm](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.fpm) | `8.4.x` | fat | fpm | *N/A* | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.4-v5-fpm.svg)](https://microbadger.com/images/thecodingmachine/php:8.4-v5-fpm) -| [thecodingmachine/php:8.4-v5-fpm-node20](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.fpm.node) | `8.4.x` | fat | fpm | `20.x` | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.4-v5-fpm-node20.svg)](https://microbadger.com/images/thecodingmachine/php:8.4-v5-fpm-node20) | [thecodingmachine/php:8.4-v5-fpm-node22](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.fpm.node) | `8.4.x` | fat | fpm | `22.x` | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.4-v5-fpm-node22.svg)](https://microbadger.com/images/thecodingmachine/php:8.4-v5-fpm-node22) | [thecodingmachine/php:8.4-v5-fpm-node24](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.fpm.node) | `8.4.x` | fat | fpm | `24.x` | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.4-v5-fpm-node24.svg)](https://microbadger.com/images/thecodingmachine/php:8.4-v5-fpm-node24) +| [thecodingmachine/php:8.4-v5-fpm-node26](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.fpm.node) | `8.4.x` | fat | fpm | `26.x` | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.4-v5-fpm-node26.svg)](https://microbadger.com/images/thecodingmachine/php:8.4-v5-fpm-node26) | [thecodingmachine/php:8.4-v5-cli](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.cli) | `8.4.x` | fat | cli | *N/A* | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.4-v5-cli.svg)](https://microbadger.com/images/thecodingmachine/php:8.4-v5-cli) -| [thecodingmachine/php:8.4-v5-cli-node20](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.cli.node) | `8.4.x` | fat | cli | `20.x` | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.4-v5-cli-node20.svg)](https://microbadger.com/images/thecodingmachine/php:8.4-v5-cli-node20) | [thecodingmachine/php:8.4-v5-cli-node22](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.cli.node) | `8.4.x` | fat | cli | `22.x` | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.4-v5-cli-node22.svg)](https://microbadger.com/images/thecodingmachine/php:8.4-v5-cli-node22) | [thecodingmachine/php:8.4-v5-cli-node24](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.cli.node) | `8.4.x` | fat | cli | `24.x` | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.4-v5-cli-node24.svg)](https://microbadger.com/images/thecodingmachine/php:8.4-v5-cli-node24) +| [thecodingmachine/php:8.4-v5-cli-node26](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.cli.node) | `8.4.x` | fat | cli | `26.x` | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.4-v5-cli-node26.svg)](https://microbadger.com/images/thecodingmachine/php:8.4-v5-cli-node26) | [thecodingmachine/php:8.4-v5-slim-apache](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.slim.apache) | `8.4.x` | slim | apache | *N/A* | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.4-v5-slim-apache.svg)](https://microbadger.com/images/thecodingmachine/php:8.4-v5-slim-apache) | [thecodingmachine/php:8.4-v5-slim-fpm](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.slim.fpm) | `8.4.x` | slim | fpm | *N/A* | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.4-v5-slim-fpm.svg)](https://microbadger.com/images/thecodingmachine/php:8.4-v5-slim-fpm) | [thecodingmachine/php:8.4-v5-slim-cli](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.slim.cli) | `8.4.x` | slim | cli | *N/A* | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.4-v5-slim-cli.svg)](https://microbadger.com/images/thecodingmachine/php:8.4-v5-slim-cli) | [thecodingmachine/php:8.3-v5-apache](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.apache) | `8.3.x` | fat | apache | *N/A* | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.3-v5-apache.svg)](https://microbadger.com/images/thecodingmachine/php:8.3-v5-apache) -| [thecodingmachine/php:8.3-v5-apache-node20](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.apache.node) | `8.3.x` | fat | apache | `20.x` | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.3-v5-apache-node20.svg)](https://microbadger.com/images/thecodingmachine/php:8.3-v5-apache-node20) | [thecodingmachine/php:8.3-v5-apache-node22](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.apache.node) | `8.3.x` | fat | apache | `22.x` | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.3-v5-apache-node22.svg)](https://microbadger.com/images/thecodingmachine/php:8.3-v5-apache-node22) | [thecodingmachine/php:8.3-v5-apache-node24](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.apache.node) | `8.3.x` | fat | apache | `24.x` | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.3-v5-apache-node24.svg)](https://microbadger.com/images/thecodingmachine/php:8.3-v5-apache-node24) +| [thecodingmachine/php:8.3-v5-apache-node26](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.apache.node) | `8.3.x` | fat | apache | `26.x` | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.3-v5-apache-node26.svg)](https://microbadger.com/images/thecodingmachine/php:8.3-v5-apache-node26) | [thecodingmachine/php:8.3-v5-fpm](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.fpm) | `8.3.x` | fat | fpm | *N/A* | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.3-v5-fpm.svg)](https://microbadger.com/images/thecodingmachine/php:8.3-v5-fpm) -| [thecodingmachine/php:8.3-v5-fpm-node20](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.fpm.node) | `8.3.x` | fat | fpm | `20.x` | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.3-v5-fpm-node20.svg)](https://microbadger.com/images/thecodingmachine/php:8.3-v5-fpm-node20) | [thecodingmachine/php:8.3-v5-fpm-node22](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.fpm.node) | `8.3.x` | fat | fpm | `22.x` | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.3-v5-fpm-node22.svg)](https://microbadger.com/images/thecodingmachine/php:8.3-v5-fpm-node22) | [thecodingmachine/php:8.3-v5-fpm-node24](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.fpm.node) | `8.3.x` | fat | fpm | `24.x` | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.3-v5-fpm-node24.svg)](https://microbadger.com/images/thecodingmachine/php:8.3-v5-fpm-node24) +| [thecodingmachine/php:8.3-v5-fpm-node26](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.fpm.node) | `8.3.x` | fat | fpm | `26.x` | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.3-v5-fpm-node26.svg)](https://microbadger.com/images/thecodingmachine/php:8.3-v5-fpm-node26) | [thecodingmachine/php:8.3-v5-cli](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.cli) | `8.3.x` | fat | cli | *N/A* | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.3-v5-cli.svg)](https://microbadger.com/images/thecodingmachine/php:8.3-v5-cli) -| [thecodingmachine/php:8.3-v5-cli-node20](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.cli.node) | `8.3.x` | fat | cli | `20.x` | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.3-v5-cli-node20.svg)](https://microbadger.com/images/thecodingmachine/php:8.3-v5-cli-node20) | [thecodingmachine/php:8.3-v5-cli-node22](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.cli.node) | `8.3.x` | fat | cli | `22.x` | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.3-v5-cli-node22.svg)](https://microbadger.com/images/thecodingmachine/php:8.3-v5-cli-node22) | [thecodingmachine/php:8.3-v5-cli-node24](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.cli.node) | `8.3.x` | fat | cli | `24.x` | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.3-v5-cli-node24.svg)](https://microbadger.com/images/thecodingmachine/php:8.3-v5-cli-node24) +| [thecodingmachine/php:8.3-v5-cli-node26](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.cli.node) | `8.3.x` | fat | cli | `26.x` | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.3-v5-cli-node26.svg)](https://microbadger.com/images/thecodingmachine/php:8.3-v5-cli-node26) | [thecodingmachine/php:8.3-v5-slim-apache](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.slim.apache) | `8.3.x` | slim | apache | *N/A* | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.3-v5-slim-apache.svg)](https://microbadger.com/images/thecodingmachine/php:8.3-v5-slim-apache) | [thecodingmachine/php:8.3-v5-slim-fpm](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.slim.fpm) | `8.3.x` | slim | fpm | *N/A* | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.3-v5-slim-fpm.svg)](https://microbadger.com/images/thecodingmachine/php:8.3-v5-slim-fpm) | [thecodingmachine/php:8.3-v5-slim-cli](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.slim.cli) | `8.3.x` | slim | cli | *N/A* | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.3-v5-slim-cli.svg)](https://microbadger.com/images/thecodingmachine/php:8.3-v5-slim-cli) | [thecodingmachine/php:8.2-v5-apache](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.apache) | `8.2.x` | fat | apache | *N/A* | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.2-v5-apache.svg)](https://microbadger.com/images/thecodingmachine/php:8.2-v5-apache) -| [thecodingmachine/php:8.2-v5-apache-node20](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.apache.node) | `8.2.x` | fat | apache | `20.x` | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.2-v5-apache-node20.svg)](https://microbadger.com/images/thecodingmachine/php:8.2-v5-apache-node20) | [thecodingmachine/php:8.2-v5-apache-node22](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.apache.node) | `8.2.x` | fat | apache | `22.x` | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.2-v5-apache-node22.svg)](https://microbadger.com/images/thecodingmachine/php:8.2-v5-apache-node22) | [thecodingmachine/php:8.2-v5-apache-node24](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.apache.node) | `8.2.x` | fat | apache | `24.x` | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.2-v5-apache-node24.svg)](https://microbadger.com/images/thecodingmachine/php:8.2-v5-apache-node24) +| [thecodingmachine/php:8.2-v5-apache-node26](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.apache.node) | `8.2.x` | fat | apache | `26.x` | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.2-v5-apache-node26.svg)](https://microbadger.com/images/thecodingmachine/php:8.2-v5-apache-node26) | [thecodingmachine/php:8.2-v5-fpm](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.fpm) | `8.2.x` | fat | fpm | *N/A* | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.2-v5-fpm.svg)](https://microbadger.com/images/thecodingmachine/php:8.2-v5-fpm) -| [thecodingmachine/php:8.2-v5-fpm-node20](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.fpm.node) | `8.2.x` | fat | fpm | `20.x` | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.2-v5-fpm-node20.svg)](https://microbadger.com/images/thecodingmachine/php:8.2-v5-fpm-node20) | [thecodingmachine/php:8.2-v5-fpm-node22](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.fpm.node) | `8.2.x` | fat | fpm | `22.x` | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.2-v5-fpm-node22.svg)](https://microbadger.com/images/thecodingmachine/php:8.2-v5-fpm-node22) | [thecodingmachine/php:8.2-v5-fpm-node24](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.fpm.node) | `8.2.x` | fat | fpm | `24.x` | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.2-v5-fpm-node24.svg)](https://microbadger.com/images/thecodingmachine/php:8.2-v5-fpm-node24) +| [thecodingmachine/php:8.2-v5-fpm-node26](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.fpm.node) | `8.2.x` | fat | fpm | `26.x` | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.2-v5-fpm-node26.svg)](https://microbadger.com/images/thecodingmachine/php:8.2-v5-fpm-node26) | [thecodingmachine/php:8.2-v5-cli](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.cli) | `8.2.x` | fat | cli | *N/A* | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.2-v5-cli.svg)](https://microbadger.com/images/thecodingmachine/php:8.2-v5-cli) -| [thecodingmachine/php:8.2-v5-cli-node20](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.cli.node) | `8.2.x` | fat | cli | `20.x` | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.2-v5-cli-node20.svg)](https://microbadger.com/images/thecodingmachine/php:8.2-v5-cli-node20) | [thecodingmachine/php:8.2-v5-cli-node22](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.cli.node) | `8.2.x` | fat | cli | `22.x` | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.2-v5-cli-node22.svg)](https://microbadger.com/images/thecodingmachine/php:8.2-v5-cli-node22) | [thecodingmachine/php:8.2-v5-cli-node24](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.cli.node) | `8.2.x` | fat | cli | `24.x` | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.2-v5-cli-node24.svg)](https://microbadger.com/images/thecodingmachine/php:8.2-v5-cli-node24) +| [thecodingmachine/php:8.2-v5-cli-node26](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.cli.node) | `8.2.x` | fat | cli | `26.x` | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.2-v5-cli-node26.svg)](https://microbadger.com/images/thecodingmachine/php:8.2-v5-cli-node26) | [thecodingmachine/php:8.2-v5-slim-apache](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.slim.apache) | `8.2.x` | slim | apache | *N/A* | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.2-v5-slim-apache.svg)](https://microbadger.com/images/thecodingmachine/php:8.2-v5-slim-apache) | [thecodingmachine/php:8.2-v5-slim-fpm](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.slim.fpm) | `8.2.x` | slim | fpm | *N/A* | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.2-v5-slim-fpm.svg)](https://microbadger.com/images/thecodingmachine/php:8.2-v5-slim-fpm) | [thecodingmachine/php:8.2-v5-slim-cli](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.slim.cli) | `8.2.x` | slim | cli | *N/A* | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.2-v5-slim-cli.svg)](https://microbadger.com/images/thecodingmachine/php:8.2-v5-slim-cli) @@ -86,14 +86,17 @@ This repository contains a set of developer-friendly, general purpose PHP images | [thecodingmachine/php:8.1-v5-apache-node20](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.apache.node) | `8.1.x` | fat | apache | `20.x` | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.1-v5-apache-node20.svg)](https://microbadger.com/images/thecodingmachine/php:8.1-v5-apache-node20) | [thecodingmachine/php:8.1-v5-apache-node22](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.apache.node) | `8.1.x` | fat | apache | `22.x` | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.1-v5-apache-node22.svg)](https://microbadger.com/images/thecodingmachine/php:8.1-v5-apache-node22) | [thecodingmachine/php:8.1-v5-apache-node24](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.apache.node) | `8.1.x` | fat | apache | `24.x` | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.1-v5-apache-node24.svg)](https://microbadger.com/images/thecodingmachine/php:8.1-v5-apache-node24) +| [thecodingmachine/php:8.1-v5-apache-node26](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.apache.node) | `8.1.x` | fat | apache | `26.x` | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.1-v5-apache-node26.svg)](https://microbadger.com/images/thecodingmachine/php:8.1-v5-apache-node26) | [thecodingmachine/php:8.1-v5-fpm](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.fpm) | `8.1.x` | fat | fpm | *N/A* | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.1-v5-fpm.svg)](https://microbadger.com/images/thecodingmachine/php:8.1-v5-fpm) | [thecodingmachine/php:8.1-v5-fpm-node20](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.fpm.node) | `8.1.x` | fat | fpm | `20.x` | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.1-v5-fpm-node20.svg)](https://microbadger.com/images/thecodingmachine/php:8.1-v5-fpm-node20) | [thecodingmachine/php:8.1-v5-fpm-node22](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.fpm.node) | `8.1.x` | fat | fpm | `22.x` | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.1-v5-fpm-node22.svg)](https://microbadger.com/images/thecodingmachine/php:8.1-v5-fpm-node22) | [thecodingmachine/php:8.1-v5-fpm-node24](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.fpm.node) | `8.1.x` | fat | fpm | `24.x` | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.1-v5-fpm-node24.svg)](https://microbadger.com/images/thecodingmachine/php:8.1-v5-fpm-node24) +| [thecodingmachine/php:8.1-v5-fpm-node26](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.fpm.node) | `8.1.x` | fat | fpm | `26.x` | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.1-v5-fpm-node26.svg)](https://microbadger.com/images/thecodingmachine/php:8.1-v5-fpm-node26) | [thecodingmachine/php:8.1-v5-cli](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.cli) | `8.1.x` | fat | cli | *N/A* | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.1-v5-cli.svg)](https://microbadger.com/images/thecodingmachine/php:8.1-v5-cli) | [thecodingmachine/php:8.1-v5-cli-node20](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.cli.node) | `8.1.x` | fat | cli | `20.x` | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.1-v5-cli-node20.svg)](https://microbadger.com/images/thecodingmachine/php:8.1-v5-cli-node20) | [thecodingmachine/php:8.1-v5-cli-node22](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.cli.node) | `8.1.x` | fat | cli | `22.x` | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.1-v5-cli-node22.svg)](https://microbadger.com/images/thecodingmachine/php:8.1-v5-cli-node22) | [thecodingmachine/php:8.1-v5-cli-node24](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.cli.node) | `8.1.x` | fat | cli | `24.x` | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.1-v5-cli-node24.svg)](https://microbadger.com/images/thecodingmachine/php:8.1-v5-cli-node24) +| [thecodingmachine/php:8.1-v5-cli-node26](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.cli.node) | `8.1.x` | fat | cli | `26.x` | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.1-v5-cli-node26.svg)](https://microbadger.com/images/thecodingmachine/php:8.1-v5-cli-node26) | [thecodingmachine/php:8.1-v5-slim-apache](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.slim.apache) | `8.1.x` | slim | apache | *N/A* | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.1-v5-slim-apache.svg)](https://microbadger.com/images/thecodingmachine/php:8.1-v5-slim-apache) | [thecodingmachine/php:8.1-v5-slim-fpm](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.slim.fpm) | `8.1.x` | slim | fpm | *N/A* | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.1-v5-slim-fpm.svg)](https://microbadger.com/images/thecodingmachine/php:8.1-v5-slim-fpm) | [thecodingmachine/php:8.1-v5-slim-cli](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.slim.cli) | `8.1.x` | slim | cli | *N/A* | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.1-v5-slim-cli.svg)](https://microbadger.com/images/thecodingmachine/php:8.1-v5-slim-cli) @@ -125,6 +128,7 @@ Bugs are fixed on maintained versions only. | NodeJS version | Status | |----------------|-----------------------------------------------| +| 26 | Maintained (until 2029-04-30) | | 24 | Maintained (until 2028-04-30) | | 22 | Maintained (until 2027-04-30) | | 20 | **Not maintained** (end of life: 2026-04-30) | @@ -383,7 +387,7 @@ In that case the manually set value takes precedence over the mentioned ones abo ## NodeJS -The *fat* images come with a Node variant. You can use Node : 20 22 24. If you need a previous variant, [use thecodingmachine/php v4 images](https://github.com/thecodingmachine/docker-images-php/tree/v4), [php v3 images](https://github.com/thecodingmachine/docker-images-php/tree/v3) or [v1](https://github.com/thecodingmachine/docker-images-php/tree/7.2-v1). +The *fat* images come with a Node variant. You can use Node : 22 24 26. If you need a previous variant, [use thecodingmachine/php v4 images](https://github.com/thecodingmachine/docker-images-php/tree/v4), [php v3 images](https://github.com/thecodingmachine/docker-images-php/tree/v3) or [v1](https://github.com/thecodingmachine/docker-images-php/tree/7.2-v1). If you use the *slim* images, you can install a NodeJS version with a simple ARG during the build: diff --git a/docker-bake.hcl b/docker-bake.hcl index 75883b8..0b28e93 100644 --- a/docker-bake.hcl +++ b/docker-bake.hcl @@ -17,147 +17,147 @@ group "php85-apache-all" { targets = [ "php85-slim-apache", "php85-apache", - "php85-apache-node24","php85-apache-node22","php85-apache-node20", + "php85-apache-node26","php85-apache-node24","php85-apache-node22", ] } group "php85-fpm-all" { targets = [ "php85-slim-fpm", "php85-fpm", - "php85-fpm-node24","php85-fpm-node22","php85-fpm-node20", + "php85-fpm-node26","php85-fpm-node24","php85-fpm-node22", ] } group "php85-cli-all" { targets = [ "php85-slim-cli", "php85-cli", - "php85-cli-node24","php85-cli-node22","php85-cli-node20", + "php85-cli-node26","php85-cli-node24","php85-cli-node22", ] } group "php84-apache-all" { targets = [ "php84-slim-apache", "php84-apache", - "php84-apache-node24","php84-apache-node22","php84-apache-node20", + "php84-apache-node26","php84-apache-node24","php84-apache-node22", ] } group "php84-fpm-all" { targets = [ "php84-slim-fpm", "php84-fpm", - "php84-fpm-node24","php84-fpm-node22","php84-fpm-node20", + "php84-fpm-node26","php84-fpm-node24","php84-fpm-node22", ] } group "php84-cli-all" { targets = [ "php84-slim-cli", "php84-cli", - "php84-cli-node24","php84-cli-node22","php84-cli-node20", + "php84-cli-node26","php84-cli-node24","php84-cli-node22", ] } group "php83-apache-all" { targets = [ "php83-slim-apache", "php83-apache", - "php83-apache-node24","php83-apache-node22","php83-apache-node20", + "php83-apache-node26","php83-apache-node24","php83-apache-node22", ] } group "php83-fpm-all" { targets = [ "php83-slim-fpm", "php83-fpm", - "php83-fpm-node24","php83-fpm-node22","php83-fpm-node20", + "php83-fpm-node26","php83-fpm-node24","php83-fpm-node22", ] } group "php83-cli-all" { targets = [ "php83-slim-cli", "php83-cli", - "php83-cli-node24","php83-cli-node22","php83-cli-node20", + "php83-cli-node26","php83-cli-node24","php83-cli-node22", ] } group "php82-apache-all" { targets = [ "php82-slim-apache", "php82-apache", - "php82-apache-node24","php82-apache-node22","php82-apache-node20", + "php82-apache-node26","php82-apache-node24","php82-apache-node22", ] } group "php82-fpm-all" { targets = [ "php82-slim-fpm", "php82-fpm", - "php82-fpm-node24","php82-fpm-node22","php82-fpm-node20", + "php82-fpm-node26","php82-fpm-node24","php82-fpm-node22", ] } group "php82-cli-all" { targets = [ "php82-slim-cli", "php82-cli", - "php82-cli-node24","php82-cli-node22","php82-cli-node20", + "php82-cli-node26","php82-cli-node24","php82-cli-node22", ] } group "php81-apache-all" { targets = [ "php81-slim-apache", "php81-apache", - "php81-apache-node24","php81-apache-node22","php81-apache-node20", + "php81-apache-node26","php81-apache-node24","php81-apache-node22","php81-apache-node20", ] } group "php81-fpm-all" { targets = [ "php81-slim-fpm", "php81-fpm", - "php81-fpm-node24","php81-fpm-node22","php81-fpm-node20", + "php81-fpm-node26","php81-fpm-node24","php81-fpm-node22","php81-fpm-node20", ] } group "php81-cli-all" { targets = [ "php81-slim-cli", "php81-cli", - "php81-cli-node24","php81-cli-node22","php81-cli-node20", + "php81-cli-node26","php81-cli-node24","php81-cli-node22","php81-cli-node20", ] } group "php80-apache-all" { targets = [ "php80-slim-apache", "php80-apache", - "php80-apache-node24","php80-apache-node22","php80-apache-node20", + "php80-apache-node26","php80-apache-node24","php80-apache-node22","php80-apache-node20", ] } group "php80-fpm-all" { targets = [ "php80-slim-fpm", "php80-fpm", - "php80-fpm-node24","php80-fpm-node22","php80-fpm-node20", + "php80-fpm-node26","php80-fpm-node24","php80-fpm-node22","php80-fpm-node20", ] } group "php80-cli-all" { targets = [ "php80-slim-cli", "php80-cli", - "php80-cli-node24","php80-cli-node22","php80-cli-node20", + "php80-cli-node26","php80-cli-node24","php80-cli-node22","php80-cli-node20", ] } group "php74-apache-all" { targets = [ "php74-slim-apache", "php74-apache", - "php74-apache-node24","php74-apache-node22","php74-apache-node20", + "php74-apache-node26","php74-apache-node24","php74-apache-node22","php74-apache-node20", ] } group "php74-fpm-all" { targets = [ "php74-slim-fpm", "php74-fpm", - "php74-fpm-node24","php74-fpm-node22","php74-fpm-node20", + "php74-fpm-node26","php74-fpm-node24","php74-fpm-node22","php74-fpm-node20", ] } group "php74-cli-all" { targets = [ "php74-slim-cli", "php74-cli", - "php74-cli-node24","php74-cli-node22","php74-cli-node20", + "php74-cli-node26","php74-cli-node24","php74-cli-node22","php74-cli-node20", ] } @@ -241,48 +241,48 @@ target "php85-apache" { } } -# thecodingmachine/php:8.5-v5-apache-node24 -target "php85-apache-node24" { +# thecodingmachine/php:8.5-v5-apache-node26 +target "php85-apache-node26" { inherits = ["default"] - tags = tag("8.5", "apache-node24") + tags = tag("8.5", "apache-node26") dockerfile = "Dockerfile.apache.node" args = { PHP_VERSION = "8.5" - VARIANT = "apache-node24" + VARIANT = "apache-node26" FROM_IMAGE = "fat" - NODE_VERSION = "24" + NODE_VERSION = "26" } contexts = { fat = "target:php85-apache" } } -# thecodingmachine/php:8.5-v5-apache-node22 -target "php85-apache-node22" { +# thecodingmachine/php:8.5-v5-apache-node24 +target "php85-apache-node24" { inherits = ["default"] - tags = tag("8.5", "apache-node22") + tags = tag("8.5", "apache-node24") dockerfile = "Dockerfile.apache.node" args = { PHP_VERSION = "8.5" - VARIANT = "apache-node22" + VARIANT = "apache-node24" FROM_IMAGE = "fat" - NODE_VERSION = "22" + NODE_VERSION = "24" } contexts = { fat = "target:php85-apache" } } -# thecodingmachine/php:8.5-v5-apache-node20 -target "php85-apache-node20" { +# thecodingmachine/php:8.5-v5-apache-node22 +target "php85-apache-node22" { inherits = ["default"] - tags = tag("8.5", "apache-node20") + tags = tag("8.5", "apache-node22") dockerfile = "Dockerfile.apache.node" args = { PHP_VERSION = "8.5" - VARIANT = "apache-node20" + VARIANT = "apache-node22" FROM_IMAGE = "fat" - NODE_VERSION = "20" + NODE_VERSION = "22" } contexts = { fat = "target:php85-apache" @@ -318,48 +318,48 @@ target "php85-fpm" { } } -# thecodingmachine/php:8.5-v5-fpm-node24 -target "php85-fpm-node24" { +# thecodingmachine/php:8.5-v5-fpm-node26 +target "php85-fpm-node26" { inherits = ["default"] - tags = tag("8.5", "fpm-node24") + tags = tag("8.5", "fpm-node26") dockerfile = "Dockerfile.fpm.node" args = { PHP_VERSION = "8.5" - VARIANT = "fpm-node24" + VARIANT = "fpm-node26" FROM_IMAGE = "fat" - NODE_VERSION = "24" + NODE_VERSION = "26" } contexts = { fat = "target:php85-fpm" } } -# thecodingmachine/php:8.5-v5-fpm-node22 -target "php85-fpm-node22" { +# thecodingmachine/php:8.5-v5-fpm-node24 +target "php85-fpm-node24" { inherits = ["default"] - tags = tag("8.5", "fpm-node22") + tags = tag("8.5", "fpm-node24") dockerfile = "Dockerfile.fpm.node" args = { PHP_VERSION = "8.5" - VARIANT = "fpm-node22" + VARIANT = "fpm-node24" FROM_IMAGE = "fat" - NODE_VERSION = "22" + NODE_VERSION = "24" } contexts = { fat = "target:php85-fpm" } } -# thecodingmachine/php:8.5-v5-fpm-node20 -target "php85-fpm-node20" { +# thecodingmachine/php:8.5-v5-fpm-node22 +target "php85-fpm-node22" { inherits = ["default"] - tags = tag("8.5", "fpm-node20") + tags = tag("8.5", "fpm-node22") dockerfile = "Dockerfile.fpm.node" args = { PHP_VERSION = "8.5" - VARIANT = "fpm-node20" + VARIANT = "fpm-node22" FROM_IMAGE = "fat" - NODE_VERSION = "20" + NODE_VERSION = "22" } contexts = { fat = "target:php85-fpm" @@ -395,48 +395,48 @@ target "php85-cli" { } } -# thecodingmachine/php:8.5-v5-cli-node24 -target "php85-cli-node24" { +# thecodingmachine/php:8.5-v5-cli-node26 +target "php85-cli-node26" { inherits = ["default"] - tags = tag("8.5", "cli-node24") + tags = tag("8.5", "cli-node26") dockerfile = "Dockerfile.cli.node" args = { PHP_VERSION = "8.5" - VARIANT = "cli-node24" + VARIANT = "cli-node26" FROM_IMAGE = "fat" - NODE_VERSION = "24" + NODE_VERSION = "26" } contexts = { fat = "target:php85-cli" } } -# thecodingmachine/php:8.5-v5-cli-node22 -target "php85-cli-node22" { +# thecodingmachine/php:8.5-v5-cli-node24 +target "php85-cli-node24" { inherits = ["default"] - tags = tag("8.5", "cli-node22") + tags = tag("8.5", "cli-node24") dockerfile = "Dockerfile.cli.node" args = { PHP_VERSION = "8.5" - VARIANT = "cli-node22" + VARIANT = "cli-node24" FROM_IMAGE = "fat" - NODE_VERSION = "22" + NODE_VERSION = "24" } contexts = { fat = "target:php85-cli" } } -# thecodingmachine/php:8.5-v5-cli-node20 -target "php85-cli-node20" { +# thecodingmachine/php:8.5-v5-cli-node22 +target "php85-cli-node22" { inherits = ["default"] - tags = tag("8.5", "cli-node20") + tags = tag("8.5", "cli-node22") dockerfile = "Dockerfile.cli.node" args = { PHP_VERSION = "8.5" - VARIANT = "cli-node20" + VARIANT = "cli-node22" FROM_IMAGE = "fat" - NODE_VERSION = "20" + NODE_VERSION = "22" } contexts = { fat = "target:php85-cli" @@ -472,48 +472,48 @@ target "php84-apache" { } } -# thecodingmachine/php:8.4-v5-apache-node24 -target "php84-apache-node24" { +# thecodingmachine/php:8.4-v5-apache-node26 +target "php84-apache-node26" { inherits = ["default"] - tags = tag("8.4", "apache-node24") + tags = tag("8.4", "apache-node26") dockerfile = "Dockerfile.apache.node" args = { PHP_VERSION = "8.4" - VARIANT = "apache-node24" + VARIANT = "apache-node26" FROM_IMAGE = "fat" - NODE_VERSION = "24" + NODE_VERSION = "26" } contexts = { fat = "target:php84-apache" } } -# thecodingmachine/php:8.4-v5-apache-node22 -target "php84-apache-node22" { +# thecodingmachine/php:8.4-v5-apache-node24 +target "php84-apache-node24" { inherits = ["default"] - tags = tag("8.4", "apache-node22") + tags = tag("8.4", "apache-node24") dockerfile = "Dockerfile.apache.node" args = { PHP_VERSION = "8.4" - VARIANT = "apache-node22" + VARIANT = "apache-node24" FROM_IMAGE = "fat" - NODE_VERSION = "22" + NODE_VERSION = "24" } contexts = { fat = "target:php84-apache" } } -# thecodingmachine/php:8.4-v5-apache-node20 -target "php84-apache-node20" { +# thecodingmachine/php:8.4-v5-apache-node22 +target "php84-apache-node22" { inherits = ["default"] - tags = tag("8.4", "apache-node20") + tags = tag("8.4", "apache-node22") dockerfile = "Dockerfile.apache.node" args = { PHP_VERSION = "8.4" - VARIANT = "apache-node20" + VARIANT = "apache-node22" FROM_IMAGE = "fat" - NODE_VERSION = "20" + NODE_VERSION = "22" } contexts = { fat = "target:php84-apache" @@ -549,48 +549,48 @@ target "php84-fpm" { } } -# thecodingmachine/php:8.4-v5-fpm-node24 -target "php84-fpm-node24" { +# thecodingmachine/php:8.4-v5-fpm-node26 +target "php84-fpm-node26" { inherits = ["default"] - tags = tag("8.4", "fpm-node24") + tags = tag("8.4", "fpm-node26") dockerfile = "Dockerfile.fpm.node" args = { PHP_VERSION = "8.4" - VARIANT = "fpm-node24" + VARIANT = "fpm-node26" FROM_IMAGE = "fat" - NODE_VERSION = "24" + NODE_VERSION = "26" } contexts = { fat = "target:php84-fpm" } } -# thecodingmachine/php:8.4-v5-fpm-node22 -target "php84-fpm-node22" { +# thecodingmachine/php:8.4-v5-fpm-node24 +target "php84-fpm-node24" { inherits = ["default"] - tags = tag("8.4", "fpm-node22") + tags = tag("8.4", "fpm-node24") dockerfile = "Dockerfile.fpm.node" args = { PHP_VERSION = "8.4" - VARIANT = "fpm-node22" + VARIANT = "fpm-node24" FROM_IMAGE = "fat" - NODE_VERSION = "22" + NODE_VERSION = "24" } contexts = { fat = "target:php84-fpm" } } -# thecodingmachine/php:8.4-v5-fpm-node20 -target "php84-fpm-node20" { +# thecodingmachine/php:8.4-v5-fpm-node22 +target "php84-fpm-node22" { inherits = ["default"] - tags = tag("8.4", "fpm-node20") + tags = tag("8.4", "fpm-node22") dockerfile = "Dockerfile.fpm.node" args = { PHP_VERSION = "8.4" - VARIANT = "fpm-node20" + VARIANT = "fpm-node22" FROM_IMAGE = "fat" - NODE_VERSION = "20" + NODE_VERSION = "22" } contexts = { fat = "target:php84-fpm" @@ -626,48 +626,48 @@ target "php84-cli" { } } -# thecodingmachine/php:8.4-v5-cli-node24 -target "php84-cli-node24" { +# thecodingmachine/php:8.4-v5-cli-node26 +target "php84-cli-node26" { inherits = ["default"] - tags = tag("8.4", "cli-node24") + tags = tag("8.4", "cli-node26") dockerfile = "Dockerfile.cli.node" args = { PHP_VERSION = "8.4" - VARIANT = "cli-node24" + VARIANT = "cli-node26" FROM_IMAGE = "fat" - NODE_VERSION = "24" + NODE_VERSION = "26" } contexts = { fat = "target:php84-cli" } } -# thecodingmachine/php:8.4-v5-cli-node22 -target "php84-cli-node22" { +# thecodingmachine/php:8.4-v5-cli-node24 +target "php84-cli-node24" { inherits = ["default"] - tags = tag("8.4", "cli-node22") + tags = tag("8.4", "cli-node24") dockerfile = "Dockerfile.cli.node" args = { PHP_VERSION = "8.4" - VARIANT = "cli-node22" + VARIANT = "cli-node24" FROM_IMAGE = "fat" - NODE_VERSION = "22" + NODE_VERSION = "24" } contexts = { fat = "target:php84-cli" } } -# thecodingmachine/php:8.4-v5-cli-node20 -target "php84-cli-node20" { +# thecodingmachine/php:8.4-v5-cli-node22 +target "php84-cli-node22" { inherits = ["default"] - tags = tag("8.4", "cli-node20") + tags = tag("8.4", "cli-node22") dockerfile = "Dockerfile.cli.node" args = { PHP_VERSION = "8.4" - VARIANT = "cli-node20" + VARIANT = "cli-node22" FROM_IMAGE = "fat" - NODE_VERSION = "20" + NODE_VERSION = "22" } contexts = { fat = "target:php84-cli" @@ -703,48 +703,48 @@ target "php83-apache" { } } -# thecodingmachine/php:8.3-v5-apache-node24 -target "php83-apache-node24" { +# thecodingmachine/php:8.3-v5-apache-node26 +target "php83-apache-node26" { inherits = ["default"] - tags = tag("8.3", "apache-node24") + tags = tag("8.3", "apache-node26") dockerfile = "Dockerfile.apache.node" args = { PHP_VERSION = "8.3" - VARIANT = "apache-node24" + VARIANT = "apache-node26" FROM_IMAGE = "fat" - NODE_VERSION = "24" + NODE_VERSION = "26" } contexts = { fat = "target:php83-apache" } } -# thecodingmachine/php:8.3-v5-apache-node22 -target "php83-apache-node22" { +# thecodingmachine/php:8.3-v5-apache-node24 +target "php83-apache-node24" { inherits = ["default"] - tags = tag("8.3", "apache-node22") + tags = tag("8.3", "apache-node24") dockerfile = "Dockerfile.apache.node" args = { PHP_VERSION = "8.3" - VARIANT = "apache-node22" + VARIANT = "apache-node24" FROM_IMAGE = "fat" - NODE_VERSION = "22" + NODE_VERSION = "24" } contexts = { fat = "target:php83-apache" } } -# thecodingmachine/php:8.3-v5-apache-node20 -target "php83-apache-node20" { +# thecodingmachine/php:8.3-v5-apache-node22 +target "php83-apache-node22" { inherits = ["default"] - tags = tag("8.3", "apache-node20") + tags = tag("8.3", "apache-node22") dockerfile = "Dockerfile.apache.node" args = { PHP_VERSION = "8.3" - VARIANT = "apache-node20" + VARIANT = "apache-node22" FROM_IMAGE = "fat" - NODE_VERSION = "20" + NODE_VERSION = "22" } contexts = { fat = "target:php83-apache" @@ -780,48 +780,48 @@ target "php83-fpm" { } } -# thecodingmachine/php:8.3-v5-fpm-node24 -target "php83-fpm-node24" { +# thecodingmachine/php:8.3-v5-fpm-node26 +target "php83-fpm-node26" { inherits = ["default"] - tags = tag("8.3", "fpm-node24") + tags = tag("8.3", "fpm-node26") dockerfile = "Dockerfile.fpm.node" args = { PHP_VERSION = "8.3" - VARIANT = "fpm-node24" + VARIANT = "fpm-node26" FROM_IMAGE = "fat" - NODE_VERSION = "24" + NODE_VERSION = "26" } contexts = { fat = "target:php83-fpm" } } -# thecodingmachine/php:8.3-v5-fpm-node22 -target "php83-fpm-node22" { +# thecodingmachine/php:8.3-v5-fpm-node24 +target "php83-fpm-node24" { inherits = ["default"] - tags = tag("8.3", "fpm-node22") + tags = tag("8.3", "fpm-node24") dockerfile = "Dockerfile.fpm.node" args = { PHP_VERSION = "8.3" - VARIANT = "fpm-node22" + VARIANT = "fpm-node24" FROM_IMAGE = "fat" - NODE_VERSION = "22" + NODE_VERSION = "24" } contexts = { fat = "target:php83-fpm" } } -# thecodingmachine/php:8.3-v5-fpm-node20 -target "php83-fpm-node20" { +# thecodingmachine/php:8.3-v5-fpm-node22 +target "php83-fpm-node22" { inherits = ["default"] - tags = tag("8.3", "fpm-node20") + tags = tag("8.3", "fpm-node22") dockerfile = "Dockerfile.fpm.node" args = { PHP_VERSION = "8.3" - VARIANT = "fpm-node20" + VARIANT = "fpm-node22" FROM_IMAGE = "fat" - NODE_VERSION = "20" + NODE_VERSION = "22" } contexts = { fat = "target:php83-fpm" @@ -857,48 +857,48 @@ target "php83-cli" { } } -# thecodingmachine/php:8.3-v5-cli-node24 -target "php83-cli-node24" { +# thecodingmachine/php:8.3-v5-cli-node26 +target "php83-cli-node26" { inherits = ["default"] - tags = tag("8.3", "cli-node24") + tags = tag("8.3", "cli-node26") dockerfile = "Dockerfile.cli.node" args = { PHP_VERSION = "8.3" - VARIANT = "cli-node24" + VARIANT = "cli-node26" FROM_IMAGE = "fat" - NODE_VERSION = "24" + NODE_VERSION = "26" } contexts = { fat = "target:php83-cli" } } -# thecodingmachine/php:8.3-v5-cli-node22 -target "php83-cli-node22" { +# thecodingmachine/php:8.3-v5-cli-node24 +target "php83-cli-node24" { inherits = ["default"] - tags = tag("8.3", "cli-node22") + tags = tag("8.3", "cli-node24") dockerfile = "Dockerfile.cli.node" args = { PHP_VERSION = "8.3" - VARIANT = "cli-node22" + VARIANT = "cli-node24" FROM_IMAGE = "fat" - NODE_VERSION = "22" + NODE_VERSION = "24" } contexts = { fat = "target:php83-cli" } } -# thecodingmachine/php:8.3-v5-cli-node20 -target "php83-cli-node20" { +# thecodingmachine/php:8.3-v5-cli-node22 +target "php83-cli-node22" { inherits = ["default"] - tags = tag("8.3", "cli-node20") + tags = tag("8.3", "cli-node22") dockerfile = "Dockerfile.cli.node" args = { PHP_VERSION = "8.3" - VARIANT = "cli-node20" + VARIANT = "cli-node22" FROM_IMAGE = "fat" - NODE_VERSION = "20" + NODE_VERSION = "22" } contexts = { fat = "target:php83-cli" @@ -934,48 +934,48 @@ target "php82-apache" { } } -# thecodingmachine/php:8.2-v5-apache-node24 -target "php82-apache-node24" { +# thecodingmachine/php:8.2-v5-apache-node26 +target "php82-apache-node26" { inherits = ["default"] - tags = tag("8.2", "apache-node24") + tags = tag("8.2", "apache-node26") dockerfile = "Dockerfile.apache.node" args = { PHP_VERSION = "8.2" - VARIANT = "apache-node24" + VARIANT = "apache-node26" FROM_IMAGE = "fat" - NODE_VERSION = "24" + NODE_VERSION = "26" } contexts = { fat = "target:php82-apache" } } -# thecodingmachine/php:8.2-v5-apache-node22 -target "php82-apache-node22" { +# thecodingmachine/php:8.2-v5-apache-node24 +target "php82-apache-node24" { inherits = ["default"] - tags = tag("8.2", "apache-node22") + tags = tag("8.2", "apache-node24") dockerfile = "Dockerfile.apache.node" args = { PHP_VERSION = "8.2" - VARIANT = "apache-node22" + VARIANT = "apache-node24" FROM_IMAGE = "fat" - NODE_VERSION = "22" + NODE_VERSION = "24" } contexts = { fat = "target:php82-apache" } } -# thecodingmachine/php:8.2-v5-apache-node20 -target "php82-apache-node20" { +# thecodingmachine/php:8.2-v5-apache-node22 +target "php82-apache-node22" { inherits = ["default"] - tags = tag("8.2", "apache-node20") + tags = tag("8.2", "apache-node22") dockerfile = "Dockerfile.apache.node" args = { PHP_VERSION = "8.2" - VARIANT = "apache-node20" + VARIANT = "apache-node22" FROM_IMAGE = "fat" - NODE_VERSION = "20" + NODE_VERSION = "22" } contexts = { fat = "target:php82-apache" @@ -1011,48 +1011,48 @@ target "php82-fpm" { } } -# thecodingmachine/php:8.2-v5-fpm-node24 -target "php82-fpm-node24" { +# thecodingmachine/php:8.2-v5-fpm-node26 +target "php82-fpm-node26" { inherits = ["default"] - tags = tag("8.2", "fpm-node24") + tags = tag("8.2", "fpm-node26") dockerfile = "Dockerfile.fpm.node" args = { PHP_VERSION = "8.2" - VARIANT = "fpm-node24" + VARIANT = "fpm-node26" FROM_IMAGE = "fat" - NODE_VERSION = "24" + NODE_VERSION = "26" } contexts = { fat = "target:php82-fpm" } } -# thecodingmachine/php:8.2-v5-fpm-node22 -target "php82-fpm-node22" { +# thecodingmachine/php:8.2-v5-fpm-node24 +target "php82-fpm-node24" { inherits = ["default"] - tags = tag("8.2", "fpm-node22") + tags = tag("8.2", "fpm-node24") dockerfile = "Dockerfile.fpm.node" args = { PHP_VERSION = "8.2" - VARIANT = "fpm-node22" + VARIANT = "fpm-node24" FROM_IMAGE = "fat" - NODE_VERSION = "22" + NODE_VERSION = "24" } contexts = { fat = "target:php82-fpm" } } -# thecodingmachine/php:8.2-v5-fpm-node20 -target "php82-fpm-node20" { +# thecodingmachine/php:8.2-v5-fpm-node22 +target "php82-fpm-node22" { inherits = ["default"] - tags = tag("8.2", "fpm-node20") + tags = tag("8.2", "fpm-node22") dockerfile = "Dockerfile.fpm.node" args = { PHP_VERSION = "8.2" - VARIANT = "fpm-node20" + VARIANT = "fpm-node22" FROM_IMAGE = "fat" - NODE_VERSION = "20" + NODE_VERSION = "22" } contexts = { fat = "target:php82-fpm" @@ -1088,48 +1088,48 @@ target "php82-cli" { } } -# thecodingmachine/php:8.2-v5-cli-node24 -target "php82-cli-node24" { +# thecodingmachine/php:8.2-v5-cli-node26 +target "php82-cli-node26" { inherits = ["default"] - tags = tag("8.2", "cli-node24") + tags = tag("8.2", "cli-node26") dockerfile = "Dockerfile.cli.node" args = { PHP_VERSION = "8.2" - VARIANT = "cli-node24" + VARIANT = "cli-node26" FROM_IMAGE = "fat" - NODE_VERSION = "24" + NODE_VERSION = "26" } contexts = { fat = "target:php82-cli" } } -# thecodingmachine/php:8.2-v5-cli-node22 -target "php82-cli-node22" { +# thecodingmachine/php:8.2-v5-cli-node24 +target "php82-cli-node24" { inherits = ["default"] - tags = tag("8.2", "cli-node22") + tags = tag("8.2", "cli-node24") dockerfile = "Dockerfile.cli.node" args = { PHP_VERSION = "8.2" - VARIANT = "cli-node22" + VARIANT = "cli-node24" FROM_IMAGE = "fat" - NODE_VERSION = "22" + NODE_VERSION = "24" } contexts = { fat = "target:php82-cli" } } -# thecodingmachine/php:8.2-v5-cli-node20 -target "php82-cli-node20" { +# thecodingmachine/php:8.2-v5-cli-node22 +target "php82-cli-node22" { inherits = ["default"] - tags = tag("8.2", "cli-node20") + tags = tag("8.2", "cli-node22") dockerfile = "Dockerfile.cli.node" args = { PHP_VERSION = "8.2" - VARIANT = "cli-node20" + VARIANT = "cli-node22" FROM_IMAGE = "fat" - NODE_VERSION = "20" + NODE_VERSION = "22" } contexts = { fat = "target:php82-cli" @@ -1165,6 +1165,22 @@ target "php81-apache" { } } +# thecodingmachine/php:8.1-v5-apache-node26 +target "php81-apache-node26" { + inherits = ["default"] + tags = tag("8.1", "apache-node26") + dockerfile = "Dockerfile.apache.node" + args = { + PHP_VERSION = "8.1" + VARIANT = "apache-node26" + FROM_IMAGE = "fat" + NODE_VERSION = "26" + } + contexts = { + fat = "target:php81-apache" + } +} + # thecodingmachine/php:8.1-v5-apache-node24 target "php81-apache-node24" { inherits = ["default"] @@ -1242,6 +1258,22 @@ target "php81-fpm" { } } +# thecodingmachine/php:8.1-v5-fpm-node26 +target "php81-fpm-node26" { + inherits = ["default"] + tags = tag("8.1", "fpm-node26") + dockerfile = "Dockerfile.fpm.node" + args = { + PHP_VERSION = "8.1" + VARIANT = "fpm-node26" + FROM_IMAGE = "fat" + NODE_VERSION = "26" + } + contexts = { + fat = "target:php81-fpm" + } +} + # thecodingmachine/php:8.1-v5-fpm-node24 target "php81-fpm-node24" { inherits = ["default"] @@ -1319,6 +1351,22 @@ target "php81-cli" { } } +# thecodingmachine/php:8.1-v5-cli-node26 +target "php81-cli-node26" { + inherits = ["default"] + tags = tag("8.1", "cli-node26") + dockerfile = "Dockerfile.cli.node" + args = { + PHP_VERSION = "8.1" + VARIANT = "cli-node26" + FROM_IMAGE = "fat" + NODE_VERSION = "26" + } + contexts = { + fat = "target:php81-cli" + } +} + # thecodingmachine/php:8.1-v5-cli-node24 target "php81-cli-node24" { inherits = ["default"] @@ -1396,6 +1444,22 @@ target "php80-apache" { } } +# thecodingmachine/php:8.0-v5-apache-node26 +target "php80-apache-node26" { + inherits = ["default"] + tags = tag("8.0", "apache-node26") + dockerfile = "Dockerfile.apache.node" + args = { + PHP_VERSION = "8.0" + VARIANT = "apache-node26" + FROM_IMAGE = "fat" + NODE_VERSION = "26" + } + contexts = { + fat = "target:php80-apache" + } +} + # thecodingmachine/php:8.0-v5-apache-node24 target "php80-apache-node24" { inherits = ["default"] @@ -1473,6 +1537,22 @@ target "php80-fpm" { } } +# thecodingmachine/php:8.0-v5-fpm-node26 +target "php80-fpm-node26" { + inherits = ["default"] + tags = tag("8.0", "fpm-node26") + dockerfile = "Dockerfile.fpm.node" + args = { + PHP_VERSION = "8.0" + VARIANT = "fpm-node26" + FROM_IMAGE = "fat" + NODE_VERSION = "26" + } + contexts = { + fat = "target:php80-fpm" + } +} + # thecodingmachine/php:8.0-v5-fpm-node24 target "php80-fpm-node24" { inherits = ["default"] @@ -1550,6 +1630,22 @@ target "php80-cli" { } } +# thecodingmachine/php:8.0-v5-cli-node26 +target "php80-cli-node26" { + inherits = ["default"] + tags = tag("8.0", "cli-node26") + dockerfile = "Dockerfile.cli.node" + args = { + PHP_VERSION = "8.0" + VARIANT = "cli-node26" + FROM_IMAGE = "fat" + NODE_VERSION = "26" + } + contexts = { + fat = "target:php80-cli" + } +} + # thecodingmachine/php:8.0-v5-cli-node24 target "php80-cli-node24" { inherits = ["default"] @@ -1627,6 +1723,22 @@ target "php74-apache" { } } +# thecodingmachine/php:7.4-v5-apache-node26 +target "php74-apache-node26" { + inherits = ["default"] + tags = tag("7.4", "apache-node26") + dockerfile = "Dockerfile.apache.node" + args = { + PHP_VERSION = "7.4" + VARIANT = "apache-node26" + FROM_IMAGE = "fat" + NODE_VERSION = "26" + } + contexts = { + fat = "target:php74-apache" + } +} + # thecodingmachine/php:7.4-v5-apache-node24 target "php74-apache-node24" { inherits = ["default"] @@ -1704,6 +1816,22 @@ target "php74-fpm" { } } +# thecodingmachine/php:7.4-v5-fpm-node26 +target "php74-fpm-node26" { + inherits = ["default"] + tags = tag("7.4", "fpm-node26") + dockerfile = "Dockerfile.fpm.node" + args = { + PHP_VERSION = "7.4" + VARIANT = "fpm-node26" + FROM_IMAGE = "fat" + NODE_VERSION = "26" + } + contexts = { + fat = "target:php74-fpm" + } +} + # thecodingmachine/php:7.4-v5-fpm-node24 target "php74-fpm-node24" { inherits = ["default"] @@ -1781,6 +1909,22 @@ target "php74-cli" { } } +# thecodingmachine/php:7.4-v5-cli-node26 +target "php74-cli-node26" { + inherits = ["default"] + tags = tag("7.4", "cli-node26") + dockerfile = "Dockerfile.cli.node" + args = { + PHP_VERSION = "7.4" + VARIANT = "cli-node26" + FROM_IMAGE = "fat" + NODE_VERSION = "26" + } + contexts = { + fat = "target:php74-cli" + } +} + # thecodingmachine/php:7.4-v5-cli-node24 target "php74-cli-node24" { inherits = ["default"] diff --git a/utils/Dockerfile.node.blueprint b/utils/Dockerfile.node.blueprint index 91dfb30..a8732c4 100644 --- a/utils/Dockerfile.node.blueprint +++ b/utils/Dockerfile.node.blueprint @@ -28,6 +28,10 @@ RUN apt update && \ fi && \ apt update && \ apt install -y --no-install-recommends nodejs && \ + if [[ "${NODE_VERSION}" -ge "25" ]]; then \ + # corepack is no longer bundled with NodeJS since v25 + npm install -g corepack; \ + fi && \ if [[ "${NODE_VERSION}" -ge "16" ]]; then \ corepack enable && corepack prepare yarn@stable --activate; \ else \ diff --git a/utils/Dockerfile.slim.blueprint b/utils/Dockerfile.slim.blueprint index 62caefd..4cf8fa0 100644 --- a/utils/Dockerfile.slim.blueprint +++ b/utils/Dockerfile.slim.blueprint @@ -431,6 +431,10 @@ ONBUILD RUN if [ -n "$NODE_VERSION" ]; then \ fi && \ sudo apt update && \ sudo apt install -y --no-install-recommends nodejs && \ + if [[ "${NODE_VERSION}" -ge "25" ]]; then \ + # corepack is no longer bundled with NodeJS since v25 + sudo npm install -g corepack; \ + fi && \ if [[ "${NODE_VERSION}" -ge "16" ]]; then \ sudo corepack enable && sudo corepack prepare yarn@stable --activate; \ else \ diff --git a/utils/README.blueprint.md b/utils/README.blueprint.md index ce4b92b..bf7d61d 100644 --- a/utils/README.blueprint.md +++ b/utils/README.blueprint.md @@ -17,16 +17,16 @@ This repository contains a set of developer-friendly, general purpose PHP images ## Images {{ $versions := list "8.5" "8.4" "8.3" "8.2" "8.1" }} -{{ $nodeVersions := list "20" "22" "24" }} +{{ $nodeVersions := list "22" "24" "26" }}{{ $legacyVersions := list "8.1" }}{{ $legacyNodeVersions := list "20" "22" "24" "26" }} | Name | PHP version | type |variant | NodeJS version | Size |-------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------|--------------------------------------------|--------|-----------------|------ -{{range $phpV := $versions}}| [thecodingmachine/php:{{ $phpV }}-v5-apache](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.apache) | `{{ $phpV }}.x` | fat | apache | *N/A* | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:{{ $phpV }}-v5-apache.svg)](https://microbadger.com/images/thecodingmachine/php:{{ $phpV }}-v5-apache) -{{range $nodeV := $nodeVersions}}| [thecodingmachine/php:{{ $phpV }}-v5-apache-node{{ $nodeV }}](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.apache.node) | `{{ $phpV }}.x` | fat | apache | `{{ $nodeV }}.x` | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:{{ $phpV }}-v5-apache-node{{ $nodeV }}.svg)](https://microbadger.com/images/thecodingmachine/php:{{ $phpV }}-v5-apache-node{{ $nodeV }}) +{{range $phpV := $versions}}{{ $nodes := $nodeVersions }}{{ if has $phpV $legacyVersions }}{{ $nodes = $legacyNodeVersions }}{{ end }}| [thecodingmachine/php:{{ $phpV }}-v5-apache](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.apache) | `{{ $phpV }}.x` | fat | apache | *N/A* | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:{{ $phpV }}-v5-apache.svg)](https://microbadger.com/images/thecodingmachine/php:{{ $phpV }}-v5-apache) +{{range $nodeV := $nodes}}| [thecodingmachine/php:{{ $phpV }}-v5-apache-node{{ $nodeV }}](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.apache.node) | `{{ $phpV }}.x` | fat | apache | `{{ $nodeV }}.x` | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:{{ $phpV }}-v5-apache-node{{ $nodeV }}.svg)](https://microbadger.com/images/thecodingmachine/php:{{ $phpV }}-v5-apache-node{{ $nodeV }}) {{ end }}| [thecodingmachine/php:{{ $phpV }}-v5-fpm](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.fpm) | `{{ $phpV }}.x` | fat | fpm | *N/A* | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:{{ $phpV }}-v5-fpm.svg)](https://microbadger.com/images/thecodingmachine/php:{{ $phpV }}-v5-fpm) -{{range $nodeV := $nodeVersions}}| [thecodingmachine/php:{{ $phpV }}-v5-fpm-node{{ $nodeV }}](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.fpm.node) | `{{ $phpV }}.x` | fat | fpm | `{{ $nodeV }}.x` | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:{{ $phpV }}-v5-fpm-node{{ $nodeV }}.svg)](https://microbadger.com/images/thecodingmachine/php:{{ $phpV }}-v5-fpm-node{{ $nodeV }}) +{{range $nodeV := $nodes}}| [thecodingmachine/php:{{ $phpV }}-v5-fpm-node{{ $nodeV }}](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.fpm.node) | `{{ $phpV }}.x` | fat | fpm | `{{ $nodeV }}.x` | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:{{ $phpV }}-v5-fpm-node{{ $nodeV }}.svg)](https://microbadger.com/images/thecodingmachine/php:{{ $phpV }}-v5-fpm-node{{ $nodeV }}) {{ end }}| [thecodingmachine/php:{{ $phpV }}-v5-cli](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.cli) | `{{ $phpV }}.x` | fat | cli | *N/A* | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:{{ $phpV }}-v5-cli.svg)](https://microbadger.com/images/thecodingmachine/php:{{ $phpV }}-v5-cli) -{{range $nodeV := $nodeVersions}}| [thecodingmachine/php:{{ $phpV }}-v5-cli-node{{ $nodeV }}](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.cli.node) | `{{ $phpV }}.x` | fat | cli | `{{ $nodeV }}.x` | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:{{ $phpV }}-v5-cli-node{{ $nodeV }}.svg)](https://microbadger.com/images/thecodingmachine/php:{{ $phpV }}-v5-cli-node{{ $nodeV }}) +{{range $nodeV := $nodes}}| [thecodingmachine/php:{{ $phpV }}-v5-cli-node{{ $nodeV }}](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.cli.node) | `{{ $phpV }}.x` | fat | cli | `{{ $nodeV }}.x` | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:{{ $phpV }}-v5-cli-node{{ $nodeV }}.svg)](https://microbadger.com/images/thecodingmachine/php:{{ $phpV }}-v5-cli-node{{ $nodeV }}) {{ end }}| [thecodingmachine/php:{{ $phpV }}-v5-slim-apache](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.slim.apache) | `{{ $phpV }}.x` | slim | apache | *N/A* | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:{{ $phpV }}-v5-slim-apache.svg)](https://microbadger.com/images/thecodingmachine/php:{{ $phpV }}-v5-slim-apache) | [thecodingmachine/php:{{ $phpV }}-v5-slim-fpm](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.slim.fpm) | `{{ $phpV }}.x` | slim | fpm | *N/A* | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:{{ $phpV }}-v5-slim-fpm.svg)](https://microbadger.com/images/thecodingmachine/php:{{ $phpV }}-v5-slim-fpm) | [thecodingmachine/php:{{ $phpV }}-v5-slim-cli](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.slim.cli) | `{{ $phpV }}.x` | slim | cli | *N/A* | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:{{ $phpV }}-v5-slim-cli.svg)](https://microbadger.com/images/thecodingmachine/php:{{ $phpV }}-v5-slim-cli) @@ -58,6 +58,7 @@ Bugs are fixed on maintained versions only. | NodeJS version | Status | |----------------|-----------------------------------------------| +| 26 | Maintained (until 2029-04-30) | | 24 | Maintained (until 2028-04-30) | | 22 | Maintained (until 2027-04-30) | | 20 | **Not maintained** (end of life: 2026-04-30) | diff --git a/utils/docker-bake.blueprint.hcl b/utils/docker-bake.blueprint.hcl index fefa6c8..3516949 100644 --- a/utils/docker-bake.blueprint.hcl +++ b/utils/docker-bake.blueprint.hcl @@ -1,16 +1,16 @@ -{{ $variants := list "apache" "fpm" "cli" }}{{ $versions := list "8.5" "8.4" "8.3" "8.2" "8.1" "8.0" "7.4" }}{{ $nodeVersions := list "24" "22" "20" }} +{{ $variants := list "apache" "fpm" "cli" }}{{ $versions := list "8.5" "8.4" "8.3" "8.2" "8.1" "8.0" "7.4" }}{{ $nodeVersions := list "26" "24" "22" }}{{ $legacyVersions := list "8.1" "8.0" "7.4" }}{{ $legacyNodeVersions := list "26" "24" "22" "20" }} group "default" { targets = [ {{range $phpV := $versions}} "php{{ $phpV | replace "." "" }}",{{end}} ] } -{{range $phpV := $versions}}{{range $variant := $variants}} +{{range $phpV := $versions}}{{range $variant := $variants}}{{ $nodes := $nodeVersions }}{{ if has $phpV $legacyVersions }}{{ $nodes = $legacyNodeVersions }}{{ end }} group "php{{ $phpV | replace "." "" }}-{{ $variant }}-all" { targets = [ "php{{ $phpV | replace "." "" }}-slim-{{ $variant }}", "php{{ $phpV | replace "." "" }}-{{ $variant }}", - {{range $nodeV := $nodeVersions}}"php{{ $phpV | replace "." "" }}-{{ $variant }}-node{{ $nodeV }}",{{end}} + {{range $nodeV := $nodes}}"php{{ $phpV | replace "." "" }}-{{ $variant }}-node{{ $nodeV }}",{{end}} ] }{{end}}{{end}} @@ -46,7 +46,7 @@ target "default" { output = ["type=docker"] # export in local docker } -{{range $phpV := $versions}}{{range $variant := $variants}} +{{range $phpV := $versions}}{{range $variant := $variants}}{{ $nodes := $nodeVersions }}{{ if has $phpV $legacyVersions }}{{ $nodes = $legacyNodeVersions }}{{ end }} ########################### ## PHP {{ $phpV }} ########################### @@ -75,7 +75,7 @@ target "php{{ $phpV | replace "." "" }}-{{ $variant }}" { slim = "target:php{{ $phpV | replace "." "" }}-slim-{{ $variant }}" } } -{{range $nodeV := $nodeVersions}} +{{range $nodeV := $nodes}} # thecodingmachine/php:{{ $phpV }}-v5-{{ $variant }}-node{{ $nodeV }} target "php{{ $phpV | replace "." "" }}-{{ $variant }}-node{{ $nodeV }}" { inherits = ["default"]