Merge branch 'trunk'

chore: update dependencies for improved stability

See merge request ldc-web/projets/showroom/showroom-bo!18

Dockerfile

@@ -1,5 +1,9 @@
+ARG PHP_8_5_TAG=latest
+
 FROM composer:2.8 AS vendor
 
+WORKDIR /app
+
 ARG GITLAB_USER
 ARG GITLAB_PASSWORD
 
@@ -8,7 +12,7 @@ COPY database/ database/
 COPY composer.json composer.json
 COPY composer.lock composer.lock
 
-RUN composer config gitlab-token.lab.s-web.fr ${GITLAB_USER} ${GITLAB_PASSWORD}
+RUN composer config gitlab-token.lab.s-web.fr "${GITLAB_USER}" "${GITLAB_PASSWORD}"
 RUN composer install \
     --ignore-platform-reqs \
     --no-interaction \
@@ -30,7 +34,8 @@ RUN npm config set @ldc-web:registry https://lab.s-web.fr/api/v4/packages/npm/
 RUN npm config set -- '//lab.s-web.fr/api/v4/packages/npm/:_authToken' "${GITLAB_PASSWORD}"
 RUN npm ci && npm run prod
 
-FROM registry.s-web.fr/ldc-web/projets/ldc-web-images-docker/ldcweb-production-8.3:170625-101047
+ARG PHP_8_5_TAG
+FROM registry.s-web.fr/ldc-web/projets/ldc-web-images-docker/uwil-production-8.5:${PHP_8_5_TAG}
 
 ARG USER=www-data
 

RGPD.md

@@ -0,0 +1,13 @@
+# RGPD
+
+## Site
+
+### En base de données
+
+| Table | Colonne | Contenu | Utilisation |
+| ----- | ------- | ------- | ----------- |
+| activity_logs | user_id | Identifiant de l'utilisateur (back) | Tracer les modifications dans le BO |
+| --- | --- | --- | --- |
+| users | first_name | Prénom | Affichage à différents endroits du BO |
+| users | last_name | Nom | Affichage à différents endroits du BO |
+| users | email | Adresse mail | Identifiant, sert à la connexion au BO |

composer.json

@@ -12,7 +12,7 @@
     ],
     "license": "MIT",
     "require": {
-        "php": "^8.3",
+        "php": "^8.5",
         "24slides/laravel-saml2": "^2.4",
         "carsdotcom/laravel-json-schema": "^2.3",
         "diglactic/laravel-breadcrumbs": "^10.0",
@@ -52,6 +52,7 @@
     },
     "repositories": [
         {
+            "name": "lab.s-web.fr",
             "type": "composer",
             "url": "https://lab.s-web.fr/api/v4/group/23/-/packages/composer/packages.json"
         }
@@ -90,6 +91,9 @@
             "php-http/discovery": true,
             "dealerdirect/phpcodesniffer-composer-installer": true
         },
+        "audit": {
+            "block-insecure": false
+        },
         "gitlab-domains": [
             "lab.s-web.fr"
         ]

manifest.yaml

@@ -9,8 +9,8 @@ data:
   APP_DEBUG: "${APP_APP_DEBUG}"
   APP_URL: "https://${APP_DOMAIN}"
   LOG_CHANNEL: "k8s"
-  DB_HOST: "${APP_DB_HOST}"
-  DB_PORT: "${APP_DB_PORT}"
+  DB_HOST: "${APP_GLOBAL_OVH_MYSQL_HOST}"
+  DB_PORT: "${APP_GLOBAL_OVH_MYSQL_PORT}"
   DB_DATABASE: "${APP_DB_DATABASE}"
   DB_USERNAME: "${APP_DB_USERNAME}"
   DB_PASSWORD: "${APP_DB_PASSWORD}"
@@ -107,9 +107,9 @@ spec:
       imagePullSecrets:
         - name: docker-registry-credentials
       securityContext:
-        runAsUser: 33
-        runAsGroup: 33
-        fsGroup: 33
+        runAsUser: 82
+        runAsGroup: 82
+        fsGroup: 82
         fsGroupChangePolicy: "OnRootMismatch"
       volumes:
         - name: storage
@@ -190,8 +190,8 @@ spec:
               persistentVolumeClaim:
                 claimName: ${CI_PROJECT_PATH_SLUG}-pvc-storage
           securityContext:
-            runAsUser: 33
-            runAsGroup: 33
-            fsGroup: 33
+            runAsUser: 82
+            runAsGroup: 82
+            fsGroup: 82
             fsGroupChangePolicy: "OnRootMismatch"
           restartPolicy: OnFailure