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

@@ -18,51 +18,39 @@ spec:
     spec:
       containers:
       - name: hydra-oidc-php-fpm
-        image: reg.cadoles.com/cadoles/hydra-oidc-base:2024.4.2-develop.1349.c4711f6
+        image: reg.cadoles.com/cadoles/hydra-oidc-base:2023.12.15-develop.1012.d57f2ad
         imagePullPolicy: Always
         args: ["/usr/sbin/php-fpm81", "-F", "-e"]
         readinessProbe:
           exec:
             command:
-              - sh
+            - sh
-              - -c
+            - -c
-              - test -f /etc/php81/php-fpm.d/www.conf
+            - test -f /etc/php81/php-fpm.d/www.conf
         livenessProbe:
           exec:
             command:
-              - php
+            - php
-              - bin/console
+            - bin/console
-              - -V
+            - -V
           initialDelaySeconds: 10
           periodSeconds: 30
         env:
-          - name: PHP_FPM_LISTEN
+        - name: PHP_FPM_LISTEN
-            value: 127.0.0.1:9000
+          value: 127.0.0.1:9000
-          - name: PHP_MEMORY_LIMIT
+        - name: PHP_MEMORY_LIMIT
-            value: 128m
+          value: 128m
-          - name: PHP_FPM_MEMORY_LIMIT
+        - name: PHP_FPM_MEMORY_LIMIT
-            value: 128m
+          value: 128m
         envFrom:
-          - configMapRef:
+        - configMapRef:
-              name: hydra-oidc-env
+            name: hydra-oidc-env
         resources: {}
-        securityContext:
-          runAsNonRoot: true
-          runAsGroup: 1000
-          runAsUser: 1000
 
-      - name: hydra-oidc-caddy
+      - image: reg.cadoles.com/cadoles/hydra-oidc-base:2023.12.15-develop.1012.d57f2ad
-        image: reg.cadoles.com/cadoles/hydra-oidc-base:2024.4.2-develop.1349.c4711f6
         imagePullPolicy: Always
-        args:
+        name: hydra-oidc-nginx
-          [
+        args: ["/usr/sbin/nginx"]
-            "/usr/sbin/caddy",
-            "run",
-            "--adapter",
-            "caddyfile",
-            "--config",
-            "/etc/caddy/Caddyfile",
-          ]
         readinessProbe:
           httpGet:
             path: /healthy
@@ -77,26 +65,22 @@ spec:
           initialDelaySeconds: 15
           timeoutSeconds: 5
           periodSeconds: 15
-        ports:
-          - containerPort: 8080
-            name: http
         envFrom:
-          - configMapRef:
+        - configMapRef:
-              name: hydra-oidc-env
+            name: hydra-oidc-env
         env:
-          - name: CADDY_APP_UPSTREAM_BACKEND_SERVER
+        - name: NGINX_APP_UPSTREAM_BACKEND_SERVER
-            value: 127.0.0.1:9000
+          value: 127.0.0.1:9000
-          - name: CADDY_HTTPS_PORT
+        - name: NGINX_APP_ROOT
-            value: "8443"
+          value: "/public/"
-          - name: CADDY_HTTP_PORT
+        - name: NGINX_APP_PHP_INDEX
-            value: "8080"
+          value: "/index.php"
-          - name: CADDY_DATA_FS
+        - name: NGINX_ERROR_LOG_LEVEL
-            value: "/tmp/caddy"
+          value: "warn"
-          - name: CADDY_APP_ROOT_PUBLIC
+        - name: NGINX_APP_PHP_NON_FILE_PATTERN
-            value: "/app/public/"
+          value: "^/index\\.php(/|$)"
+        ports:
+        - containerPort: 8080
         resources: {}
-        securityContext:
-          runAsNonRoot: true
-          runAsGroup: 1000
-          runAsUser: 1000
       restartPolicy: Always
+

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

@@ -6,9 +6,8 @@ metadata:
   name: hydra-oidc
 spec:
   ports:
-  - name: http
+  - name: hydra-oidc
-    port: 80
+    port: 8080
-    targetPort: http
   selector:
     app.kubernetes.io/name: hydra-oidc
 status:

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

@@ -18,57 +18,45 @@ spec:
     spec:
       containers:
       - name: hydra-sql-fpm
-        image: reg.cadoles.com/cadoles/hydra-sql-base:2024.4.2-develop.953.fc87b24
+        image: reg.cadoles.com/cadoles/hydra-sql-base:2023.12.14-develop.1107.740a756
         imagePullPolicy: Always
         args: ["/usr/sbin/php-fpm81", "-F", "-e"]
         readinessProbe:
           exec:
             command:
-              - sh
+            - sh
-              - -c
+            - -c
-              - test -f /etc/php81/php-fpm.d/www.conf
+            - test -f /etc/php81/php-fpm.d/www.conf
         livenessProbe:
           exec:
             command:
-              - php
+            - php
-              - bin/console
+            - bin/console
-              - -V
+            - -V
           initialDelaySeconds: 10
           periodSeconds: 30
         resources: {}
-        securityContext:
-          runAsNonRoot: true
-          runAsGroup: 1000
-          runAsUser: 1000
         envFrom:
-          - configMapRef:
+        - configMapRef:
-              name: hydra-sql-env
+            name: hydra-sql-env
         env:
