Compare commits
2 Commits
4e7799c128
...
6e5787cee7
Author | SHA1 | Date |
---|---|---|
cmsassot | 6e5787cee7 | |
cmsassot | 9fbf48d264 |
|
@ -18,7 +18,7 @@ spec:
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
- name: hydra-oidc-php-fpm
|
- 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
|
imagePullPolicy: Always
|
||||||
args: ["/usr/sbin/php-fpm81", "-F", "-e"]
|
args: ["/usr/sbin/php-fpm81", "-F", "-e"]
|
||||||
readinessProbe:
|
readinessProbe:
|
||||||
|
@ -51,7 +51,7 @@ spec:
|
||||||
runAsGroup: 1000
|
runAsGroup: 1000
|
||||||
runAsUser: 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
|
imagePullPolicy: Always
|
||||||
name: hydra-oidc-nginx
|
name: hydra-oidc-nginx
|
||||||
args:
|
args:
|
||||||
|
|
|
@ -18,7 +18,7 @@ spec:
|
||||||
spec:
|
spec:
|
||||||
containers:
|
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:
|
||||||
|
@ -36,10 +36,6 @@ spec:
|
||||||
initialDelaySeconds: 10
|
initialDelaySeconds: 10
|
||||||
periodSeconds: 30
|
periodSeconds: 30
|
||||||
resources: {}
|
resources: {}
|
||||||
securityContext:
|
|
||||||
runAsNonRoot: true
|
|
||||||
runAsGroup: 1000
|
|
||||||
runAsUser: 1000
|
|
||||||
envFrom:
|
envFrom:
|
||||||
- configMapRef:
|
- configMapRef:
|
||||||
name: hydra-sql-env
|
name: hydra-sql-env
|
||||||
|
@ -58,17 +54,9 @@ spec:
|
||||||
subPath: "sql_login.yaml"
|
subPath: "sql_login.yaml"
|
||||||
|
|
||||||
- name: hydra-sql-nginx
|
- name: hydra-sql-nginx
|
||||||
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:
|
args: ["/usr/sbin/nginx"]
|
||||||
[
|
|
||||||
"/usr/sbin/caddy",
|
|
||||||
"run",
|
|
||||||
"--adapter",
|
|
||||||
"caddyfile",
|
|
||||||
"--config",
|
|
||||||
"/etc/caddy/Caddyfile",
|
|
||||||
]
|
|
||||||
readinessProbe:
|
readinessProbe:
|
||||||
httpGet:
|
httpGet:
|
||||||
path: /health
|
path: /health
|
||||||
|
@ -87,21 +75,17 @@ spec:
|
||||||
- configMapRef:
|
- configMapRef:
|
||||||
name: hydra-sql-env
|
name: hydra-sql-env
|
||||||
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: {}
|
resources: {}
|
||||||
securityContext:
|
|
||||||
runAsNonRoot: true
|
|
||||||
runAsGroup: 1000
|
|
||||||
runAsUser: 1000
|
|
||||||
ports:
|
ports:
|
||||||
- containerPort: 8080
|
- containerPort: 8080
|
||||||
volumeMounts:
|
volumeMounts:
|
||||||
|
|
|
@ -18,7 +18,7 @@ spec:
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
- name: hydra-dispatcher-php-fpm
|
- 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"]
|
args: ["/usr/sbin/php-fpm81", "-F", "-e"]
|
||||||
readinessProbe:
|
readinessProbe:
|
||||||
exec:
|
exec:
|
||||||
|
@ -52,7 +52,7 @@ spec:
|
||||||
runAsNonRoot: true
|
runAsNonRoot: true
|
||||||
runAsGroup: 1000
|
runAsGroup: 1000
|
||||||
runAsUser: 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
|
imagePullPolicy: Always
|
||||||
name: hydra-dispatcher-nginx
|
name: hydra-dispatcher-nginx
|
||||||
args:
|
args:
|
||||||
|
|
Loading…
Reference in New Issue