Skip to content

Commit ee1167b

Browse files
nourcynourcy
committed
Merge branch 'develop' into 'main'
Decommission of unsupported distro See merge request passbolt/passbolt-ops/passbolt-dep-scripts!41
2 parents de3ec25 + 6cfcee9 commit ee1167b

File tree

4 files changed

+38
-111
lines changed

4 files changed

+38
-111
lines changed

‎.gitlab-ci/test.yml‎

Lines changed: 17 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -50,14 +50,6 @@
5050
variables:
5151
PASSBOLT_FLAVOUR: "pro"
5252

53-
Debian 11 CE:
54-
extends: .test-deb-ce
55-
image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/debian:bullseye-slim
56-
57-
Debian 11 PRO:
58-
extends: .test-deb-pro
59-
image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/debian:bullseye-slim
60-
6153
Debian 12 CE:
6254
extends: .test-deb-ce
6355
image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/debian:bookworm
@@ -78,49 +70,37 @@ Raspbian PRO:
7870
before_script:
7971
- sed -i "s/ID=debian/ID=raspbian/" /etc/os-release
8072

81-
Ubuntu 20.04 CE:
73+
Ubuntu 24.04 CE:
8274
extends: .test-deb-ce
83-
image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/ubuntu:focal
75+
image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/ubuntu:noble
8476

85-
Ubuntu 20.04 PRO:
77+
Ubuntu 24.04 PRO:
8678
extends: .test-deb-pro
87-
image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/ubuntu:focal
88-
89-
Ubuntu 22.04 CE:
90-
extends: .test-deb-ce
91-
image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/ubuntu:jammy
79+
image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/ubuntu:noble
9280

93-
Ubuntu 22.04 PRO:
94-
extends: .test-deb-pro
95-
image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/ubuntu:jammy
96-
97-
RockyLinux 8 CE:
81+
RockyLinux 9 CE:
9882
extends: .test-rpm-ce
99-
image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/rockylinux:8
83+
image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/rockylinux:9
10084

101-
RockyLinux 8 PRO:
85+
RockyLinux 9 PRO:
10286
extends: .test-rpm-pro
103-
image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/rockylinux:8
87+
image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/rockylinux:9
10488

105-
AlmaLinux 8 CE:
89+
AlmaLinux 9 CE:
10690
extends: .test-rpm-ce
107-
image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/almalinux:8
91+
image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/almalinux:9
10892

109-
AlmaLinux 8 PRO:
93+
AlmaLinux 9 PRO:
11094
extends: .test-rpm-pro
111-
image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/almalinux:8
95+
image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/almalinux:9
11296

113-
CentOS 7 CE:
97+
Oracle 9 CE:
11498
extends: .test-rpm-ce
115-
variables:
116-
PACKAGE_MANAGER: "yum"
117-
image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/centos:7
99+
image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/oraclelinux:9
118100

119-
CentOS 7 PRO:
101+
Oracle 9 PRO:
120102
extends: .test-rpm-pro
121-
variables:
122-
PACKAGE_MANAGER: "yum"
123-
image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/centos:7
103+
image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/oraclelinux:9
124104

125105
openSUSE 15 CE:
126106
extends: .test-rpm-ce
@@ -136,14 +116,6 @@ openSUSE 15 PRO:
136116
ZYPPER_OPTIONS: "-n --no-gpg-checks"
137117
image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/opensuse/leap:15
138118

139-
Fedora 39 CE:
140-
extends: .test-rpm-ce
141-
image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/fedora:39
142-
143-
Fedora 39 PRO:
144-
extends: .test-rpm-pro
145-
image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/fedora:39
146-
147119
SLES15 SP6 CE:
148120
extends: .test-rpm-ce
149121
variables:
@@ -159,3 +131,4 @@ SLES15 SP6 PRO:
159131
ZYPPER_OPTIONS: "-n --no-gpg-checks"
160132
SUSE_PACKAGE: "sudo"
161133
image: registry.suse.com/bci/bci-base:15.6
134+

‎README.md‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,16 +37,14 @@ This repository contains bash scripts to configure a vanilla Linux server in ord
3737

3838
This script has been reported to work on the following operating systems:
3939

40-
* Debian 10 / 11 / 12
40+
* Debian 12
4141
* Raspbian (Raspberry Pi)
42-
* Ubuntu 20.04 / 22.04
43-
* CentOS 7
44-
* Red Hat 7 / 8
45-
* RockyLinux 8
46-
* AlmaLinux 8
47-
* Oracle Linux 8
42+
* Ubuntu 24.04
43+
* Red Hat 9
44+
* RockyLinux 9
45+
* AlmaLinux 9
46+
* Oracle Linux 9
4847
* OpenSUSE 15
49-
* Fedora 39
5048
* SUSE Linux Enterprise Server 15 SP6
5149

5250
### System checks

‎passbolt-repo-setup.ce.sh‎

Lines changed: 9 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -51,22 +51,12 @@ done
5151

5252
function is_supported_distro() {
5353
local DISTROS=(
54-
"debian11"
5554
"debian12"
5655
"raspbian"
57-
"ubuntu20"
58-
"ubuntu22"
5956
"ubuntu24"
60-
"centos7"
61-
"rhel7"
62-
"rhel8"
6357
"rhel9"
64-
"rocky8"
6558
"rocky9"
66-
"ol8"
6759
"ol9"
68-
"fedora39"
69-
"almalinux8"
7060
"almalinux9"
7161
"opensuse-leap15"
7262
# Adding SLES15
@@ -236,24 +226,12 @@ EOF
236226
${PACKAGE_MANAGER} upgrade -y pcre2
237227
elif [ "${PACKAGE_MANAGER}" = "yum" ] || [ "${PACKAGE_MANAGER}" = "dnf" ]
238228
then
239-
if [ "$(grep -E "^ID=" /etc/os-release | awk -F= '{print $2}' | sed 's/"//g')" = "ol" ]
240-
then
241-
# Oracle Linux
242-
${PACKAGE_MANAGER} install -y oracle-epel-release-el"${OS_VERSION_MAJOR}"
243-
else
244-
${PACKAGE_MANAGER} install -y epel-release
245-
fi
246229
${PACKAGE_MANAGER} install -y wget python3
247-
${PACKAGE_MANAGER} install -y https://rpms.remirepo.net/enterprise/remi-release-"${OS_VERSION_MAJOR}".rpm
248-
if [ "${OS_VERSION_MAJOR}" -eq 7 ]
249-
then
250-
${PACKAGE_MANAGER} install -y yum-utils
251-
yum-config-manager --disable 'remi-php*'
252-
yum-config-manager --enable remi-php81
253-
else
254-
${PACKAGE_MANAGER} module -y reset php
255-
${PACKAGE_MANAGER} module -y install php:remi-8.1
256-
fi
230+
231+
# Install PHP 8.2 from AppStream
232+
${PACKAGE_MANAGER} module -y reset php
233+
${PACKAGE_MANAGER} module -y enable php:8.2
234+
${PACKAGE_MANAGER} module -y install php:8.2
257235
fi
258236
}
259237

@@ -289,9 +267,9 @@ Components: ${PASSBOLT_BRANCH}
289267
Signed-By: ${PASSBOLT_KEYRING_FILE}
290268
EOF
291269
apt update
292-
elif [ "${OS_NAME}" = "fedora" ] || [ "${OS_VERSION_MAJOR}" -eq 9 ]
293-
then
294-
cat << EOF | tee /etc/yum.repos.d/passbolt.repo > /dev/null
270+
elif [ "${OS_NAME}" = "fedora" ] || [ "${OS_VERSION_MAJOR}" -eq 9 ]
271+
then
272+
cat << EOF | tee /etc/yum.repos.d/passbolt.repo > /dev/null
295273
[passbolt-server]
296274
name=Passbolt Server
297275
baseurl=https://download.passbolt.com/${PASSBOLT_FLAVOUR}/rpm/el8/${PASSBOLT_BRANCH}
@@ -309,7 +287,7 @@ enabled=1
309287
gpgcheck=1
310288
gpgkey=https://download.passbolt.com/pub.key
311289
EOF
312-
elif [ "${PACKAGE_MANAGER}" = "yum" ] || [ "${PACKAGE_MANAGER}" = "dnf" ] || [ "${OS_VERSION_MAJOR}" != 9 ]
290+
elif [ "${PACKAGE_MANAGER}" = "yum" ] || [ "${PACKAGE_MANAGER}" = "dnf" ]
313291
then
314292
cat << EOF | tee /etc/yum.repos.d/passbolt.repo > /dev/null
315293
[passbolt-server]

‎passbolt-repo-setup.pro.sh‎

Lines changed: 6 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -51,22 +51,12 @@ done
5151

5252
function is_supported_distro() {
5353
local DISTROS=(
54-
"debian11"
5554
"debian12"
5655
"raspbian"
57-
"ubuntu20"
58-
"ubuntu22"
5956
"ubuntu24"
60-
"centos7"
61-
"rhel7"
62-
"rhel8"
6357
"rhel9"
64-
"rocky8"
6558
"rocky9"
66-
"ol8"
6759
"ol9"
68-
"fedora39"
69-
"almalinux8"
7060
"almalinux9"
7161
"opensuse-leap15"
7262
# Adding SLES15
@@ -236,24 +226,12 @@ EOF
236226
${PACKAGE_MANAGER} upgrade -y pcre2
237227
elif [ "${PACKAGE_MANAGER}" = "yum" ] || [ "${PACKAGE_MANAGER}" = "dnf" ]
238228
then
239-
if [ "$(grep -E "^ID=" /etc/os-release | awk -F= '{print $2}' | sed 's/"//g')" = "ol" ]
240-
then
241-
# Oracle Linux
242-
${PACKAGE_MANAGER} install -y oracle-epel-release-el"${OS_VERSION_MAJOR}"
243-
else
244-
${PACKAGE_MANAGER} install -y epel-release
245-
fi
246229
${PACKAGE_MANAGER} install -y wget python3
247-
${PACKAGE_MANAGER} install -y https://rpms.remirepo.net/enterprise/remi-release-"${OS_VERSION_MAJOR}".rpm
248-
if [ "${OS_VERSION_MAJOR}" -eq 7 ]
249-
then
250-
${PACKAGE_MANAGER} install -y yum-utils
251-
yum-config-manager --disable 'remi-php*'
252-
yum-config-manager --enable remi-php81
253-
else
254-
${PACKAGE_MANAGER} module -y reset php
255-
${PACKAGE_MANAGER} module -y install php:remi-8.1
256-
fi
230+
231+
# Install PHP 8.2 from AppStream
232+
${PACKAGE_MANAGER} module -y reset php
233+
${PACKAGE_MANAGER} module -y enable php:8.2
234+
${PACKAGE_MANAGER} module -y install php:8.2
257235
fi
258236
}
259237

@@ -309,7 +287,7 @@ enabled=1
309287
gpgcheck=1
310288
gpgkey=https://download.passbolt.com/pub.key
311289
EOF
312-
elif [ "${PACKAGE_MANAGER}" = "yum" ] || [ "${PACKAGE_MANAGER}" = "dnf" ] || [ "${OS_VERSION_MAJOR}" != 9 ]
290+
elif [ "${PACKAGE_MANAGER}" = "yum" ] || [ "${PACKAGE_MANAGER}" = "dnf" ]
313291
then
314292
cat << EOF | tee /etc/yum.repos.d/passbolt.repo > /dev/null
315293
[passbolt-server]

0 commit comments

Comments
 (0)