Skip to content
Merged
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.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 }}
Expand Down Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions Dockerfile.apache.node
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
4 changes: 4 additions & 0 deletions Dockerfile.cli.node
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
4 changes: 4 additions & 0 deletions Dockerfile.fpm.node
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
4 changes: 4 additions & 0 deletions Dockerfile.slim.apache
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
4 changes: 4 additions & 0 deletions Dockerfile.slim.cli
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
4 changes: 4 additions & 0 deletions Dockerfile.slim.fpm
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
30 changes: 17 additions & 13 deletions README.md

Large diffs are not rendered by default.

Loading
Loading