diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e3a502d15..862a2ca2a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,7 +8,7 @@ on: pull_request: env: - PHP_VERSION: 8.4 + PHP_VERSION: 8.5 CYPRESS_PROJECT_ID: w8t3fx jobs: diff --git a/.github/workflows/pull-locales.yml b/.github/workflows/pull-locales.yml index 7533b0138..ca20b3777 100644 --- a/.github/workflows/pull-locales.yml +++ b/.github/workflows/pull-locales.yml @@ -11,7 +11,7 @@ on: - cron: "0 * * * *" env: - PHP_VERSION: 8.4 + PHP_VERSION: 8.5 jobs: pull-locales: diff --git a/.github/workflows/upload-locales.yml b/.github/workflows/upload-locales.yml index 8974834f6..38bf68ec6 100644 --- a/.github/workflows/upload-locales.yml +++ b/.github/workflows/upload-locales.yml @@ -12,7 +12,7 @@ on: - "develop" env: - PHP_VERSION: 8.4 + PHP_VERSION: 8.5 jobs: pull-locales: diff --git a/CHANGELOG.md b/CHANGELOG.md index 9a4b621f7..61f31ac69 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +### Changed + +- Bump base PHP image to 8.5 ([#2814]) + ## [v4.12.0] - 2026-02-09 ### Added @@ -680,6 +684,7 @@ You can find the changelog for older versions there [here](https://github.com/TH [#2789]: https://github.com/THM-Health/PILOS/pull/2789 [#2798]: https://github.com/THM-Health/PILOS/pull/2798 [#2809]: https://github.com/THM-Health/PILOS/pull/2809 +[#2814]: https://github.com/THM-Health/PILOS/pull/2814 [unreleased]: https://github.com/THM-Health/PILOS/compare/v4.12.0...develop [v3.0.0]: https://github.com/THM-Health/PILOS/releases/tag/v3.0.0 [v3.0.1]: https://github.com/THM-Health/PILOS/releases/tag/v3.0.1 diff --git a/composer.json b/composer.json index 413779239..39fdcdb2d 100644 --- a/composer.json +++ b/composer.json @@ -8,7 +8,7 @@ ], "license": "MIT", "require": { - "php": "^8.4", + "php": "^8.5", "ext-curl": "*", "ext-json": "*", "ext-redis": "*", diff --git a/docker/app/Dockerfile b/docker/app/Dockerfile index ae8d87534..a8118cefa 100644 --- a/docker/app/Dockerfile +++ b/docker/app/Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.4-fpm-alpine +FROM php:8.5-fpm-alpine LABEL maintainer="Samuel Weirich" LABEL description="Development and production container for PILOS, compatible with laravel sail; heavily inspired by offical image"