Skip to content

Commit 21f49b8

Browse files
committed
Add PHP 8.5-rc dev env
1 parent 227b978 commit 21f49b8

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

.github/workflows/glpi-development-env.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ jobs:
2929
- {base-image: "php:8.2-apache-trixie", php-version: "8.2", latest: "false"}
3030
- {base-image: "php:8.3-apache-trixie", php-version: "8.3", latest: "false"}
3131
- {base-image: "php:8.4-apache-trixie", php-version: "8.4", latest: "true"}
32+
- {base-image: "php:8.5-rc-apache-trixie", php-version: "8.5", latest: "false"}
3233
steps:
3334
- name: "Set variables"
3435
run: |

glpi-development-env/Dockerfile

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ LABEL \
1919

2020
RUN apt update \
2121
&& PHP_MAJOR_VERSION="$(echo $PHP_VERSION | cut -d '.' -f 1)" \
22+
&& PHP_MINOR_VERSION="$(echo $PHP_VERSION | cut -d '.' -f 2)" \
2223
\
2324
# Install bz2 extension (for marketplace).
2425
&& apt install --assume-yes --no-install-recommends --quiet libbz2-dev \
@@ -52,8 +53,10 @@ RUN apt update \
5253
# Install bcmath PHP extension.
5354
&& docker-php-ext-install bcmath \
5455
\
55-
# Install opcache PHP extension.
56-
&& docker-php-ext-install opcache \
56+
# Install opcache PHP extension (it is already enabled in PHP 8.5+ images).
57+
&& if [ $PHP_MINOR_VERSION -ne "8.5" ]; then \
58+
docker-php-ext-install opcache \
59+
; fi \
5760
\
5861
# Install pcntl PHP extension (required for composer-require-checker).
5962
&& docker-php-ext-install pcntl \

0 commit comments

Comments
 (0)