Skip to content

Commit 7a80b3f

Browse files
cedricalfonsicedricalfonsi
committed
Merge branch 'release' into 'master'
PB-32429 v4.6.2 See merge request passbolt/passbolt-ce-api!269
2 parents b05665d + a53ba95 commit 7a80b3f

File tree

29 files changed

+215
-88
lines changed

29 files changed

+215
-88
lines changed

‎.gitlab-ci.yml

+7-2
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ default:
77
- api_failure
88
- stale_schedule
99

10-
image: alpine:latest
10+
image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/alpine:latest
1111

1212
variables:
13-
DOCKER_HOST: tcp://localhost:2375
13+
DOCKER_HOST: tcp://docker:2375
1414
DOCKER_DRIVER: overlay2
1515
DOCKER_TLS_CERTDIR: ""
1616

@@ -31,6 +31,11 @@ include:
3131
- local: ".gitlab-ci/jobs/help_site_notes.yml"
3232

3333
code_quality:
34+
image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/docker:20.10.12-dind
35+
services:
36+
- name: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/docker:20.10.12-dind
37+
alias: docker
38+
command: ["--tls=false", "--host=tcp://0.0.0.0:2375"]
3439
stage: unit-test
3540

3641
workflow:

‎.gitlab-ci/jobs/help_site_notes.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ help_site_notes:
44
GPG_KEY_PATH: "/tmp/gpg-key"
55
GPG_PASSPHRASE: $HELP_SITE_GPG_KEY_PASS
66
GPG_KEY_GRIP: $HELP_SITE_GPG_KEYGRIP
7-
image: debian
7+
image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/debian:bookworm
88
script: |
99
source .gitlab-ci/scripts/lib/version-check.sh
1010
if is_release_candidate "$tag" || is_testing_candidate "$tag"; then

‎.gitlab-ci/jobs/packaging_trigger/package_trigger.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ packaging-trigger:
33
variables:
44
PACKAGING_TRIGGER_BRANCH: "main"
55
DOWNSTREAM_PROJECT_ID: "$PACKAGING_PROJECT_ID"
6-
image: debian:bullseye-slim
6+
image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/debian:bookworm-slim
77
script:
88
- apt update && apt install -y curl
99
- bash .gitlab-ci/scripts/bin/packaging-trigger.sh "$CI_COMMIT_TAG" "$PACKAGING_TRIGGER_BRANCH"

‎.gitlab-ci/jobs/php_unit_tests/php_73.yml

+9-9
Original file line numberDiff line numberDiff line change
@@ -7,28 +7,28 @@
77
php7.3-postgres11:
88
variables:
99
PHP_VERSION: "7.3"
10-
DATABASE_ENGINE_VERSION: "$CI_REGISTRY/postgres-11-alpine"
10+
DATABASE_ENGINE_VERSION: "${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/postgres:11-alpine"
1111
extends:
1212
- .test-template-parallel
1313

1414
php7.3-postgres12:
1515
variables:
1616
PHP_VERSION: "7.3"
17-
DATABASE_ENGINE_VERSION: "$CI_REGISTRY/postgres-12-alpine"
17+
DATABASE_ENGINE_VERSION: "${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/postgres:12-alpine"
1818
extends:
1919
- .test-template-parallel-scheduled
2020

2121
php7.3-postgres13:
2222
variables:
2323
PHP_VERSION: "7.3"
24-
DATABASE_ENGINE_VERSION: "$CI_REGISTRY/postgres-13-alpine"
24+
DATABASE_ENGINE_VERSION: "${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/postgres:13-alpine"
2525
extends:
2626
- .test-template-parallel-scheduled
2727

2828
php7.3-postgres14:
2929
variables:
3030
PHP_VERSION: "7.3"
31-
DATABASE_ENGINE_VERSION: "$CI_REGISTRY/postgres-14-alpine"
31+
DATABASE_ENGINE_VERSION: "${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/postgres:14-alpine"
3232
extends:
3333
- .test-template-parallel-scheduled
3434

@@ -41,21 +41,21 @@ php7.3-postgres14:
4141
php7.3-mariadb10.3:
4242
variables:
4343
PHP_VERSION: "7.3"
44-
DATABASE_ENGINE_VERSION: "$CI_REGISTRY/mariadb-10.3"
44+
DATABASE_ENGINE_VERSION: "${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/mariadb:10.3"
4545
extends:
4646
- .test-template-parallel
4747

4848
php7.3-mariadb10.5:
4949
variables:
5050
PHP_VERSION: "7.3"
51-
DATABASE_ENGINE_VERSION: "$CI_REGISTRY/mariadb-10.3"
51+
DATABASE_ENGINE_VERSION: "${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/mariadb:10.3"
5252
extends:
5353
- .test-template-parallel-scheduled
5454

5555
php7.3-mariadb10.6:
5656
variables:
5757
PHP_VERSION: "7.3"
58-
DATABASE_ENGINE_VERSION: "$CI_REGISTRY/mariadb-10.6"
58+
DATABASE_ENGINE_VERSION: "${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/mariadb:10.6"
5959
extends:
6060
- .test-template-parallel-scheduled
6161

@@ -68,13 +68,13 @@ php7.3-mariadb10.6:
6868
php7.3-mysql5.7:
6969
variables:
7070
PHP_VERSION: "7.3"
71-
DATABASE_ENGINE_VERSION: "$CI_REGISTRY/mysql-5.7"
71+
DATABASE_ENGINE_VERSION: "${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/mysql:5.7"
7272
extends:
7373
- .test-template-parallel
7474

7575
php7.3-mysql8:
7676
variables:
7777
PHP_VERSION: "7.3"
78-
DATABASE_ENGINE_VERSION: "$CI_REGISTRY/mysql-8.0"
78+
DATABASE_ENGINE_VERSION: "${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/mysql:8.0"
7979
extends:
8080
- .test-template-parallel-scheduled

‎.gitlab-ci/jobs/php_unit_tests/php_74.yml

+9-9
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
php7.4-postgres11:
66
variables:
77
PHP_VERSION: "7.4"
8-
DATABASE_ENGINE_VERSION: "$CI_REGISTRY/postgres-11-alpine"
8+
DATABASE_ENGINE_VERSION: "${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/postgres:11-alpine"
99
extends:
1010
- .test-template-parallel-scheduled
1111

@@ -14,7 +14,7 @@ php7.4-postgres11:
1414
php7.4-postgres12:
1515
variables:
1616
PHP_VERSION: "7.4"
17-
DATABASE_ENGINE_VERSION: "$CI_REGISTRY/postgres-12-alpine"
17+
DATABASE_ENGINE_VERSION: "${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/postgres:12-alpine"
1818
extends:
1919
- .test-template-parallel
2020

@@ -23,14 +23,14 @@ php7.4-postgres12:
2323
php7.4-postgres13:
2424
variables:
2525
PHP_VERSION: "7.4"
26-
DATABASE_ENGINE_VERSION: "$CI_REGISTRY/postgres-13-alpine"
26+
DATABASE_ENGINE_VERSION: "${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/postgres:13-alpine"
2727
extends:
2828
- .test-template-parallel-scheduled
2929

3030
php7.4-postgres14:
3131
variables:
3232
PHP_VERSION: "7.4"
33-
DATABASE_ENGINE_VERSION: "$CI_REGISTRY/postgres-14-alpine"
33+
DATABASE_ENGINE_VERSION: "${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/postgres:14-alpine"
3434
extends:
3535
- .test-template-parallel-scheduled
3636

@@ -41,7 +41,7 @@ php7.4-postgres14:
4141
php7.4-mariadb10.3:
4242
variables:
4343
PHP_VERSION: "7.4"
44-
DATABASE_ENGINE_VERSION: "$CI_REGISTRY/mariadb-10.3"
44+
DATABASE_ENGINE_VERSION: "${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/mariadb:10.3"
4545
extends:
4646
- .test-template-parallel-scheduled
4747

@@ -50,14 +50,14 @@ php7.4-mariadb10.3:
5050
php7.4-mariadb10.5:
5151
variables:
5252
PHP_VERSION: "7.4"
53-
DATABASE_ENGINE_VERSION: "$CI_REGISTRY/mariadb-10.5"
53+
DATABASE_ENGINE_VERSION: "${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/mariadb:10.5"
5454
extends:
5555
- .test-template-parallel
5656

5757
php7.4-mariadb10.6:
5858
variables:
5959
PHP_VERSION: "7.4"
60-
DATABASE_ENGINE_VERSION: "$CI_REGISTRY/mariadb-10.6"
60+
DATABASE_ENGINE_VERSION: "${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/mariadb:10.6"
6161
extends:
6262
- .test-template-parallel-scheduled
6363

@@ -70,7 +70,7 @@ php7.4-mariadb10.6:
7070
php7.4-mysql5.7:
7171
variables:
7272
PHP_VERSION: "7.4"
73-
DATABASE_ENGINE_VERSION: "$CI_REGISTRY/mysql-5.7"
73+
DATABASE_ENGINE_VERSION: "${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/mysql:5.7"
7474
extends:
7575
- .test-template-parallel
7676

@@ -79,6 +79,6 @@ php7.4-mysql5.7:
7979
php7.4-mysql8:
8080
variables:
8181
PHP_VERSION: "7.4"
82-
DATABASE_ENGINE_VERSION: "$CI_REGISTRY/mysql-8.0"
82+
DATABASE_ENGINE_VERSION: "${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/mysql:8.0"
8383
extends:
8484
- .test-template-parallel

‎.gitlab-ci/jobs/php_unit_tests/php_81.yml

+9-9
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55
php8.1-postgres11:
66
variables:
77
PHP_VERSION: "8.1"
8-
DATABASE_ENGINE_VERSION: "$CI_REGISTRY/postgres-11-alpine"
8+
DATABASE_ENGINE_VERSION: "${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/postgres:11-alpine"
99
extends:
1010
- .test-template-parallel-scheduled
1111

1212
php8.1-postgres12:
1313
variables:
1414
PHP_VERSION: "8.1"
15-
DATABASE_ENGINE_VERSION: "$CI_REGISTRY/postgres-12-alpine"
15+
DATABASE_ENGINE_VERSION: "${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/postgres:12-alpine"
1616
extends:
1717
- .test-template-parallel-scheduled
1818

@@ -21,7 +21,7 @@ php8.1-postgres12:
2121
php8.1-postgres13:
2222
variables:
2323
PHP_VERSION: "8.1"
24-
DATABASE_ENGINE_VERSION: "$CI_REGISTRY/postgres-13-alpine"
24+
DATABASE_ENGINE_VERSION: "${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/postgres:13-alpine"
2525
extends:
2626
- .test-template-parallel
2727

@@ -30,7 +30,7 @@ php8.1-postgres13:
3030
php8.1-postgres14:
3131
variables:
3232
PHP_VERSION: "8.1"
33-
DATABASE_ENGINE_VERSION: "$CI_REGISTRY/postgres-14-alpine"
33+
DATABASE_ENGINE_VERSION: "${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/postgres:14-alpine"
3434
extends:
3535
- .test-template-parallel
3636

@@ -41,7 +41,7 @@ php8.1-postgres14:
4141
php8.1-mariadb10.3:
4242
variables:
4343
PHP_VERSION: "8.1"
44-
DATABASE_ENGINE_VERSION: "$CI_REGISTRY/mariadb-10.3"
44+
DATABASE_ENGINE_VERSION: "${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/mariadb:10.3"
4545
extends:
4646
- .test-template-parallel-scheduled
4747

@@ -50,7 +50,7 @@ php8.1-mariadb10.3:
5050
php8.1-mariadb10.5:
5151
variables:
5252
PHP_VERSION: "8.1"
53-
DATABASE_ENGINE_VERSION: "$CI_REGISTRY/mariadb-10.5"
53+
DATABASE_ENGINE_VERSION: "${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/mariadb:10.5"
5454
extends:
5555
- .test-template-parallel
5656

@@ -59,7 +59,7 @@ php8.1-mariadb10.5:
5959
php8.1-mariadb10.6:
6060
variables:
6161
PHP_VERSION: "8.1"
62-
DATABASE_ENGINE_VERSION: "$CI_REGISTRY/mariadb-10.6"
62+
DATABASE_ENGINE_VERSION: "${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/mariadb:10.6"
6363
extends:
6464
- .test-template-parallel
6565

@@ -70,7 +70,7 @@ php8.1-mariadb10.6:
7070
php8.1-mysql5.7:
7171
variables:
7272
PHP_VERSION: "8.1"
73-
DATABASE_ENGINE_VERSION: "$CI_REGISTRY/mysql-5.7"
73+
DATABASE_ENGINE_VERSION: "${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/mysql:5.7"
7474
extends:
7575
- .test-template-parallel-scheduled
7676

@@ -80,6 +80,6 @@ php8.1-mysql5.7:
8080
php8.1-mysql8:
8181
variables:
8282
PHP_VERSION: "8.1"
83-
DATABASE_ENGINE_VERSION: "$CI_REGISTRY/mysql-8.0"
83+
DATABASE_ENGINE_VERSION: "${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/mysql:8.0"
8484
extends:
8585
- .test-template-parallel

‎.gitlab-ci/jobs/php_unit_tests/php_82.yml

+9-9
Original file line numberDiff line numberDiff line change
@@ -5,28 +5,28 @@
55
php8.2-postgres11:
66
variables:
77
PHP_VERSION: "8.2"
8-
DATABASE_ENGINE_VERSION: "$CI_REGISTRY/postgres-11-alpine"
8+
DATABASE_ENGINE_VERSION: "${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/postgres:11-alpine"
99
extends:
1010
- .test-template-parallel-scheduled
1111

1212
php8.2-postgres12:
1313
variables:
1414
PHP_VERSION: "8.2"
15-
DATABASE_ENGINE_VERSION: "$CI_REGISTRY/postgres-12-alpine"
15+
DATABASE_ENGINE_VERSION: "${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/postgres:12-alpine"
1616
extends:
1717
- .test-template-parallel-scheduled
1818

1919
php8.2-postgres13:
2020
variables:
2121
PHP_VERSION: "8.2"
22-
DATABASE_ENGINE_VERSION: "$CI_REGISTRY/postgres-13-alpine"
22+
DATABASE_ENGINE_VERSION: "${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/postgres:13-alpine"
2323
extends:
2424
- .test-template-parallel-scheduled
2525

2626
php8.2-postgres14:
2727
variables:
2828
PHP_VERSION: "8.2"
29-
DATABASE_ENGINE_VERSION: "$CI_REGISTRY/postgres-14-alpine"
29+
DATABASE_ENGINE_VERSION: "${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/postgres:14-alpine"
3030
extends:
3131
- .test-template-parallel-scheduled
3232

@@ -37,22 +37,22 @@ php8.2-postgres14:
3737
php8.2-mariadb10.3:
3838
variables:
3939
PHP_VERSION: "8.2"
40-
DATABASE_ENGINE_VERSION: "$CI_REGISTRY/mariadb-10.3"
40+
DATABASE_ENGINE_VERSION: "${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/mariadb:10.3"
4141
extends:
4242
- .test-template-parallel-scheduled
4343

4444
php8.2-mariadb10.5:
4545
variables:
4646
PHP_VERSION: "8.2"
47-
DATABASE_ENGINE_VERSION: "$CI_REGISTRY/mariadb-10.5"
47+
DATABASE_ENGINE_VERSION: "${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/mariadb:10.5"
4848
extends:
4949
- .test-template-parallel-scheduled
5050

5151
# Initial support
5252
php8.2-mariadb10.6:
5353
variables:
5454
PHP_VERSION: "8.2"
55-
DATABASE_ENGINE_VERSION: "$CI_REGISTRY/mariadb-10.6"
55+
DATABASE_ENGINE_VERSION: "${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/mariadb:10.6"
5656
extends:
5757
- .test-template-parallel
5858

@@ -63,14 +63,14 @@ php8.2-mariadb10.6:
6363
php8.2-mysql5.7:
6464
variables:
6565
PHP_VERSION: "8.2"
66-
DATABASE_ENGINE_VERSION: "$CI_REGISTRY/mysql-5.7"
66+
DATABASE_ENGINE_VERSION: "${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/mysql:5.7"
6767
extends:
6868
- .test-template-parallel-scheduled
6969

7070
# Initial support
7171
php8.2-mysql8:
7272
variables:
7373
PHP_VERSION: "8.2"
74-
DATABASE_ENGINE_VERSION: "$CI_REGISTRY/mysql-8.0"
74+
DATABASE_ENGINE_VERSION: "${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/mysql:8.0"
7575
extends:
7676
- .test-template-parallel

‎.gitlab-ci/jobs/php_unit_tests/runner.yml

+8-6
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@
1616
KUBERNETES_SERVICE_CPU_REQUEST: 1
1717
KUBERNETES_SERVICE_MEMORY_REQUEST: 3Gi
1818
services:
19-
- $CI_REGISTRY/dind:latest
19+
- name: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/docker:26.0.0-dind
20+
alias: docker
2021
allow_failure: true
2122
script:
2223
- apt-get update
@@ -39,7 +40,7 @@
3940
image: $CI_REGISTRY_IMAGE_TEST:8.1
4041
timeout: 10m
4142
variables:
42-
DOCKER_HOST: tcp://localhost:2376/
43+
DOCKER_HOST: tcp://docker:2376/
4344
DOCKER_TLS_CERTDIR: "/certs"
4445
DOCKER_TLS_VERIFY: 1
4546
DOCKER_CERT_PATH: "$DOCKER_TLS_CERTDIR/client"
@@ -54,7 +55,8 @@
5455

5556
COMPOSER_ALLOW_SUPERUSER: 1
5657
services:
57-
- $CI_REGISTRY_USER/dind:latest
58+
- name: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/docker:26.0.0-dind
59+
alias: docker
5860
script:
5961
- apt-get update
6062
- apt-get install -y ca-certificates curl gnupg lsb-release
@@ -75,6 +77,6 @@
7577
- when: manual
7678

7779
include:
78-
- local: '/.gitlab-ci/jobs/php_unit_tests/php_74.yml'
79-
- local: '/.gitlab-ci/jobs/php_unit_tests/php_81.yml'
80-
- local: '/.gitlab-ci/jobs/php_unit_tests/php_82.yml'
80+
- local: "/.gitlab-ci/jobs/php_unit_tests/php_74.yml"
81+
- local: "/.gitlab-ci/jobs/php_unit_tests/php_81.yml"
82+
- local: "/.gitlab-ci/jobs/php_unit_tests/php_82.yml"

‎.gitlab-ci/jobs/style_check.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ static-analysis:
2525

2626
static-analysis-js:
2727
stage: unit-test
28-
image: node:18
28+
image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/node:18
2929
script:
3030
- npm ci
3131
- npm run lint

0 commit comments

Comments
 (0)