feat(hydra-oidc): non root deployment with caddy

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:TODO_TAG
+          image: reg.cadoles.com/cadoles/hydra-oidc-base:2024.4.2-develop.1349.c4711f6
           imagePullPolicy: Always
           args: ["/usr/sbin/php-fpm81", "-F", "-e"]
           readinessProbe:
@@ -51,7 +51,7 @@ spec:
             runAsGroup: 1000
             runAsUser: 1000
 
-        - image: reg.cadoles.com/cadoles/hydra-oidc:TODO_TAG
+        - image: reg.cadoles.com/cadoles/hydra-oidc-base:2024.4.2-develop.1349.c4711f6
           imagePullPolicy: Always
           name: hydra-oidc-nginx
           args:

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

@@ -17,100 +17,84 @@ spec:
         app.kubernetes.io/name: hydra-sql
     spec:
       containers:
-        - name: hydra-sql-fpm
+      - name: hydra-sql-fpm
-          image: reg.cadoles.com/cadoles/hydra-sql:TODO_TAG
+        image: reg.cadoles.com/cadoles/hydra-sql-base:2023.12.14-develop.1107.740a756
-          imagePullPolicy: Always
+        imagePullPolicy: Always
-          args: ["/usr/sbin/php-fpm81", "-F", "-e"]
+        args: ["/usr/sbin/php-fpm81", "-F", "-e"]
-          readinessProbe:
+        readinessProbe:
-            exec:
+          exec:
-              command:
+            command:
-                - sh
+            - sh
-                - -c
+            - -c
-                - test -f /etc/php81/php-fpm.d/www.conf
+            - test -f /etc/php81/php-fpm.d/www.conf
-          livenessProbe:
+        livenessProbe:
-            exec:
+          exec:
-              command:
+            command:
-                - php
+            - php
-                - bin/console
+            - bin/console
-                - -V
+            - -V
-            initialDelaySeconds: 10
+          initialDelaySeconds: 10
-            periodSeconds: 30
+          periodSeconds: 30
-          resources: {}
+        resources: {}
-          securityContext:
+        envFrom:
-            runAsNonRoot: true
+        - configMapRef:
-            runAsGroup: 1000
+            name: hydra-sql-env
-            runAsUser: 1000
+        env:
-          envFrom:
+        - name: PHP_FPM_LISTEN
-            - configMapRef:
+          value: 127.0.0.1:9000
-                name: hydra-sql-env
+        - name: PHP_MEMORY_LIMIT
-          env:
+          value: 128m
-            - name: PHP_FPM_LISTEN
+        - name: PHP_FPM_MEMORY_LIMIT
-              value: 127.0.0.1:9000
+          value: 128m
-            - name: PHP_MEMORY_LIMIT
+        - name: PHP_FPM_LOG_LEVEL
-              value: 128m
+          value: warning
-            - name: PHP_FPM_MEMORY_LIMIT
+        volumeMounts:
-              value: 128m
-            - name: PHP_FPM_LOG_LEVEL
-              value: warning
-          volumeMounts:
-            - name: sql-login-config
-              mountPath: "/app/config/sql_login_configuration/sql_login.yaml"
-              subPath: "sql_login.yaml"
-
-        - name: hydra-sql-nginx
-          image: reg.cadoles.com/cadoles/hydra-sql:TODO_TAG
-          imagePullPolicy: Always
-          args:
-            [
-              "/usr/sbin/caddy",
-              "run",
-              "--adapter",
-              "caddyfile",
-              "--config",
-              "/etc/caddy/Caddyfile",
-            ]
-          readinessProbe:
-            httpGet:
-              path: /health
-              port: 8080
-            initialDelaySeconds: 5
-            timeoutSeconds: 5
-            periodSeconds: 10
-          livenessProbe:
-            httpGet:
-              path: /health
-              port: 8080
-            initialDelaySeconds: 15
-            timeoutSeconds: 5
-            periodSeconds: 15
-          envFrom:
-            - configMapRef:
-                name: hydra-sql-env
-          env:
-            - name: CADDY_APP_UPSTREAM_BACKEND_SERVER
-              value: 127.0.0.1:9000
-            - 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/"
-          resources: {}
-          securityContext:
-            runAsNonRoot: true
-            runAsGroup: 1000
-            runAsUser: 1000
-          ports:
-            - containerPort: 8080
-          volumeMounts:
-            - name: sql-login-config
-              mountPath: "/app/config/sql_login_configuration/sql_login.yaml"
-              subPath: "sql_login.yaml"
-      volumes:
         - name: sql-login-config
-          configMap:
+          mountPath: "/app/config/sql_login_configuration/sql_login.yaml"
-            name: sql-login-config
+          subPath: "sql_login.yaml"
+
+      - name: hydra-sql-nginx
+        image: reg.cadoles.com/cadoles/hydra-sql-base:2023.12.14-develop.1107.740a756
+        imagePullPolicy: Always
+        args: ["/usr/sbin/nginx"]
+        readinessProbe:
+          httpGet:
+            path: /health
+            port: 8080
+          initialDelaySeconds: 5
+          timeoutSeconds: 5
+          periodSeconds: 10
+        livenessProbe:
+          httpGet:
+            path: /health
+            port: 8080
+          initialDelaySeconds: 15
+          timeoutSeconds: 5
+          periodSeconds: 15
+        envFrom:
+        - configMapRef:
+            name: hydra-sql-env
+        env:
+        - name: NGINX_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(/|$)"
+        resources: {}
+        ports:
+        - containerPort: 8080
+        volumeMounts:
+        - name: sql-login-config
+          mountPath: "/app/config/sql_login_configuration/sql_login.yaml"
+          subPath: "sql_login.yaml"
+      volumes:
+      - name: sql-login-config
+        configMap:
+          name: sql-login-config
 
       restartPolicy: Always

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:TODO_TAG
+        image: reg.cadoles.com/cadoles/hydra-dispatcher-base:2024.4.2-develop.1411.74a9f16
         args: ["/usr/sbin/php-fpm81", "-F", "-e"]
         readinessProbe:
           exec:
@@ -52,7 +52,7 @@ spec:
           runAsNonRoot: true
           runAsGroup: 1000
           runAsUser: 1000
-      - image: reg.cadoles.com/cadoles/hydra-dispatcher:TODO_TAG
+      - image: reg.cadoles.com/cadoles/hydra-dispatcher-base:2024.4.2-develop.1411.74a9f16
         imagePullPolicy: Always
         name: hydra-dispatcher-nginx
         args: