Skip to content

Add PHP 8.5 (ZTS) #94

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
llupa wants to merge 1 commit into
base: release/8.5-zts
Choose a base branch
from
+46 −46
Open

Add PHP 8.5 (ZTS) #94

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
62 changes: 31 additions & 31 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.21.0 AS alpine-distro
FROM alpine:3.23 AS alpine-distro
FROM alpine-distro AS php-zts-builder

RUN apk add --no-cache libc6-compat
Expand All @@ -21,22 +21,22 @@ RUN cp /workspace/.abuild/*.rsa.pub /etc/apk/keys/
USER alpiner


RUN git clone -b 3.21-stable --single-branch --depth=1 https://gitlab.alpinelinux.org/alpine/aports
RUN git clone -b 3.23-stable --single-branch --depth=1 https://gitlab.alpinelinux.org/alpine/aports

WORKDIR /workspace/aports/community/php84
RUN cp -rf /workspace/aports/community/php84 /workspace/aports/community/phpzts84
WORKDIR /workspace/aports/community/phpzts84
RUN sed -i -e 's/pkgname=php84/pkgname=phpzts84/' APKBUILD
WORKDIR /workspace/aports/community/php85
RUN cp -rf /workspace/aports/community/php85 /workspace/aports/community/phpzts85
WORKDIR /workspace/aports/community/phpzts85
RUN sed -i -e 's/pkgname=php85/pkgname=phpzts85/' APKBUILD
# hadolint ignore=SC2016
RUN sed -i -e 's/\$pkgname-fpm.initd/php84-fpm.initd/' APKBUILD
RUN sed -i -e 's/\$pkgname-fpm.initd/php85-fpm.initd/' APKBUILD
# hadolint ignore=SC2016
RUN sed -i -e 's/\$pkgname-fpm.logrotate/php84-fpm.logrotate/' APKBUILD
RUN sed -i -e 's/\$pkgname-fpm.logrotate/php85-fpm.logrotate/' APKBUILD
# hadolint ignore=SC2016
RUN sed -i -e 's/\$pkgname-module.conf/php84-module.conf/' APKBUILD
RUN sed -i -e 's/\$pkgname-module.conf/php85-module.conf/' APKBUILD
# hadolint ignore=SC2016
RUN sed -i -e 's/\$pkgname-fpm-version-suffix.patch/php84-fpm-version-suffix.patch/' APKBUILD
RUN sed -i -e 's/\$pkgname-fpm-version-suffix.patch/php85-fpm-version-suffix.patch/' APKBUILD
# hadolint ignore=SC2016
RUN sed -i -e 's/php\$_suffix-module.conf/php84-module.conf/' APKBUILD
RUN sed -i -e 's/php\$_suffix-module.conf/php85-module.conf/' APKBUILD
RUN sed -i -e 's/--host/--enable-zts --enable-zend-max-execution-timers --enable-zend-timer --disable-zend-signals --host/' APKBUILD
RUN sed -i -e 's/--with-openssl-argon2//' APKBUILD
#RUN sed -i -e 's/--with-password-argon2//' APKBUILD
Expand Down Expand Up @@ -65,12 +65,12 @@ RUN uname -m
RUN abuild -A
RUN abuild checksum && abuild -r
WORKDIR /workspace/aports/community/unit
# make phpver3 to be phpzts84
RUN sed -i -e 's/_phpver4=84/_phpver4=zts84/' APKBUILD
# make phpver3 to be phpzts85
RUN sed -i -e 's/_phpver4=85/_phpver4=zts85/' APKBUILD
RUN sed -i -e 's/.\/configure php --module=php\$_phpver2 --config=php-config\$_phpver2//' APKBUILD
RUN sed -i -e 's/.\/configure php --module=php\$_phpver3 --config=php-config\$_phpver3//' APKBUILD
RUN sed -i -e 's/perl php\$_phpver2 php\$_phpver3 php\$_phpver4/perl php\$_phpver4 /' APKBUILD
# make unit-php84 find the lphpzts84.so
# make unit-php85 find the lphpzts85.so
# hadolint ignore=SC2016
#RUN sed -i -e 's/.\/configure php --module=php\$_phpver4/sed -i -e "s\/lphp\/lphpzts\/g" auto\/modules\/php \&\& cat auto\/modules\/php \&\& .\/configure php --module=php\$_phpver4/g' APKBUILD
RUN sed -i -e 's/_allow_fail=no/_allow_fail=yes/g' APKBUILD
Expand All @@ -79,10 +79,10 @@ RUN abuild checksum && abuild -r

FROM alpine-distro AS php-zts-base

ARG PHP_VERSION="8.4.4"
ARG PHP_PACKAGE_BASENAME="phpzts84"
ARG PHP_PACKAGE_INCLUDE="/usr/include/php84"
ARG PHP_FPM_BINARY_PATH="/usr/sbin/php-fpmzts84"
ARG PHP_VERSION="8.5.1"
ARG PHP_PACKAGE_BASENAME="phpzts85"
ARG PHP_PACKAGE_INCLUDE="/usr/include/php85"
ARG PHP_FPM_BINARY_PATH="/usr/sbin/php-fpmzts85"
ENV PHP_VERSION=$PHP_VERSION
ENV PHP_PACKAGE_BASENAME=$PHP_PACKAGE_BASENAME
ENV PHP_PACKAGE_INCLUDE=$PHP_PACKAGE_INCLUDE
Expand Down Expand Up @@ -153,18 +153,18 @@ RUN apk add --no-cache ${PHP_PACKAGE_BASENAME}-tokenizer
RUN apk add --no-cache ${PHP_PACKAGE_BASENAME}-session
RUN apk add --no-cache ${PHP_PACKAGE_BASENAME}-sockets

# FIXME: we need this, since phpzts84 is not the _default_php in https://git.alpinelinux.org/aports/tree/community/php84/APKBUILD
# FIXME: we need this, since phpzts85 is not the _default_php in https://git.alpinelinux.org/aports/tree/community/php85/APKBUILD
WORKDIR /usr/bin
RUN ln -s phpzts84 php \
&& ln -s peardevzts84 peardev \
&& ln -s peclzts84 pecl \
&& ln -s phpizezts84 phpize \
&& ln -s php-configzts84 php-config \
&& ln -s phpdbgzts84 phpdbg \
&& ln -s lsphpzts84 lsphp \
&& ln -s php-cgizts84 php-cgi \
&& ln -s phar.pharzts84 phar.phar \
&& ln -s pharzts84 phar
RUN ln -s phpzts85 php \
&& ln -s peardevzts85 peardev \
&& ln -s peclzts85 pecl \
&& ln -s phpizezts85 phpize \
&& ln -s php-configzts85 php-config \
&& ln -s phpdbgzts85 phpdbg \
&& ln -s lsphpzts85 lsphp \
&& ln -s php-cgizts85 php-cgi \
&& ln -s phar.pharzts85 phar.phar \
&& ln -s pharzts85 phar

FROM php-zts-base AS PECL-BUILDER-AMQP

Expand Down Expand Up @@ -418,8 +418,8 @@ RUN chown www-data:www-data /run/unit/
RUN apk add --no-cache apache2 ${PHP_PACKAGE_BASENAME}-apache2~=${PHP_VERSION}
# add default apache2 config file
COPY files/apache2/apache2-default.conf /etc/apache2/conf.d/00_apache2-default.conf
# fix that the mod_php84.so is not properly renamed in the conf
RUN sed -i -e 's/mod_php84/mod_phpzts84/g' /etc/apache2/conf.d/php84-module.conf
# fix that the mod_php85.so is not properly renamed in the conf
RUN sed -i -e 's/mod_php85/mod_phpzts85/g' /etc/apache2/conf.d/php85-module.conf
# activate rewrite module
RUN sed -i -e 's/#LoadModule rewrite_module/LoadModule rewrite_module/g' /etc/apache2/httpd.conf
# listen port 8080
Expand Down
30 changes: 15 additions & 15 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# endava/docker-php:8.4.x-zts
# endava/docker-php:8.5.x-zts

## Usage

Expand All @@ -12,7 +12,7 @@ $ echo '<?php phpinfo();' > public/index.php
### Run the NGINX Unit Version

```shell
$ docker run --rm -p 8080:8080 -v `pwd`/public:/usr/src/app/public -it endava/php:8.4.2-zts-unit
$ docker run --rm -p 8080:8080 -v `pwd`/public:/usr/src/app/public -it endava/php:8.5.1-zts-unit
```

and open http://localhost:8080 to see phpinfo unit.
Expand All @@ -26,7 +26,7 @@ Time per request: 23.207 [ms] (mean)
### Run the Apache2 Version

```shell
$ docker run --rm -p 8080:8080 -v `pwd`/public:/usr/src/app/public -it endava/php:8.4.2-zts-apache2
$ docker run --rm -p 8080:8080 -v `pwd`/public:/usr/src/app/public -it endava/php:8.5.1-zts-apache2
```

and open http://localhost:8080 to see phpinfo on apache2.
Expand All @@ -48,15 +48,15 @@ version: "2.1"

services:
php-cli:
image: endava/php:8.4.2-zts
image: endava/php:8.5.1-zts
volumes:
- ./:/usr/src/app
user: "${UID-www-data}:${GID-www-data}"
entrypoint: bash
depends_on:
- nginx
php-fpm:
image: endava/php:8.4.2-zts-fpm
image: endava/php:8.5.1-zts-fpm
user: "${UID-www-data}:${GID-www-data}"
volumes:
- ./:/usr/src/app
Expand Down Expand Up @@ -99,19 +99,19 @@ $docker-compose run php-cli
⠿ Container docker-php-php-fpm-1
⠿ Container docker-php-nginx-1
bash-5.1$ php -v
PHP 8.4.2 (cli) (built: Jan 15 2025 22:38:51) (ZTS)
PHP 8.5.1 (cli) (built: Jan 9 2026 22:38:51) (ZTS)
Copyright (c) The PHP Group
Zend Engine v4.4.2, Copyright (c) Zend Technologies
with Zend OPcache v8.4.2, Copyright (c), by Zend Technologies
with Xdebug v3.4.1, Copyright (c) 2002-2025, by Derick Rethans
Zend Engine v4.5.1, Copyright (c) Zend Technologies
with Zend OPcache v8.5.1, Copyright (c), by Zend Technologies
with Xdebug v3.5.0, Copyright (c) 2002-2026, by Derick Rethans
```

and open http://localhost:8080/ to see phpinfo with FPM/FastCGI as server api.

### Run the frankenphp https Version

```shell
$ docker run --rm -p 8443:443 -v `pwd`/public:/usr/src/app/public -it endava/php:8.4.2-zts-frankenphp
$ docker run --rm -p 8443:443 -v `pwd`/public:/usr/src/app/public -it endava/php:8.5.1-zts-frankenphp
```

and open https://localhost:8443/ to see phpinfo with frankenphp as server api.
Expand All @@ -127,7 +127,7 @@ Time per request: 21.920 [ms] (mean)
### Run the frankenphp http Version

```shell
$ docker run --rm -e SERVER_NAME=http://:8080 -p 8080:8080 -v `pwd`/public:/usr/src/app/public -it endava/php:8.4.2-zts-frankenphp
$ docker run --rm -e SERVER_NAME=http://:8080 -p 8080:8080 -v `pwd`/public:/usr/src/app/public -it endava/php:8.5.1-zts-frankenphp
```

and open https://localhost:8443/ to see phpinfo with frankenphp as server api.
Expand All @@ -143,7 +143,7 @@ Time per request: 21.920 [ms] (mean)
### Run the frankenphp http worker Version

```shell
$ docker run --rm -e FRANKENPHP_CONFIG="worker ./public/index.php" -e SERVER_NAME=http://:8080 -p 8080:8080 -v `pwd`/public:/usr/src/app/public -it endava/php:8.4.2-zts-frankenphp
$ docker run --rm -e FRANKENPHP_CONFIG="worker ./public/index.php" -e SERVER_NAME=http://:8080 -p 8080:8080 -v `pwd`/public:/usr/src/app/public -it endava/php:8.5.1-zts-frankenphp
```

and index.php like this:
Expand Down Expand Up @@ -317,7 +317,7 @@ You can define the crontab's content with an environment variable like this:
```yaml
services:
import-data-cron:
image: endava/php:8.4.2-zts
image: endava/php:8.5.1-zts
command: start-cron
environment:
- 'CRONTAB_USER=www-data'
Expand Down Expand Up @@ -361,7 +361,7 @@ Usage in your `docker-compose.yml`:
```yaml
services:
crontab:
image: endava/php:8.4.2-zts
image: endava/php:8.5.1-zts
command: start-cron
volumes:
- ./:/usr/src/app
Expand All @@ -374,7 +374,7 @@ cron location with the `CRON_PATH` environment variable:
```yaml
services:
crontab:
image: endava/php:8.4.2-zts
image: endava/php:8.5.1-zts
command: start-cron
environment:
- CRON_PATH=/usr/src/app/crontabs
Expand Down
Loading