Skip to content

Commit 3261fc3

Browse files
committed
Merge branch 'feature/PB-44734_Test-build-passbolt-docker-on-debian-13' into 'master'
PB-44734 - move Docker base images from bookworm to trixie See merge request passbolt/passbolt_docker!235
2 parents bea2563 + 620764e commit 3261fc3

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

conf/supervisor/php.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[program:php-fpm]
2-
command=php-fpm8.2 -F
2+
command=php-fpm8.4 -F
33
autostart=true
44
priority=5
55
stdout_logfile=/dev/stdout

debian/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM debian:bookworm-slim
1+
FROM debian:trixie-slim
22

33
ARG API_REPOSITORY="https://github.com/passbolt/passbolt_api"
44
ARG IMAGE_DESCRIPTION="Passbolt CE Backend, a JSON API written with CakePHP"
@@ -22,7 +22,7 @@ ARG PASSBOLT_REPO_KEY_PATH="/usr/share/keyrings/passbolt-repository.gpg"
2222
ARG PASSBOLT_SOURCES_LIST_PATH="/etc/apt/sources.list.d/passbolt.sources"
2323

2424
ENV PASSBOLT_PKG_KEY=0xDE8B853FC155581D
25-
ENV PHP_VERSION=8.2
25+
ENV PHP_VERSION=8.4
2626
ENV GNUPGHOME=/var/lib/passbolt/.gnupg
2727
ENV PASSBOLT_FLAVOUR=$PASSBOLT_FLAVOUR
2828
ENV PASSBOLT_PKG="passbolt-$PASSBOLT_FLAVOUR-server"

debian/Dockerfile.rootless

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM debian:bookworm-slim
1+
FROM debian:trixie-slim
22

33
ARG API_REPOSITORY="https://github.com/passbolt/passbolt_api"
44
ARG IMAGE_DESCRIPTION="Passbolt CE Backend, a JSON API written with CakePHP"
@@ -29,7 +29,7 @@ ARG PASSBOLT_USER_UID=33
2929
ARG PASSBOLT_GROUP_GID=33
3030

3131
ENV PASSBOLT_PKG_KEY=0xDE8B853FC155581D
32-
ENV PHP_VERSION=8.2
32+
ENV PHP_VERSION=8.4
3333
ENV GNUPGHOME=/var/lib/passbolt/.gnupg
3434
ENV SUPERCRONIC_VERSION=0.2.28
3535
ENV SUPERCRONIC_URL=https://github.com/aptible/supercronic/releases/download/v${SUPERCRONIC_VERSION}/supercronic-linux-${SUPERCRONIC_ARCH} \

spec/docker_image/image_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
end
3737

3838
let(:nginx_conf) { '/etc/nginx/nginx.conf' }
39-
let(:php_conf) { '/etc/php/8.2/fpm/php.ini' }
39+
let(:php_conf) { '/etc/php/8.4/fpm/php.ini' }
4040
let(:site_conf) { '/etc/nginx/sites-enabled/nginx-passbolt.conf' }
4141
let(:supervisor_conf) do
4242
['/etc/supervisor/conf.d/nginx.conf',

0 commit comments

Comments
 (0)