Merge branch 'trunk'

Dockerfile

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

manifest.yaml

@@ -10,7 +10,7 @@ data:
   APP_DEBUG: "${APP_APP_DEBUG}"
   APP_URL: "https://${REDIRECT}${APP_DOMAIN}"
   LOG_CHANNEL: "k8s"
-  DB_HOST: "mariadb.common-services"
+  DB_HOST: "${APP_DB_HOST}"
   DB_DATABASE: "${APP_DB_DATABASE}"
   DB_USERNAME: "${APP_DB_USERNAME}"
   DB_PASSWORD: "${APP_DB_PASSWORD}"
@@ -74,6 +74,13 @@ spec:
           envFrom:
             - configMapRef:
                 name: ${CI_PROJECT_PATH_SLUG}-config-map
+          resources:
+            limits:
+              cpu: "${APP_CI_CPU_LIMIT}"
+              memory: "${APP_CI_MEMORY_LIMIT}"
+            requests:
+              cpu: "${APP_CI_CPU_REQUEST}"
+              memory: "${APP_CI_MEMORY_REQUEST}"
           volumeMounts:
             - name: storage
               mountPath: /app/srcs/storage
@@ -99,7 +106,7 @@ spec:
     app: ${CI_PROJECT_PATH_SLUG}-app
   ports:
     - port: 80
-      targetPort: 443
+      targetPort: 80
 
 ---
 apiVersion: traefik.io/v1alpha1
@@ -128,6 +135,8 @@ metadata:
   name: ${CI_PROJECT_PATH_SLUG}-cronjob
 spec:
   schedule: "* * * * *"
+  successfulJobsHistoryLimit: 1
+  failedJobsHistoryLimit: 1
   concurrencyPolicy: Forbid
   jobTemplate:
     spec:

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}