Merge branch 'trunk'

Hotfix

See merge request ldc-web/projets/jeusselin!31

Dockerfile

@@ -1,5 +1,9 @@
+ARG PHP_8_5_TAG=latest
+
 FROM composer:2.9.2 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 \
@@ -28,9 +32,10 @@ COPY resources/ /app/resources/
 WORKDIR /app
 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
+RUN npm ci --no-audit --no-fund --loglevel=error && npm run prod
 
-FROM registry.s-web.fr/ldc-web/projets/ldc-web-images-docker/uwil-production-8.4:170625-130159
+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
 

composer.json

@@ -8,7 +8,7 @@
     ],
     "license": "MIT",
     "require": {
-        "php": "^8.4",
+        "php": "^8.5",
         "24slides/laravel-saml2": "^2.4",
         "guzzlehttp/guzzle": "^7.5.0",
         "laravel/framework": "^12.0",
@@ -46,7 +46,9 @@
             "dealerdirect/phpcodesniffer-composer-installer": true,
             "php-http/discovery": true
         },
-        "gitlab-domains": ["lab.s-web.fr"]
+        "gitlab-domains": [
+            "lab.s-web.fr"
+        ]
     },
     "extra": {
         "laravel": {

manifest.yaml

@@ -10,7 +10,8 @@ data:
   APP_DEBUG: "${APP_APP_DEBUG}"
   APP_URL: "https://${APP_DOMAIN}"
   LOG_CHANNEL: "k8s"
-  DB_HOST: "${APP_DB_HOST}"
+  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}"
@@ -83,9 +84,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
@@ -171,8 +172,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

resources/views/fo/home.blade.php

@@ -100,7 +100,7 @@
                 <p class="edito-p">L’ensemble de l’équipe Jeusselin est à votre disposition pour répondre à vos besoins.</p><br>
             </div>
             <div class="edito__sign">
-                <p class="edito__sign-name edito-p edito__sign-p">Jérémy Parmentier</p>
+                <p class="edito__sign-name edito-p edito__sign-p">Gaël Le Conte</p>
                 <p class="edito-p edito__sign-p">Directeur Général</p>
             </div>
         </section>