Skip to content

Commit 75b45dc

Browse files
kowalski7cckowalski7cc
committed
Add support for PHP 8.4
Signed-off-by: Kowalski Dragon (kowalski7cc) <kowalski7cc@users.noreply.github.com>
1 parent 7e1fba3 commit 75b45dc

File tree

10 files changed

+38
-22
lines changed

10 files changed

+38
-22
lines changed

‎31/apache/Dockerfile‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ RUN set -ex; \
4646
; \
4747
\
4848
debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
49-
docker-php-ext-configure ftp --with-openssl-dir=/usr; \
50-
docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp; \
49+
docker-php-ext-configure ftp %%FTP_OPTIONS%%; \
50+
docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp --with-avif; \
5151
docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \
5252
docker-php-ext-install -j "$(nproc)" \
5353
bcmath \
@@ -57,6 +57,7 @@ RUN set -ex; \
5757
gmp \
5858
intl \
5959
ldap \
60+
opcache \
6061
pcntl \
6162
pdo_mysql \
6263
pdo_pgsql \

‎31/fpm-alpine/Dockerfile‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ RUN set -ex; \
4242
postgresql-dev \
4343
; \
4444
\
45-
docker-php-ext-configure ftp --with-openssl-dir=/usr; \
46-
docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp; \
45+
docker-php-ext-configure ftp %%FTP_OPTIONS%%; \
46+
docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp --with-avif; \
4747
docker-php-ext-configure ldap; \
4848
docker-php-ext-install -j "$(nproc)" \
4949
bcmath \
@@ -53,6 +53,7 @@ RUN set -ex; \
5353
gmp \
5454
intl \
5555
ldap \
56+
opcache \
5657
pcntl \
5758
pdo_mysql \
5859
pdo_pgsql \

‎31/fpm/Dockerfile‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ RUN set -ex; \
4646
; \
4747
\
4848
debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
49-
docker-php-ext-configure ftp --with-openssl-dir=/usr; \
50-
docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp; \
49+
docker-php-ext-configure ftp %%FTP_OPTIONS%%; \
50+
docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp --with-avif; \
5151
docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \
5252
docker-php-ext-install -j "$(nproc)" \
5353
bcmath \
@@ -57,6 +57,7 @@ RUN set -ex; \
5757
gmp \
5858
intl \
5959
ldap \
60+
opcache \
6061
pcntl \
6162
pdo_mysql \
6263
pdo_pgsql \

‎32/apache/Dockerfile‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# DO NOT EDIT: created by update.sh from Dockerfile-debian.template
2-
FROM php:8.3-apache-trixie
2+
FROM php:8.4-apache-trixie
33

44
# entrypoint.sh and cron.sh dependencies
55
RUN set -ex; \
@@ -46,8 +46,8 @@ RUN set -ex; \
4646
; \
4747
\
4848
debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
49-
docker-php-ext-configure ftp --with-openssl-dir=/usr; \
50-
docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp; \
49+
docker-php-ext-configure ftp %%FTP_OPTIONS%%; \
50+
docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp --with-avif; \
5151
docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \
5252
docker-php-ext-install -j "$(nproc)" \
5353
bcmath \
@@ -57,6 +57,7 @@ RUN set -ex; \
5757
gmp \
5858
intl \
5959
ldap \
60+
opcache \
6061
pcntl \
6162
pdo_mysql \
6263
pdo_pgsql \

‎32/fpm-alpine/Dockerfile‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# DO NOT EDIT: created by update.sh from Dockerfile-alpine.template
2-
FROM php:8.3-fpm-alpine3.23
2+
FROM php:8.4-fpm-alpine3.23
33

44
# entrypoint.sh and cron.sh dependencies
55
RUN set -ex; \
@@ -42,8 +42,8 @@ RUN set -ex; \
4242
postgresql-dev \
4343
; \
4444
\
45-
docker-php-ext-configure ftp --with-openssl-dir=/usr; \
46-
docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp; \
45+
docker-php-ext-configure ftp %%FTP_OPTIONS%%; \
46+
docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp --with-avif; \
4747
docker-php-ext-configure ldap; \
4848
docker-php-ext-install -j "$(nproc)" \
4949
bcmath \
@@ -53,6 +53,7 @@ RUN set -ex; \
5353
gmp \
5454
intl \
5555
ldap \
56+
opcache \
5657
pcntl \
5758
pdo_mysql \
5859
pdo_pgsql \

‎32/fpm/Dockerfile‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# DO NOT EDIT: created by update.sh from Dockerfile-debian.template
2-
FROM php:8.3-fpm-trixie
2+
FROM php:8.4-fpm-trixie
33

44
# entrypoint.sh and cron.sh dependencies
55
RUN set -ex; \
@@ -46,8 +46,8 @@ RUN set -ex; \
4646
; \
4747
\
4848
debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
49-
docker-php-ext-configure ftp --with-openssl-dir=/usr; \
50-
docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp; \
49+
docker-php-ext-configure ftp %%FTP_OPTIONS%%; \
50+
docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp --with-avif; \
5151
docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \
5252
docker-php-ext-install -j "$(nproc)" \
5353
bcmath \
@@ -57,6 +57,7 @@ RUN set -ex; \
5757
gmp \
5858
intl \
5959
ldap \
60+
opcache \
6061
pcntl \
6162
pdo_mysql \
6263
pdo_pgsql \

‎Dockerfile-alpine.template‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ RUN set -ex; \
4141
postgresql-dev \
4242
; \
4343
\
44-
docker-php-ext-configure ftp --with-openssl-dir=/usr; \
45-
docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp; \
44+
docker-php-ext-configure ftp %%FTP_OPTIONS%%; \
45+
docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp --with-avif; \
4646
docker-php-ext-configure ldap; \
4747
docker-php-ext-install -j "$(nproc)" \
4848
bcmath \
@@ -52,6 +52,7 @@ RUN set -ex; \
5252
gmp \
5353
intl \
5454
ldap \
55+
opcache \
5556
pcntl \
5657
pdo_mysql \
5758
pdo_pgsql \

‎Dockerfile-debian.template‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ RUN set -ex; \
4545
; \
4646
\
4747
debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
48-
docker-php-ext-configure ftp --with-openssl-dir=/usr; \
49-
docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp; \
48+
docker-php-ext-configure ftp %%FTP_OPTIONS%%; \
49+
docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp --with-avif; \
5050
docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \
5151
docker-php-ext-install -j "$(nproc)" \
5252
bcmath \
@@ -56,6 +56,7 @@ RUN set -ex; \
5656
gmp \
5757
intl \
5858
ldap \
59+
opcache \
5960
pcntl \
6061
pdo_mysql \
6162
pdo_pgsql \

‎update.sh‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,12 @@ declare -A debian_version=(
1111

1212
declare -A php_version=(
1313
[default]='8.3'
14+
[32]='8.4'
15+
)
16+
17+
declare -A ftp_options=(
18+
[default]='--with-openssl-dir=/usr'
19+
[8.4]='--with-ftp-ssl'
1420
)
1521

1622
declare -A cmd=(
@@ -107,6 +113,7 @@ function create_variant() {
107113
debianVersion=${debian_version[$version]-${debian_version[default]}}
108114
phpVersion=${php_version[$version]-${php_version[default]}}
109115
crontabInt=${crontab_int[$version]-${crontab_int[default]}}
116+
ftp_options=${ftp_options[$phpVersion]-${ftp_options[default]}}
110117
url="https://github.com/nextcloud-releases/server/releases/download/v$fullversion/nextcloud-$fullversion.tar.bz2"
111118
ascUrl="https://github.com/nextcloud-releases/server/releases/download/v$fullversion/nextcloud-$fullversion.tar.bz2.asc"
112119

@@ -132,6 +139,7 @@ function create_variant() {
132139
s|%%VARIANT_EXTRAS%%|'"${extras[$variant]}"'|g;
133140
s/%%APCU_VERSION%%/'"${pecl_versions[APCu]}"'/g;
134141
s/%%IGBINARY_VERSION%%/'"${pecl_versions[igbinary]}"'/g;
142+
s|%%FTP_OPTIONS%%|'"$ftp_options"'|g;
135143
s/%%IMAGICK_VERSION%%/'"${pecl_versions[imagick]}"'/g;
136144
s/%%MEMCACHED_VERSION%%/'"${pecl_versions[memcached]}"'/g;
137145
s/%%REDIS_VERSION%%/'"${pecl_versions[redis]}"'/g;

‎versions.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,19 @@
99
"variant": "apache",
1010
"base": "debian",
1111
"baseVersion": "trixie",
12-
"phpVersion": "8.3"
12+
"phpVersion": "8.4"
1313
},
1414
"fpm": {
1515
"variant": "fpm",
1616
"base": "debian",
1717
"baseVersion": "trixie",
18-
"phpVersion": "8.3"
18+
"phpVersion": "8.4"
1919
},
2020
"fpm-alpine": {
2121
"variant": "fpm-alpine",
2222
"base": "alpine",
2323
"baseVersion": "3.23",
24-
"phpVersion": "8.3"
24+
"phpVersion": "8.4"
2525
}
2626
}
2727
},

0 commit comments

Comments
 (0)