Skip to content

Commit d51802b

Browse files
committed
Merge branch 'feature/PB-44839_Update-dep-scripts-to-support-Debian-13' into 'main'
PB-44839: add support for Debian 13 (Trixie) See merge request passbolt/passbolt-ops/passbolt-dep-scripts!46
2 parents ca83580 + 264a9e9 commit d51802b

File tree

3 files changed

+20
-6
lines changed

3 files changed

+20
-6
lines changed

.gitlab-ci/test.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,14 @@ Debian 12 PRO:
5858
extends: .test-deb-pro
5959
image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/debian:bookworm
6060

61+
Debian 13 CE:
62+
extends: .test-deb-ce
63+
image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/debian:trixie-slim
64+
65+
Debian 13 PRO:
66+
extends: .test-deb-pro
67+
image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/debian:trixie-slim
68+
6169
Raspbian CE:
6270
extends: .test-deb-ce
6371
image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/debian:bookworm-slim

passbolt-repo-setup.ce.sh

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ done
5252
function is_supported_distro() {
5353
local DISTROS=(
5454
"debian12"
55+
"debian13"
5556
"raspbian"
5657
"ubuntu24"
5758
"rhel9"
@@ -135,6 +136,10 @@ os_detect () {
135136
elif [ "${CODENAME}" = "noble" ]
136137
then
137138
CODENAME="focal"
139+
# We use buster debian package for trixie
140+
elif [ "${CODENAME}" = "trixie" ]
141+
then
142+
CODENAME="buster"
138143
fi
139144
elif command -v zypper >/dev/null 2>&1
140145
then
@@ -173,9 +178,7 @@ install_dependencies () {
173178
apt-transport-https \
174179
ca-certificates \
175180
curl \
176-
gnupg-agent \
177-
software-properties-common \
178-
haveged \
181+
gnupg \
179182
certbot \
180183
wget \
181184
python3-certbot-nginx

passbolt-repo-setup.pro.sh

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ done
5252
function is_supported_distro() {
5353
local DISTROS=(
5454
"debian12"
55+
"debian13"
5556
"raspbian"
5657
"ubuntu24"
5758
"rhel9"
@@ -135,6 +136,10 @@ os_detect () {
135136
elif [ "${CODENAME}" = "noble" ]
136137
then
137138
CODENAME="focal"
139+
# We use buster debian package for trixie
140+
elif [ "${CODENAME}" = "trixie" ]
141+
then
142+
CODENAME="buster"
138143
fi
139144
elif command -v zypper >/dev/null 2>&1
140145
then
@@ -173,9 +178,7 @@ install_dependencies () {
173178
apt-transport-https \
174179
ca-certificates \
175180
curl \
176-
gnupg-agent \
177-
software-properties-common \
178-
haveged \
181+
gnupg \
179182
certbot \
180183
wget \
181184
python3-certbot-nginx

0 commit comments

Comments
 (0)