Skip to content

Commit 9338d1d

Browse files
committed
Allow to build with PHP 8.5
1 parent a5494e5 commit 9338d1d

File tree

7 files changed

+18
-13
lines changed

7 files changed

+18
-13
lines changed

.github/workflows/docker.build.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
build:
1414
strategy:
1515
matrix:
16-
php: [ 8.1.33, 8.2.29, 8.3.28, 8.4.15 ]
16+
php: [ 8.1.33, 8.2.29, 8.3.28, 8.4.15, 8.5.0 ]
1717
runs-on: ubuntu-latest
1818
steps:
1919
- uses: actions/checkout@v4

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ services:
4646
- NGINX_PHP_FPM_HOST=app_php.local_beach
4747

4848
php:
49-
image: flownative/php:8.3
49+
image: flownative/php:8.5
5050
volumes:
5151
- application:/application
5252
environment:
@@ -108,7 +108,7 @@ you can take advantage of the non-root approach by disallowing privilege
108108
escalation:
109109

110110
```yaml
111-
$ docker run flownative/php:8.3 --security-opt=no-new-privileges
111+
$ docker run flownative/php:8.5 --security-opt=no-new-privileges
112112
```
113113

114114
When you exec into this container running bash, you will notice your
@@ -117,7 +117,7 @@ container runs as a user with uid 1000, but in fact that user does not
117117
even exist.
118118

119119
```
120-
$ docker run -ti --name php --rm flownative/php:8.2 bash
120+
$ docker run -ti --name php --rm flownative/php:8.5 bash
121121
I have no name!@5a0adf17e426:/$ whoami
122122
whoami: cannot find name for user ID 1000
123123
```
@@ -129,7 +129,7 @@ version for some of the tools as build arguments:
129129

130130
```bash
131131
docker build \
132-
--build-arg PHP_VERSION=8.3.11 \
132+
--build-arg PHP_VERSION=8.5.0 \
133133
-t flownative/php:latest .
134134
```
135135

root-files/build.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ build_compile_php() {
140140
# For GCC warning options see: https://gcc.gnu.org/onlinedocs/gcc-3.4.4/gcc/Warning-Options.html
141141
export CFLAGS='-Wno-deprecated-declarations -Wno-stringop-overflow -Wno-implicit-function-declaration'
142142

143-
if [[ "${PHP_VERSION}" =~ ^8.[1-4] ]]; then
143+
if [[ "${PHP_VERSION}" =~ ^8.[1-5] ]]; then
144144
./configure \
145145
--prefix=${PHP_BASE_PATH} \
146146
--with-config-file-path="${PHP_BASE_PATH}/etc" \
@@ -394,7 +394,7 @@ case $1 in
394394
init)
395395
banner_flownative 'PHP'
396396

397-
if [[ ! "${PHP_VERSION}" =~ ^8.[1-4] ]]; then
397+
if [[ ! "${PHP_VERSION}" =~ ^8.[1-5] ]]; then
398398
error "🛠 Unsupported PHP version '${PHP_VERSION}'"
399399
exit 1
400400
fi

root-files/opt/flownative/php/build/extensions/igbinary/igbinary.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ extensions_igbinary_runtime_packages() {
3535
# @return string
3636
#
3737
extensions_igbinary_url() {
38-
echo "https://github.com/igbinary/igbinary/archive/refs/tags/3.2.15.tar.gz"
38+
echo "https://github.com/igbinary/igbinary/archive/refs/tags/3.2.17RC1.tar.gz"
3939
}
4040

4141
# ---------------------------------------------------------------------------------------

root-files/opt/flownative/php/build/extensions/imagick/imagick.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,11 @@ extensions_imagick_runtime_packages() {
4444
# @return string
4545
#
4646
extensions_imagick_url() {
47-
echo "https://pecl.php.net/get/imagick-3.8.0.tgz"
47+
if [[ "${PHP_VERSION}" =~ ^8.5 ]]; then
48+
echo "https://github.com/imagick/imagick/archive/refs/heads/master.tar.gz"
49+
else
50+
echo "https://pecl.php.net/get/imagick-3.8.0.tgz"
51+
fi
4852
}
4953

5054
# ---------------------------------------------------------------------------------------

root-files/opt/flownative/php/build/extensions/xdebug/xdebug.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,11 @@ extensions_xdebug_runtime_packages() {
3838
# @return string
3939
#
4040
extensions_xdebug_url() {
41-
echo "https://xdebug.org/files/xdebug-3.4.7.tgz"
41+
if [[ "${PHP_VERSION}" =~ ^8.5 ]]; then
42+
echo "https://xdebug.org/files/xdebug-3.5.0alpha3.tgz"
43+
else
44+
echo "https://xdebug.org/files/xdebug-3.4.7.tgz"
45+
fi
4246
}
4347

4448
# ---------------------------------------------------------------------------------------

root-files/opt/flownative/php/etc/php.ini

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -160,9 +160,6 @@ date.timezone = ${PHP_DATE_TIMEZONE}
160160

161161

162162
[opcache]
163-
; Load the opcache extension
164-
zend_extension=opcache.so
165-
166163
; Determines if Zend OPCache is enabled
167164
opcache.enable=1
168165

0 commit comments

Comments
 (0)