From faeb801d8f1dfe87bc36ce128afced412a7e7ea1 Mon Sep 17 00:00:00 2001
From: cmsassot <cmsassot@cadoles.com>
Date: Mon, 25 Mar 2024 13:49:21 +0100
Subject: [PATCH] feat(hydra-dispatcher): add Caddy deployment, non root user

---
 .../hydra-dispatcher-deployment.yaml          | 41 +++++++++++++------
 1 file changed, 28 insertions(+), 13 deletions(-)

diff --git a/resources/hydra-dispatcher/resources/hydra-dispatcher-deployment.yaml b/resources/hydra-dispatcher/resources/hydra-dispatcher-deployment.yaml
index fc314ad..7ad1fc7 100644
--- a/resources/hydra-dispatcher/resources/hydra-dispatcher-deployment.yaml
+++ b/resources/hydra-dispatcher/resources/hydra-dispatcher-deployment.yaml
@@ -18,7 +18,7 @@ spec:
     spec:
       containers:
       - name: hydra-dispatcher-php-fpm
-        image: reg.cadoles.com/cadoles/hydra-dispatcher-base:2023.12.15-develop.903.b675347
+        image: reg.cadoles.com/cmsassot/hydra-dispatcher-test:latest
         args: ["/usr/sbin/php-fpm81", "-F", "-e"]
         readinessProbe:
           exec:
@@ -48,11 +48,22 @@ spec:
         - mountPath: /app/config/hydra
           name: hydra-dispatcher-apps
         resources: {}
-
-      - image: reg.cadoles.com/cadoles/hydra-dispatcher-base:2023.12.15-develop.903.b675347
+        securityContext:
+          runAsNonRoot: true
+          runAsGroup: 1000
+          runAsUser: 1000
+      - image: reg.cadoles.com/cmsassot/hydra-dispatcher-test:latest
         imagePullPolicy: Always
         name: hydra-dispatcher-nginx
-        args: ["/usr/sbin/nginx"]
+        args:
+          [
+            "/usr/sbin/caddy",
+            "run",
+            "--adapter",
+            "caddyfile",
+            "--config",
+            "/etc/caddy/Caddyfile",
+          ]
         readinessProbe:
           httpGet:
             path: /health
@@ -71,19 +82,23 @@ spec:
         - configMapRef:
             name: hydra-dispatcher-env
         env:
-        - name: NGINX_APP_UPSTREAM_BACKEND_SERVER
+        - name: CADDY_APP_UPSTREAM_BACKEND_SERVER
           value: 127.0.0.1:9000
-        - name: NGINX_APP_ROOT
-          value: "/public/"
-        - name: NGINX_APP_PHP_INDEX
-          value: "/index.php"
-        - name: NGINX_ERROR_LOG_LEVEL
-          value: "warn"
-        - name: NGINX_APP_PHP_NON_FILE_PATTERN
-          value: "^/index\\.php(/|$)"
+        - name: CADDY_HTTPS_PORT
+          value: "8443"
+        - name: CADDY_HTTP_PORT
+          value: "8080"
+        - name: CADDY_DATA_FS
+          value: "/tmp/caddy"
+        - name: CADDY_APP_ROOT_PUBLIC
+          value: "/app/public/"
         ports:
         - containerPort: 8080
         resources: {}
+        securityContext:
+          runAsNonRoot: true
+          runAsGroup: 1000
+          runAsUser: 1000
       restartPolicy: Always
       volumes:
       - name: hydra-dispatcher-apps