Merge branch 'trunk'

Dockerfile

@@ -1,4 +1,4 @@
-FROM registry.s-web.fr/ldc-web/projets/ldc-web-images-docker/ldcweb-production-8.3:latest
+FROM registry.s-web.fr/ldc-web/projets/ldc-web-images-docker/ldcweb-production-8.3:170625-101047
 COPY --chown=www-data:www-data . /app/srcs
 USER root
 RUN chmod -R 755 /app/srcs/storage

manifest.yaml

@@ -95,7 +95,7 @@ spec:
     app: ${CI_PROJECT_PATH_SLUG}-app
   ports:
     - port: 80
-      targetPort: 443
+      targetPort: 80
 
 ---
 apiVersion: traefik.io/v1alpha1

resources/views/fo/layouts/footer.blade.php

@@ -75,10 +75,6 @@
                         <img src="{{ Vite::asset('resources/assets/images/Criteres-qualite.png') }}"
                             alt="Logo de la certification Critères qualité certifiés">
                     </li>
-                    <li class="certification-item mx-1">
-                        <img src="{{ Vite::asset('resources/assets/images/Volaille-francaise.png') }}"
-                            alt="Logo de la certification Volailles françaises">
-                    </li>
                     <li class="certification-item mx-1">
                         <img src="{{ Vite::asset('resources/assets/images/Saveur-en-or.png') }}"
                             alt="Logo de la certification Saveurs en Or">

routes/web-bo.php

@@ -37,7 +37,10 @@ Route::prefix('bo')->name('bo.')->middleware(['admin-secure', 'throttle:credenti
             ->name('ranges.change-published');
 
         // * PRODUCTS
-        Route::resource('products', ProductController::class)->except(['show']);
+        Route::resource('products', ProductController::class)
+            ->except(['show'])
+            ->withoutMiddleware('htmlsanitize')
+            ->middleware('htmlsanitize:description,preparation,ingredients');
         Route::post('/products/{product}/change-published', [ProductController::class, 'changePublished'])
             ->name('products.change-published');
 

staging-resources.yaml

@@ -0,0 +1,20 @@
+---
+apiVersion: traefik.io/v1alpha1
+kind: IngressRoute
+metadata:
+  name: ${CI_PROJECT_PATH_SLUG}-ingress-route
+spec:
+  entryPoints:
+  - web
+  - websecure
+  routes:
+  - match: Host(`${APP_DOMAIN}`)
+    kind: Rule
+    services:
+    - name: ${CI_PROJECT_PATH_SLUG}-service
+      port: 80
+    middlewares:
+    - name: admin-ldc-whitelist
+      namespace: common-services
+  tls:
+    secretName: ${CRT_TLS_NAME}