-          - name: PHP_FPM_LISTEN
+        - name: PHP_FPM_LISTEN
-            value: 127.0.0.1:9000
+          value: 127.0.0.1:9000
-          - name: PHP_MEMORY_LIMIT
+        - name: PHP_MEMORY_LIMIT
-            value: 128m
+          value: 128m
-          - name: PHP_FPM_MEMORY_LIMIT
+        - name: PHP_FPM_MEMORY_LIMIT
-            value: 128m
+          value: 128m
-          - name: PHP_FPM_LOG_LEVEL
+        - name: PHP_FPM_LOG_LEVEL
-            value: warning
+          value: warning
         volumeMounts:
-          - name: sql-login-config
+        - name: sql-login-config
-            mountPath: "/app/config/sql_login_configuration/sql_login.yaml"
+          mountPath: "/app/config/sql_login_configuration/sql_login.yaml"
-            subPath: "sql_login.yaml"
+          subPath: "sql_login.yaml"
 
-      - name: hydra-sql-caddy
+      - name: hydra-sql-nginx
-        image: reg.cadoles.com/cadoles/hydra-sql-base:2024.4.2-develop.953.fc87b24
+        image: reg.cadoles.com/cadoles/hydra-sql-base:2023.12.14-develop.1107.740a756
         imagePullPolicy: Always
-        args:
+        args: ["/usr/sbin/nginx"]
-          [
-            "/usr/sbin/caddy",
-            "run",
-            "--adapter",
-            "caddyfile",
-            "--config",
-            "/etc/caddy/Caddyfile",
-          ]
         readinessProbe:
           httpGet:
             path: /health
@@ -84,34 +72,29 @@ spec:
           timeoutSeconds: 5
           periodSeconds: 15
         envFrom:
-          - configMapRef:
+        - configMapRef:
-              name: hydra-sql-env
+            name: hydra-sql-env
         env:
-          - name: CADDY_APP_UPSTREAM_BACKEND_SERVER
+        - name: NGINX_APP_UPSTREAM_BACKEND_SERVER
-            value: 127.0.0.1:9000
+          value: 127.0.0.1:9000
-          - name: CADDY_HTTPS_PORT
+        - name: NGINX_APP_ROOT
-            value: "8443"
+          value: "/public"
-          - name: CADDY_HTTP_PORT
+        - name: NGINX_APP_PHP_INDEX
-            value: "8080"
+          value: "/index.php"
-          - name: CADDY_DATA_FS
+        - name: NGINX_ERROR_LOG_LEVEL
-            value: "/tmp/caddy"
+          value: "warn"
-          - name: CADDY_APP_ROOT_PUBLIC
+        - name: NGINX_APP_PHP_NON_FILE_PATTERN
-            value: "/app/public/"
+          value: "^/index\\.php(/|$)"
         resources: {}
-        securityContext:
-          runAsNonRoot: true
-          runAsGroup: 1000
-          runAsUser: 1000
         ports:
-          - containerPort: 8080
+        - containerPort: 8080
-            name: http
         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"
+      volumes:
+      - name: sql-login-config
+        configMap:
+          name: sql-login-config
 
       restartPolicy: Always

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

@@ -6,9 +6,8 @@ metadata:
   name: hydra-sql
 spec:
   ports:
-  - name: http
+  - name: hydra-sql
-    port: 80
+    port: 8080
-    targetPort: http
   selector:
     app.kubernetes.io/name: hydra-sql
 status:

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:2024.4.2-develop.1411.74a9f16
+        image: reg.cadoles.com/cadoles/hydra-dispatcher-base:2023.12.15-develop.903.b675347
         args: ["/usr/sbin/php-fpm81", "-F", "-e"]
         readinessProbe:
           exec:
@@ -48,22 +48,11 @@ spec:
         - mountPath: /app/config/hydra
           name: hydra-dispatcher-apps
         resources: {}
-        securityContext:
+
-          runAsNonRoot: true
+      - image: reg.cadoles.com/cadoles/hydra-dispatcher-base:2023.12.15-develop.903.b675347
-          runAsGroup: 1000
-          runAsUser: 1000
-      - name: hydra-dispatcher-caddy
-        image: reg.cadoles.com/cadoles/hydra-dispatcher-base:2024.4.2-develop.1411.74a9f16
         imagePullPolicy: Always
-        args:
+        name: hydra-dispatcher-nginx
-          [
+        args: ["/usr/sbin/nginx"]
-            "/usr/sbin/caddy",
-            "run",
-            "--adapter",
-            "caddyfile",
-            "--config",
-            "/etc/caddy/Caddyfile",
-          ]
         readinessProbe:
           httpGet:
             path: /health
@@ -82,24 +71,19 @@ spec:
         - configMapRef:
             name: hydra-dispatcher-env
         env:
-        - name: CADDY_APP_UPSTREAM_BACKEND_SERVER
+        - name: NGINX_APP_UPSTREAM_BACKEND_SERVER
           value: 127.0.0.1:9000
-        - name: CADDY_HTTPS_PORT
+        - name: NGINX_APP_ROOT
-          value: "8443"
+          value: "/public/"
-        - name: CADDY_HTTP_PORT
+        - name: NGINX_APP_PHP_INDEX
-          value: "8080"
+          value: "/index.php"
-        - name: CADDY_DATA_FS
+        - name: NGINX_ERROR_LOG_LEVEL
-          value: "/tmp/caddy"
+          value: "warn"
-        - name: CADDY_APP_ROOT_PUBLIC
+        - name: NGINX_APP_PHP_NON_FILE_PATTERN
-          value: "/app/public/"
+          value: "^/index\\.php(/|$)"
         ports:
         - containerPort: 8080
-          name: http
         resources: {}
-        securityContext:
-          runAsNonRoot: true
-          runAsGroup: 1000
-          runAsUser: 1000
       restartPolicy: Always
       volumes:
       - name: hydra-dispatcher-apps

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

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