Merge branch 'release' into 'master'

PB-32429 v4.6.2 See merge request passbolt/passbolt-ce-api!269
passbolt · Apr 11, 2024 · 7a80b3f · 7a80b3f
2 parents b05665d + a53ba95
commit 7a80b3f
Show file tree

Hide file tree

Showing 29 changed files with 215 additions and 88 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -7,10 +7,10 @@ default:
       - api_failure
       - stale_schedule
 
-image: alpine:latest
+image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/alpine:latest
 
 variables:
-  DOCKER_HOST: tcp://localhost:2375
+  DOCKER_HOST: tcp://docker:2375
   DOCKER_DRIVER: overlay2
   DOCKER_TLS_CERTDIR: ""
 
@@ -31,6 +31,11 @@ include:
   - local: ".gitlab-ci/jobs/help_site_notes.yml"
 
 code_quality:
+  image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/docker:20.10.12-dind
+  services:
+    - name: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/docker:20.10.12-dind
+      alias: docker
+      command: ["--tls=false", "--host=tcp://0.0.0.0:2375"]
   stage: unit-test
 
 workflow:

diff --git a/.gitlab-ci/jobs/help_site_notes.yml b/.gitlab-ci/jobs/help_site_notes.yml
@@ -4,7 +4,7 @@ help_site_notes:
     GPG_KEY_PATH: "/tmp/gpg-key"
     GPG_PASSPHRASE: $HELP_SITE_GPG_KEY_PASS
     GPG_KEY_GRIP: $HELP_SITE_GPG_KEYGRIP
-  image: debian
+  image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/debian:bookworm
   script: |
     source .gitlab-ci/scripts/lib/version-check.sh
     if is_release_candidate "$tag" || is_testing_candidate "$tag"; then

diff --git a/.gitlab-ci/jobs/packaging_trigger/package_trigger.yml b/.gitlab-ci/jobs/packaging_trigger/package_trigger.yml
@@ -3,7 +3,7 @@ packaging-trigger:
   variables:
     PACKAGING_TRIGGER_BRANCH: "main"
     DOWNSTREAM_PROJECT_ID: "$PACKAGING_PROJECT_ID"
-  image: debian:bullseye-slim
+  image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/debian:bookworm-slim
   script:
     - apt update && apt install -y curl
     - bash .gitlab-ci/scripts/bin/packaging-trigger.sh "$CI_COMMIT_TAG" "$PACKAGING_TRIGGER_BRANCH"

diff --git a/.gitlab-ci/jobs/php_unit_tests/php_73.yml b/.gitlab-ci/jobs/php_unit_tests/php_73.yml
@@ -7,28 +7,28 @@
 php7.3-postgres11:
   variables:
     PHP_VERSION: "7.3"
-    DATABASE_ENGINE_VERSION: "$CI_REGISTRY/postgres-11-alpine"
+    DATABASE_ENGINE_VERSION: "${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/postgres:11-alpine"
   extends:
     - .test-template-parallel
 
 php7.3-postgres12:
   variables:
     PHP_VERSION: "7.3"
-    DATABASE_ENGINE_VERSION: "$CI_REGISTRY/postgres-12-alpine"
+    DATABASE_ENGINE_VERSION: "${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/postgres:12-alpine"
   extends:
     - .test-template-parallel-scheduled
 
 php7.3-postgres13:
   variables:
     PHP_VERSION: "7.3"
-    DATABASE_ENGINE_VERSION: "$CI_REGISTRY/postgres-13-alpine"
+    DATABASE_ENGINE_VERSION: "${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/postgres:13-alpine"
   extends:
     - .test-template-parallel-scheduled
 
 php7.3-postgres14:
   variables:
     PHP_VERSION: "7.3"
-    DATABASE_ENGINE_VERSION: "$CI_REGISTRY/postgres-14-alpine"
+    DATABASE_ENGINE_VERSION: "${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/postgres:14-alpine"
   extends:
     - .test-template-parallel-scheduled
 
@@ -41,21 +41,21 @@ php7.3-postgres14:
 php7.3-mariadb10.3:
   variables:
     PHP_VERSION: "7.3"
-    DATABASE_ENGINE_VERSION: "$CI_REGISTRY/mariadb-10.3"
+    DATABASE_ENGINE_VERSION: "${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/mariadb:10.3"
   extends:
     - .test-template-parallel
 
 php7.3-mariadb10.5:
   variables:
     PHP_VERSION: "7.3"
-    DATABASE_ENGINE_VERSION: "$CI_REGISTRY/mariadb-10.3"
+    DATABASE_ENGINE_VERSION: "${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/mariadb:10.3"
   extends:
     - .test-template-parallel-scheduled
 
 php7.3-mariadb10.6:
   variables:
     PHP_VERSION: "7.3"
-    DATABASE_ENGINE_VERSION: "$CI_REGISTRY/mariadb-10.6"
+    DATABASE_ENGINE_VERSION: "${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/mariadb:10.6"
   extends:
     - .test-template-parallel-scheduled
 
@@ -68,13 +68,13 @@ php7.3-mariadb10.6:
 php7.3-mysql5.7:
   variables:
     PHP_VERSION: "7.3"
-    DATABASE_ENGINE_VERSION: "$CI_REGISTRY/mysql-5.7"
+    DATABASE_ENGINE_VERSION: "${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/mysql:5.7"
   extends:
     - .test-template-parallel
 
 php7.3-mysql8:
   variables:
     PHP_VERSION: "7.3"
-    DATABASE_ENGINE_VERSION: "$CI_REGISTRY/mysql-8.0"
+    DATABASE_ENGINE_VERSION: "${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/mysql:8.0"
   extends:
     - .test-template-parallel-scheduled
diff --git a/.gitlab-ci/jobs/php_unit_tests/php_74.yml b/.gitlab-ci/jobs/php_unit_tests/php_74.yml
@@ -5,7 +5,7 @@
 php7.4-postgres11:
   variables:
     PHP_VERSION: "7.4"
-    DATABASE_ENGINE_VERSION: "$CI_REGISTRY/postgres-11-alpine"
+    DATABASE_ENGINE_VERSION: "${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/postgres:11-alpine"
   extends:
     - .test-template-parallel-scheduled
 
@@ -14,7 +14,7 @@ php7.4-postgres11:
 php7.4-postgres12:
   variables:
     PHP_VERSION: "7.4"
-    DATABASE_ENGINE_VERSION: "$CI_REGISTRY/postgres-12-alpine"
+    DATABASE_ENGINE_VERSION: "${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/postgres:12-alpine"
   extends:
     - .test-template-parallel
 
@@ -23,14 +23,14 @@ php7.4-postgres12:
 php7.4-postgres13:
   variables:
     PHP_VERSION: "7.4"
-    DATABASE_ENGINE_VERSION: "$CI_REGISTRY/postgres-13-alpine"
+    DATABASE_ENGINE_VERSION: "${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/postgres:13-alpine"
   extends:
     - .test-template-parallel-scheduled
 
 php7.4-postgres14:
   variables:
     PHP_VERSION: "7.4"
-    DATABASE_ENGINE_VERSION: "$CI_REGISTRY/postgres-14-alpine"
+    DATABASE_ENGINE_VERSION: "${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/postgres:14-alpine"
   extends:
     - .test-template-parallel-scheduled
 
@@ -41,7 +41,7 @@ php7.4-postgres14:
 php7.4-mariadb10.3:
   variables:
     PHP_VERSION: "7.4"
-    DATABASE_ENGINE_VERSION: "$CI_REGISTRY/mariadb-10.3"
+    DATABASE_ENGINE_VERSION: "${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/mariadb:10.3"
   extends:
     - .test-template-parallel-scheduled
 
@@ -50,14 +50,14 @@ php7.4-mariadb10.3:
 php7.4-mariadb10.5:
   variables:
     PHP_VERSION: "7.4"
-    DATABASE_ENGINE_VERSION: "$CI_REGISTRY/mariadb-10.5"
+    DATABASE_ENGINE_VERSION: "${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/mariadb:10.5"
   extends:
     - .test-template-parallel
 
 php7.4-mariadb10.6:
   variables:
     PHP_VERSION: "7.4"
-    DATABASE_ENGINE_VERSION: "$CI_REGISTRY/mariadb-10.6"
+    DATABASE_ENGINE_VERSION: "${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/mariadb:10.6"
   extends:
     - .test-template-parallel-scheduled
 
@@ -70,7 +70,7 @@ php7.4-mariadb10.6:
 php7.4-mysql5.7:
   variables:
     PHP_VERSION: "7.4"
-    DATABASE_ENGINE_VERSION: "$CI_REGISTRY/mysql-5.7"
+    DATABASE_ENGINE_VERSION: "${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/mysql:5.7"
   extends:
     - .test-template-parallel
 
@@ -79,6 +79,6 @@ php7.4-mysql5.7:
 php7.4-mysql8:
   variables:
     PHP_VERSION: "7.4"
-    DATABASE_ENGINE_VERSION: "$CI_REGISTRY/mysql-8.0"
+    DATABASE_ENGINE_VERSION: "${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/mysql:8.0"
   extends:
     - .test-template-parallel
diff --git a/.gitlab-ci/jobs/php_unit_tests/php_81.yml b/.gitlab-ci/jobs/php_unit_tests/php_81.yml
@@ -5,14 +5,14 @@
 php8.1-postgres11:
   variables:
     PHP_VERSION: "8.1"
-    DATABASE_ENGINE_VERSION: "$CI_REGISTRY/postgres-11-alpine"
+    DATABASE_ENGINE_VERSION: "${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/postgres:11-alpine"
   extends:
     - .test-template-parallel-scheduled
 
 php8.1-postgres12:
   variables:
     PHP_VERSION: "8.1"
-    DATABASE_ENGINE_VERSION: "$CI_REGISTRY/postgres-12-alpine"
+    DATABASE_ENGINE_VERSION: "${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/postgres:12-alpine"
   extends:
     - .test-template-parallel-scheduled
 
@@ -21,7 +21,7 @@ php8.1-postgres12:
 php8.1-postgres13:
   variables:
     PHP_VERSION: "8.1"
-    DATABASE_ENGINE_VERSION: "$CI_REGISTRY/postgres-13-alpine"
+    DATABASE_ENGINE_VERSION: "${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/postgres:13-alpine"
   extends:
     - .test-template-parallel
 
@@ -30,7 +30,7 @@ php8.1-postgres13:
 php8.1-postgres14:
   variables:
     PHP_VERSION: "8.1"
-    DATABASE_ENGINE_VERSION: "$CI_REGISTRY/postgres-14-alpine"
+    DATABASE_ENGINE_VERSION: "${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/postgres:14-alpine"
   extends:
     - .test-template-parallel
 
@@ -41,7 +41,7 @@ php8.1-postgres14:
 php8.1-mariadb10.3:
   variables:
     PHP_VERSION: "8.1"
-    DATABASE_ENGINE_VERSION: "$CI_REGISTRY/mariadb-10.3"
+    DATABASE_ENGINE_VERSION: "${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/mariadb:10.3"
   extends:
     - .test-template-parallel-scheduled
 
@@ -50,7 +50,7 @@ php8.1-mariadb10.3:
 php8.1-mariadb10.5:
   variables:
     PHP_VERSION: "8.1"
-    DATABASE_ENGINE_VERSION: "$CI_REGISTRY/mariadb-10.5"
+    DATABASE_ENGINE_VERSION: "${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/mariadb:10.5"
   extends:
     - .test-template-parallel
 
@@ -59,7 +59,7 @@ php8.1-mariadb10.5:
 php8.1-mariadb10.6:
   variables:
     PHP_VERSION: "8.1"
-    DATABASE_ENGINE_VERSION: "$CI_REGISTRY/mariadb-10.6"
+    DATABASE_ENGINE_VERSION: "${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/mariadb:10.6"
   extends:
     - .test-template-parallel
 
@@ -70,7 +70,7 @@ php8.1-mariadb10.6:
 php8.1-mysql5.7:
   variables:
     PHP_VERSION: "8.1"
-    DATABASE_ENGINE_VERSION: "$CI_REGISTRY/mysql-5.7"
+    DATABASE_ENGINE_VERSION: "${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/mysql:5.7"
   extends:
     - .test-template-parallel-scheduled
 
@@ -80,6 +80,6 @@ php8.1-mysql5.7:
 php8.1-mysql8:
   variables:
     PHP_VERSION: "8.1"
-    DATABASE_ENGINE_VERSION: "$CI_REGISTRY/mysql-8.0"
+    DATABASE_ENGINE_VERSION: "${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/mysql:8.0"
   extends:
     - .test-template-parallel
diff --git a/.gitlab-ci/jobs/php_unit_tests/php_82.yml b/.gitlab-ci/jobs/php_unit_tests/php_82.yml
@@ -5,28 +5,28 @@
 php8.2-postgres11:
   variables:
     PHP_VERSION: "8.2"
-    DATABASE_ENGINE_VERSION: "$CI_REGISTRY/postgres-11-alpine"
+    DATABASE_ENGINE_VERSION: "${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/postgres:11-alpine"
   extends:
     - .test-template-parallel-scheduled
 
 php8.2-postgres12:
   variables:
     PHP_VERSION: "8.2"
-    DATABASE_ENGINE_VERSION: "$CI_REGISTRY/postgres-12-alpine"
+    DATABASE_ENGINE_VERSION: "${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/postgres:12-alpine"
   extends:
     - .test-template-parallel-scheduled
 
 php8.2-postgres13:
   variables:
     PHP_VERSION: "8.2"
-    DATABASE_ENGINE_VERSION: "$CI_REGISTRY/postgres-13-alpine"
+    DATABASE_ENGINE_VERSION: "${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/postgres:13-alpine"
   extends:
     - .test-template-parallel-scheduled
 
 php8.2-postgres14:
   variables:
     PHP_VERSION: "8.2"
-    DATABASE_ENGINE_VERSION: "$CI_REGISTRY/postgres-14-alpine"
+    DATABASE_ENGINE_VERSION: "${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/postgres:14-alpine"
   extends:
     - .test-template-parallel-scheduled
 
@@ -37,22 +37,22 @@ php8.2-postgres14:
 php8.2-mariadb10.3:
   variables:
     PHP_VERSION: "8.2"
-    DATABASE_ENGINE_VERSION: "$CI_REGISTRY/mariadb-10.3"
+    DATABASE_ENGINE_VERSION: "${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/mariadb:10.3"
   extends:
     - .test-template-parallel-scheduled
 
 php8.2-mariadb10.5:
   variables:
     PHP_VERSION: "8.2"
-    DATABASE_ENGINE_VERSION: "$CI_REGISTRY/mariadb-10.5"
+    DATABASE_ENGINE_VERSION: "${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/mariadb:10.5"
   extends:
     - .test-template-parallel-scheduled
 
 # Initial support
 php8.2-mariadb10.6:
   variables:
     PHP_VERSION: "8.2"
-    DATABASE_ENGINE_VERSION: "$CI_REGISTRY/mariadb-10.6"
+    DATABASE_ENGINE_VERSION: "${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/mariadb:10.6"
   extends:
     - .test-template-parallel
 
@@ -63,14 +63,14 @@ php8.2-mariadb10.6:
 php8.2-mysql5.7:
   variables:
     PHP_VERSION: "8.2"
-    DATABASE_ENGINE_VERSION: "$CI_REGISTRY/mysql-5.7"
+    DATABASE_ENGINE_VERSION: "${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/mysql:5.7"
   extends:
     - .test-template-parallel-scheduled
 
 # Initial support
 php8.2-mysql8:
   variables:
     PHP_VERSION: "8.2"
-    DATABASE_ENGINE_VERSION: "$CI_REGISTRY/mysql-8.0"
+    DATABASE_ENGINE_VERSION: "${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/mysql:8.0"
   extends:
     - .test-template-parallel
diff --git a/.gitlab-ci/jobs/php_unit_tests/runner.yml b/.gitlab-ci/jobs/php_unit_tests/runner.yml
@@ -16,7 +16,8 @@
     KUBERNETES_SERVICE_CPU_REQUEST: 1
     KUBERNETES_SERVICE_MEMORY_REQUEST: 3Gi
   services:
-    - $CI_REGISTRY/dind:latest
+    - name: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/docker:26.0.0-dind
+      alias: docker
   allow_failure: true
   script:
     - apt-get update
@@ -39,7 +40,7 @@
   image: $CI_REGISTRY_IMAGE_TEST:8.1
   timeout: 10m
   variables:
-    DOCKER_HOST: tcp://localhost:2376/
+    DOCKER_HOST: tcp://docker:2376/
     DOCKER_TLS_CERTDIR: "/certs"
     DOCKER_TLS_VERIFY: 1
     DOCKER_CERT_PATH: "$DOCKER_TLS_CERTDIR/client"
@@ -54,7 +55,8 @@
 
     COMPOSER_ALLOW_SUPERUSER: 1
   services:
-    - $CI_REGISTRY_USER/dind:latest
+    - name: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/docker:26.0.0-dind
+      alias: docker
   script:
     - apt-get update
     - apt-get install -y ca-certificates curl gnupg lsb-release
@@ -75,6 +77,6 @@
     - when: manual
 
 include:
-  - local: '/.gitlab-ci/jobs/php_unit_tests/php_74.yml'
-  - local: '/.gitlab-ci/jobs/php_unit_tests/php_81.yml'
-  - local: '/.gitlab-ci/jobs/php_unit_tests/php_82.yml'
+  - local: "/.gitlab-ci/jobs/php_unit_tests/php_74.yml"
+  - local: "/.gitlab-ci/jobs/php_unit_tests/php_81.yml"
+  - local: "/.gitlab-ci/jobs/php_unit_tests/php_82.yml"
diff --git a/.gitlab-ci/jobs/style_check.yml b/.gitlab-ci/jobs/style_check.yml
@@ -25,7 +25,7 @@ static-analysis:
 
 static-analysis-js:
   stage: unit-test
-  image: node:18
+  image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/node:18
   script:
     - npm ci
     - npm run lint