diff --git a/Dockerfile b/Dockerfile index 303e014..a056fdb 100644 --- a/Dockerfile +++ b/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 diff --git a/manifest.yaml b/manifest.yaml index 3087509..d8de7d3 100644 --- a/manifest.yaml +++ b/manifest.yaml @@ -95,7 +95,7 @@ spec: app: ${CI_PROJECT_PATH_SLUG}-app ports: - port: 80 - targetPort: 443 + targetPort: 80 --- apiVersion: traefik.io/v1alpha1 diff --git a/resources/assets/images/Volaille-francaise.png b/resources/assets/images/Volaille-francaise.png deleted file mode 100644 index 4efaed2..0000000 Binary files a/resources/assets/images/Volaille-francaise.png and /dev/null differ diff --git a/resources/views/fo/layouts/footer.blade.php b/resources/views/fo/layouts/footer.blade.php index 4db6c2d..0d38e8e 100644 --- a/resources/views/fo/layouts/footer.blade.php +++ b/resources/views/fo/layouts/footer.blade.php @@ -75,10 +75,6 @@ Logo de la certification Critères qualité certifiés -
  • - Logo de la certification Volailles françaises -
  • Logo de la certification Saveurs en Or diff --git a/routes/web-bo.php b/routes/web-bo.php index 134734d..6b7a486 100644 --- a/routes/web-bo.php +++ b/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'); diff --git a/staging-resources.yaml b/staging-resources.yaml new file mode 100644 index 0000000..a1cd413 --- /dev/null +++ b/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}