test

components/hydra-oidc/resources/hydra-oidc-deployment.yaml

@@ -18,7 +18,7 @@ spec:
     spec:
       containers:
         - name: hydra-oidc-php-fpm
-        image: reg.cadoles.com/cadoles/hydra-oidc-base:2023.12.15-develop.1012.d57f2ad
+          image: reg.cadoles.com/cmsassot/hydra-oidc-test:latest
           imagePullPolicy: Always
           args: ["/usr/sbin/php-fpm81", "-F", "-e"]
           readinessProbe:
@@ -46,11 +46,23 @@ spec:
             - configMapRef:
                 name: hydra-oidc-env
           resources: {}
+          securityContext:
+            runAsNonRoot: true
+            runAsGroup: 1000
+            runAsUser: 1000
 
-      - image: reg.cadoles.com/cadoles/hydra-oidc-base:2023.12.15-develop.1012.d57f2ad
+        - image: reg.cadoles.com/cmsassot/hydra-oidc-test:latest
           imagePullPolicy: Always
           name: hydra-oidc-nginx
-        args: ["/usr/sbin/nginx"]
+          args:
+            [
+              "/usr/sbin/caddy",
+              "run",
+              "--adapter",
+              "caddyfile",
+              "--config",
+              "/etc/caddy/Caddyfile",
+            ]
           readinessProbe:
             httpGet:
               path: /healthy
@@ -65,22 +77,25 @@ spec:
             initialDelaySeconds: 15
             timeoutSeconds: 5
             periodSeconds: 15
+          ports:
+            - containerPort: 8080
           envFrom:
             - configMapRef:
                 name: hydra-oidc-env
           env:
-        - name: NGINX_APP_UPSTREAM_BACKEND_SERVER
+            - name: CADDY_APP_UPSTREAM_BACKEND_SERVER
               value: 127.0.0.1:9000
-        - name: NGINX_APP_ROOT
+            - name: CADDY_HTTPS_PORT
-          value: "/public/"
+              value: "8443"
-        - name: NGINX_APP_PHP_INDEX
+            - name: CADDY_HTTP_PORT
-          value: "/index.php"
+              value: "8080"
-        - name: NGINX_ERROR_LOG_LEVEL
+            - name: CADDY_DATA_FS
-          value: "warn"
+              value: "/tmp/caddy"
-        - name: NGINX_APP_PHP_NON_FILE_PATTERN
+            - name: CADDY_APP_ROOT_PUBLIC
-          value: "^/index\\.php(/|$)"
+              value: "/app/public/"
-        ports:
-        - containerPort: 8080
           resources: {}
+          securityContext:
+            runAsNonRoot: true
+            runAsGroup: 1000
+            runAsUser: 1000
       restartPolicy: Always
-

components/hydra-sql/resources/hydra-sql-deployment.yaml

@@ -18,7 +18,7 @@ spec:
     spec:
       containers:
         - name: hydra-sql-fpm
-        image: reg.cadoles.com/cadoles/hydra-sql-base:2023.12.14-develop.1107.740a756
+          image: reg.cadoles.com/cmsassot/hydra-sql-test:latest
           imagePullPolicy: Always
           args: ["/usr/sbin/php-fpm81", "-F", "-e"]
           readinessProbe:
@@ -36,6 +36,10 @@ spec:
             initialDelaySeconds: 10
             periodSeconds: 30
           resources: {}
+          securityContext:
+            runAsNonRoot: true
+            runAsGroup: 1000
+            runAsUser: 1000
           envFrom:
             - configMapRef:
                 name: hydra-sql-env
@@ -54,9 +58,17 @@ spec:
               subPath: "sql_login.yaml"
 
         - name: hydra-sql-nginx
-        image: reg.cadoles.com/cadoles/hydra-sql-base:2023.12.14-develop.1107.740a756
+          image: reg.cadoles.com/cmsassot/hydra-sql-test:latest
           imagePullPolicy: Always
-        args: ["/usr/sbin/nginx"]
+          args:
+            [
+              "/usr/sbin/caddy",
+              "run",
+              "--adapter",
+              "caddyfile",
+              "--config",
+              "/etc/caddy/Caddyfile",
+            ]
           readinessProbe:
             httpGet:
               path: /health
@@ -75,17 +87,21 @@ spec:
             - configMapRef:
                 name: hydra-sql-env
           env:
-        - name: NGINX_APP_UPSTREAM_BACKEND_SERVER
+            - name: CADDY_APP_UPSTREAM_BACKEND_SERVER
               value: 127.0.0.1:9000
-        - name: NGINX_APP_ROOT
+            - name: CADDY_HTTPS_PORT
-          value: "/public"
+              value: "8443"
-        - name: NGINX_APP_PHP_INDEX
+            - name: CADDY_HTTP_PORT
-          value: "/index.php"
+              value: "8080"
-        - name: NGINX_ERROR_LOG_LEVEL
+            - name: CADDY_DATA_FS
-          value: "warn"
+              value: "/tmp/caddy"
-        - name: NGINX_APP_PHP_NON_FILE_PATTERN
+            - name: CADDY_APP_ROOT_PUBLIC
-          value: "^/index\\.php(/|$)"
+              value: "/app/public/"
           resources: {}
+          securityContext:
+            runAsNonRoot: true
+            runAsGroup: 1000
+            runAsUser: 1000
           ports:
             - containerPort: 8080
           volumeMounts:

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,22 +48,33 @@ spec:
         - mountPath: /app/config/hydra
           name: hydra-dispatcher-apps
         resources: {}
-
+        securityContext:
-      - image: reg.cadoles.com/cadoles/hydra-dispatcher-base:2023.12.15-develop.903.b675347
+          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
-            port: 8080
+            port: 80
           initialDelaySeconds: 5
           timeoutSeconds: 5
           periodSeconds: 10
         livenessProbe:
           httpGet:
             path: /health
-            port: 8080
+            port: 80
           initialDelaySeconds: 15
           timeoutSeconds: 5
           periodSeconds: 15
@@ -71,21 +82,37 @@ 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
+        - name: CADDY_HTTPS_PORT
-          value: "/public/"
+          value: "8443"
-        - name: NGINX_APP_PHP_INDEX
+        - name: CADDY_HTTP_PORT
-          value: "/index.php"
+          value: "80"
-        - name: NGINX_ERROR_LOG_LEVEL
+        - name: CADDY_DATA_FS
-          value: "warn"
+          value: "/tmp/caddy"
-        - name: NGINX_APP_PHP_NON_FILE_PATTERN
+        - name: CADDY_APP_ROOT_PUBLIC
-          value: "^/index\\.php(/|$)"
+          value: "/app/public/"
         ports:
-        - containerPort: 8080
+        - containerPort: 80
         resources: {}
+        volumeMounts:
+          - name: caddy-data
+            mountPath: /tmp/caddy
+          - name: caddy-var
+            mountPath: /var/caddy
+        securityContext:
+          runAsNonRoot: true
+          runAsGroup: 1000
+          runAsUser: 1000
       restartPolicy: Always
       volumes:
       - name: hydra-dispatcher-apps
         configMap:
           name: hydra-dispatcher-apps
+      - name: caddy-data
+        emptyDir:
+          sizeLimit: 128Mi
+      - name: caddy-var
+        emptyDir:
+          sizeLimit: 256Mi
+

resources/hydra-dispatcher/resources/hydra-dispatcher-service.yaml

@@ -7,7 +7,7 @@ metadata:
 spec:
   ports:
     - name: http
-      port: 8080
+      port: 80
   selector:
     app.kubernetes.io/name: hydra-dispatcher
 status: