Skip to content

Commit fd1ab79

Browse files
committed
Revert PHP to 8.3 for v33 and default
Signed-off-by: Finn Hoffhenke <finn@hoffhenke.net>
1 parent 803d941 commit fd1ab79

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

33/apache/Dockerfile

Lines changed: 2 additions & 2 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.4-apache-trixie
2+
FROM php:8.3-apache-trixie
33

44
# entrypoint.sh and cron.sh dependencies
55
RUN set -ex; \
@@ -46,7 +46,7 @@ RUN set -ex; \
4646
; \
4747
\
4848
debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
49-
docker-php-ext-configure ftp --with-ftp-ssl; \
49+
docker-php-ext-configure ftp --with-openssl-dir=/usr; \
5050
docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp; \
5151
docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \
5252
docker-php-ext-install -j "$(nproc)" \

33/fpm-alpine/Dockerfile

Lines changed: 2 additions & 2 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.4-fpm-alpine3.23
2+
FROM php:8.3-fpm-alpine3.23
33

44
# entrypoint.sh and cron.sh dependencies
55
RUN set -ex; \
@@ -42,7 +42,7 @@ RUN set -ex; \
4242
postgresql-dev \
4343
; \
4444
\
45-
docker-php-ext-configure ftp --with-ftp-ssl; \
45+
docker-php-ext-configure ftp --with-openssl-dir=/usr; \
4646
docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp; \
4747
docker-php-ext-configure ldap; \
4848
docker-php-ext-install -j "$(nproc)" \

33/fpm/Dockerfile

Lines changed: 2 additions & 2 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.4-fpm-trixie
2+
FROM php:8.3-fpm-trixie
33

44
# entrypoint.sh and cron.sh dependencies
55
RUN set -ex; \
@@ -46,7 +46,7 @@ RUN set -ex; \
4646
; \
4747
\
4848
debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
49-
docker-php-ext-configure ftp --with-ftp-ssl; \
49+
docker-php-ext-configure ftp --with-openssl-dir=/usr; \
5050
docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp; \
5151
docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \
5252
docker-php-ext-install -j "$(nproc)" \

update.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ declare -A debian_version=(
1212
declare -A php_version=(
1313
[31]='8.3'
1414
[32]='8.3'
15-
[default]='8.4'
15+
[default]='8.3'
1616
)
1717

1818
declare -A ftp_options=(
1919
[31]='--with-openssl-dir=/usr'
2020
[32]='--with-openssl-dir=/usr'
21-
[default]='--with-ftp-ssl'
21+
[default]='--with-openssl-dir=/usr'
2222
)
2323

2424
declare -A cmd=(

0 commit comments

Comments
 (0)