Skip to content

Commit e9d30ad

Browse files
authored
Merge pull request #509 from PierrePaul/508-update-to-php8.0
Update php version to 8.0
2 parents b04755c + c60568b commit e9d30ad

4 files changed

Lines changed: 22 additions & 18 deletions

File tree

.github/workflows/tests-mysql.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ jobs:
1313
- "7.2"
1414
- "7.3"
1515
- "7.4"
16+
- "8.0"
1617

1718
services:
1819
mysql:

.github/workflows/tests-pgsql.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ jobs:
1313
- "7.2"
1414
- "7.3"
1515
- "7.4"
16+
- "8.0"
1617

1718
services:
1819
# https://docs.github.com/en/free-pro-team@latest/actions/guides/creating-postgresql-service-containers

.github/workflows/tests-sqlite.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ jobs:
1313
- "7.2"
1414
- "7.3"
1515
- "7.4"
16+
- "8.0"
1617

1718
steps:
1819
- name: Checkout Code

Dockerfile

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -9,27 +9,27 @@ ARG BUILD_SOURCE=build
99
FROM alpine:3.15 AS alpine
1010

1111
FROM alpine AS base
12-
ENV PHP_INI_DIR /etc/php7
12+
ENV PHP_INI_DIR /etc/php8
1313

1414
# php-fpm runtime
1515
FROM base AS php-build
1616
RUN set -x \
1717
&& apk add --no-cache \
1818
nginx \
19-
php-cli \
20-
php-ctype \
21-
php-fpm \
22-
php-json \
23-
php-pdo \
24-
php-pdo_mysql \
25-
php-pdo_pgsql \
26-
php-pdo_sqlite \
27-
php-phar \
28-
php-session \
29-
php-simplexml \
30-
php7-pecl-mongodb \
31-
# Use www-data uid from alpine also present in docker php images
32-
&& adduser -u 82 -D -S -G www-data www-data \
19+
php8-cli \
20+
php8-ctype \
21+
php8-fpm \
22+
php8-json \
23+
php8-pdo \
24+
php8-pdo_mysql \
25+
php8-pdo_pgsql \
26+
php8-pdo_sqlite \
27+
php8-phar \
28+
php8-simplexml \
29+
php8-session \
30+
php8-pecl-mongodb \
31+
# Use www-data uid from alpine also present in docker php images
32+
&& adduser -u 82 -D -S -G www-data www-data \
3333
# Tweak php-fpm config
3434
&& sed -i \
3535
-e "s#^;daemonize\s*=\s*yes#daemonize = no#" \
@@ -45,14 +45,15 @@ RUN set -x \
4545
-e "s#^group = nobody\s*#group = www-data#" \
4646
-e "s#^;catch_workers_output\s*=.*#catch_workers_output = yes#" \
4747
$POOL_CONFIG \
48-
&& rm -rf /var/log/php7 \
49-
&& ln -s php /var/log/php7 \
48+
&& rm -rf /var/log/php8 \
49+
&& ln -s php /var/log/php8 \
5050
&& install -d -o www-data -g www-data /var/log/php \
51-
&& ln -s php-fpm7 /usr/sbin/php-fpm \
51+
&& ln -s php-fpm8 /usr/sbin/php-fpm \
5252
&& ln -s /dev/stderr /var/log/php/fpm.access.log \
5353
&& ln -s /dev/stderr /var/log/php/fpm.error.log \
5454
&& ln -s /dev/stdout /var/log/nginx/access.log \
5555
&& ln -s /dev/stderr /var/log/nginx/error.log \
56+
&& ln -s /usr/bin/php8 /usr/bin/php \
5657
&& php -m
5758

5859
FROM xhgui/xhgui:latest AS php-prebuilt

0 commit comments

Comments
 (0)