Skip to content

Commit 1e090dc

Browse files
gmougenelgmougenel
committed
Merge branch 'develop' into 'main'
Develop See merge request passbolt/passbolt-ops/passbolt-dep-scripts!34
2 parents e1f350d + 091bc97 commit 1e090dc

File tree

6 files changed

+36
-26
lines changed

6 files changed

+36
-26
lines changed

‎.gitlab-ci/publish.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
.to-gcs:
22
stage: Publish
3-
image: registry.gitlab.com/passbolt/passbolt-ci-docker-images/gcloud
3+
image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/gcloud
44
variables:
55
EDITION: "ce"
66
BUCKET: "download.passbolt.com"

‎.gitlab-ci/quality.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
Repository filesystem scan:
22
stage: Quality
3-
image: registry.gitlab.com/passbolt/passbolt-ci-docker-images/aquasec:latest
3+
image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/aquasec/trivy:latest
44
script:
55
- trivy fs .
66

77
Configuration scan:
88
stage: Quality
9-
image: registry.gitlab.com/passbolt/passbolt-ci-docker-images/aquasec:latest
9+
image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/aquasec/trivy:latest
1010
script:
1111
- trivy config .

‎.gitlab-ci/shellcheck.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
.shellcheck:
22
stage: Quality
3-
image: registry.gitlab.com/passbolt/passbolt-ci-docker-images/alpine-3.16:latest
3+
image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/alpine:3.16
44
variables:
55
SCRIPTFILE: ""
66
script:

‎.gitlab-ci/test.yml‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
.test-deb:
2-
image: registry.gitlab.com/passbolt/passbolt-ci-docker-images/debian-bullseye-11-slim:latest
2+
image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/debian:bullseye-slim
33
variables:
44
PASSBOLT_FLAVOUR: ""
55
PACKAGE_MANAGER: "apt"
@@ -52,97 +52,97 @@
5252

5353
Debian 11 CE:
5454
extends: .test-deb-ce
55-
image: registry.gitlab.com/passbolt/passbolt-ci-docker-images/debian-bullseye-11-slim:latest
55+
image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/debian:bullseye-slim
5656

5757
Debian 11 PRO:
5858
extends: .test-deb-pro
59-
image: registry.gitlab.com/passbolt/passbolt-ci-docker-images/debian-bullseye-11-slim:latest
59+
image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/debian:bullseye-slim
6060

6161
Debian 12 CE:
6262
extends: .test-deb-ce
63-
image: registry.gitlab.com/passbolt/passbolt-ci-docker-images/debian-bookworm-12:latest
63+
image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/debian:bookworm
6464

6565
Debian 12 PRO:
6666
extends: .test-deb-pro
67-
image: registry.gitlab.com/passbolt/passbolt-ci-docker-images/debian-bookworm-12:latest
67+
image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/debian:bookworm
6868

6969
Raspbian CE:
7070
extends: .test-deb-ce
71-
image: registry.gitlab.com/passbolt/passbolt-ci-docker-images/debian-bullseye-11-slim:latest
71+
image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/debian:bullseye-slim
7272
before_script:
7373
- sed -i "s/ID=debian/ID=raspbian/" /etc/os-release
7474

7575
Raspbian PRO:
7676
extends: .test-deb-pro
77-
image: registry.gitlab.com/passbolt/passbolt-ci-docker-images/debian-bullseye-11-slim:latest
77+
image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/debian:bullseye-slim
7878
before_script:
7979
- sed -i "s/ID=debian/ID=raspbian/" /etc/os-release
8080

8181
Ubuntu 20.04 CE:
8282
extends: .test-deb-ce
83-
image: registry.gitlab.com/passbolt/passbolt-ci-docker-images/ubuntu-focal-2004
83+
image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/ubuntu:focal
8484

8585
Ubuntu 20.04 PRO:
8686
extends: .test-deb-pro
87-
image: registry.gitlab.com/passbolt/passbolt-ci-docker-images/ubuntu-focal-2004
87+
image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/ubuntu:focal
8888

8989
Ubuntu 22.04 CE:
9090
extends: .test-deb-ce
91-
image: registry.gitlab.com/passbolt/passbolt-ci-docker-images/ubuntu-jammy-2204
91+
image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/ubuntu:jammy
9292

9393
Ubuntu 22.04 PRO:
9494
extends: .test-deb-pro
95-
image: registry.gitlab.com/passbolt/passbolt-ci-docker-images/ubuntu-jammy-2204
95+
image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/ubuntu:jammy
9696

9797
RockyLinux 8 CE:
9898
extends: .test-rpm-ce
99-
image: registry.gitlab.com/passbolt/passbolt-ci-docker-images/rockylinux-8
99+
image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/rockylinux:8
100100

101101
RockyLinux 8 PRO:
102102
extends: .test-rpm-pro
103-
image: registry.gitlab.com/passbolt/passbolt-ci-docker-images/rockylinux-8
103+
image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/rockylinux:8
104104

105105
AlmaLinux 8 CE:
106106
extends: .test-rpm-ce
107-
image: registry.gitlab.com/passbolt/passbolt-ci-docker-images/almalinux-8
107+
image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/almalinux:8
108108

109109
AlmaLinux 8 PRO:
110110
extends: .test-rpm-pro
111-
image: registry.gitlab.com/passbolt/passbolt-ci-docker-images/almalinux-8
111+
image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/almalinux:8
112112

113113
CentOS 7 CE:
114114
extends: .test-rpm-ce
115115
variables:
116116
PACKAGE_MANAGER: "yum"
117-
image: registry.gitlab.com/passbolt/passbolt-ci-docker-images/centos-7
117+
image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/centos:7
118118

119119
CentOS 7 PRO:
120120
extends: .test-rpm-pro
121121
variables:
122122
PACKAGE_MANAGER: "yum"
123-
image: registry.gitlab.com/passbolt/passbolt-ci-docker-images/centos-7
123+
image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/centos:7
124124

125125
openSUSE 15 CE:
126126
extends: .test-rpm-ce
127127
variables:
128128
PACKAGE_MANAGER: "zypper"
129129
ZYPPER_OPTIONS: "-n --no-gpg-checks"
130-
image: registry.gitlab.com/passbolt/passbolt-ci-docker-images/opensuse-leap-15
130+
image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/opensuse/leap:15
131131

132132
openSUSE 15 PRO:
133133
extends: .test-rpm-pro
134134
variables:
135135
PACKAGE_MANAGER: "zypper"
136136
ZYPPER_OPTIONS: "-n --no-gpg-checks"
137-
image: registry.gitlab.com/passbolt/passbolt-ci-docker-images/opensuse-leap-15
137+
image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/opensuse/leap:15
138138

139139
Fedora 39 CE:
140140
extends: .test-rpm-ce
141-
image: registry.gitlab.com/passbolt/passbolt-ci-docker-images/fedora-39
141+
image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/fedora:39
142142

143143
Fedora 39 PRO:
144144
extends: .test-rpm-pro
145-
image: registry.gitlab.com/passbolt/passbolt-ci-docker-images/fedora-39
145+
image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/fedora:39
146146

147147
SLES15 SP6 CE:
148148
extends: .test-rpm-ce
@@ -158,4 +158,4 @@ SLES15 SP6 PRO:
158158
PACKAGE_MANAGER: "zypper"
159159
ZYPPER_OPTIONS: "-n --no-gpg-checks"
160160
SUSE_PACKAGE: "sudo"
161-
image: registry.suse.com/bci/bci-base:15.6
161+
image: registry.suse.com/bci/bci-base:15.6

‎passbolt-repo-setup.ce.sh‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ function is_supported_distro() {
5656
"raspbian"
5757
"ubuntu20"
5858
"ubuntu22"
59+
"ubuntu24"
5960
"centos7"
6061
"rhel7"
6162
"rhel8"
@@ -138,6 +139,10 @@ os_detect () {
138139
CODENAME="buster"
139140
# We use focal ubuntu package for jammy
140141
elif [ "${CODENAME}" = "jammy" ]
142+
then
143+
CODENAME="focal"
144+
# We use focal ubuntu package for noble
145+
elif [ "${CODENAME}" = "noble" ]
141146
then
142147
CODENAME="focal"
143148
fi

‎passbolt-repo-setup.pro.sh‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ function is_supported_distro() {
5656
"raspbian"
5757
"ubuntu20"
5858
"ubuntu22"
59+
"ubuntu24"
5960
"centos7"
6061
"rhel7"
6162
"rhel8"
@@ -138,6 +139,10 @@ os_detect () {
138139
CODENAME="buster"
139140
# We use focal ubuntu package for jammy
140141
elif [ "${CODENAME}" = "jammy" ]
142+
then
143+
CODENAME="focal"
144+
# We use focal ubuntu package for noble
145+
elif [ "${CODENAME}" = "noble" ]
141146
then
142147
CODENAME="focal"
143148
fi

0 commit comments

Comments
 (0)