Compare commits

..

6 Commits

7 changed files with 27 additions and 51 deletions

View File

@ -19,7 +19,7 @@ spec:
containers:
- name: hydra-oidc-php-fpm
image: reg.cadoles.com/cadoles/hydra-oidc-base:2024.4.2-develop.1349.c4711f6
imagePullPolicy: Always
imagePullPolicy: IfNotPresent
args: ["/usr/sbin/php-fpm81", "-F", "-e"]
readinessProbe:
exec:
@ -53,7 +53,7 @@ spec:
- name: hydra-oidc-caddy
image: reg.cadoles.com/cadoles/hydra-oidc-base:2024.4.2-develop.1349.c4711f6
imagePullPolicy: Always
imagePullPolicy: IfNotPresent
args:
[
"/usr/sbin/caddy",

View File

@ -1,8 +0,0 @@
# Prevent execution timeout due to the large amount of data to process during profling sessions
max_execution_time=300
# Extension
zend_extension=xdebug.so
# Xdebug configuration
xdebug.mode=${XDEBUG_MODE}
xdebug.client_host=${XDEBUG_CLIENT_HOST}
xdebug.start_with_request=${XDEBUG_START_WITH_REQUEST}

View File

@ -24,16 +24,9 @@ configMapGenerator:
- DB_PASSWORD="makeMeASecret"
- REDIS_DSN="redis://redis:6379"
- PEPPER="MakeMeABigSecret"
- OPCACHE_VALIDATE_TIMESTAMP="0"
- OPCACHE_REVALIDATE_FREQ="0"
- XDEBUG_MODE=off
- name: sql-login-config
files:
- ./files/sql_login.yaml
- name: hydra-sql-php-ini
files:
- ./files/03_base.ini
- name: xdebug-sql-config
behavior: create
files:
- ./files/50_xdebug.ini

View File

@ -21,8 +21,8 @@ spec:
spec:
containers:
- name: hydra-sql-fpm
image: reg.cadoles.com/cadoles/hydra-sql-base:2024.10.10-develop.1026.8e56433
imagePullPolicy: Always
image: reg.cadoles.com/cadoles/hydra-sql-base:2024.11.6-develop.1113.075be9b
imagePullPolicy: IfNotPresent
args: ["/usr/sbin/php-fpm81", "-F", "-e"]
readinessProbe:
exec:
@ -55,6 +55,10 @@ spec:
value: 128m
- name: PHP_FPM_LOG_LEVEL
value: warning
- name: OPCACHE_VALIDATE_TIMESTAMP
value: "0"
- name: OPCACHE_REVALIDATE_FREQ
value: "0"
volumeMounts:
- name: sql-login-config
mountPath: "/app/config/sql_login_configuration/sql_login.yaml"
@ -62,12 +66,10 @@ spec:
- name: hydra-sql-php-ini
mountPath: /etc/php81/conf.d/03_base.ini
subPath: 03_base.ini
- name: xdebug-sql-config
mountPath: /etc/php81/conf.d/50_xdebug.ini
subPath: 50_xdebug.ini
- name: hydra-sql-caddy
image: reg.cadoles.com/cadoles/hydra-sql-base:2024.10.10-develop.1026.8e56433
imagePullPolicy: Always
image: reg.cadoles.com/cadoles/hydra-sql-base:2024.11.6-develop.1113.075be9b
imagePullPolicy: IfNotPresent
args: ["/usr/sbin/caddy", "run", "--adapter", "caddyfile", "--config", "/etc/caddy/Caddyfile"]
readinessProbe:
httpGet:
@ -116,7 +118,5 @@ spec:
- name: hydra-sql-php-ini
configMap:
name: hydra-sql-php-ini
- name: xdebug-sql-config
configMap:
name: xdebug-sql-config
restartPolicy: Always

View File

@ -1,8 +0,0 @@
# Prevent execution timeout due to the large amount of data to process during profling sessions
max_execution_time=300
# Extension
zend_extension=xdebug.so
# Xdebug configuration
xdebug.mode=${XDEBUG_MODE}
xdebug.client_host=${XDEBUG_CLIENT_HOST}
xdebug.start_with_request=${XDEBUG_START_WITH_REQUEST}

View File

@ -26,16 +26,9 @@ configMapGenerator:
- DEFAULT_LOCALE=fr
- APP_LOCALES=fr,en
- REDIS_DSN="redis://redis:6379"
- OPCACHE_VALIDATE_TIMESTAMP="0"
- OPCACHE_REVALIDATE_FREQ="0"
- XDEBUG_MODE=off
- name: hydra-dispatcher-apps
files:
- apps.yaml=./files/hydra/default.yaml
- name: hydra-dispatcher-php-ini
files:
- ./files/03_base.ini
- name: xdebug-dispatcher-config
behavior: create
files:
- ./files/50_xdebug.ini
- ./files/03_base.ini

View File

@ -41,6 +41,10 @@ spec:
value: 128m
- name: PHP_FPM_MEMORY_LIMIT
value: 128m
- name: OPCACHE_VALIDATE_TIMESTAMP
value: "0"
- name: OPCACHE_REVALIDATE_FREQ
value: "0"
envFrom:
- configMapRef:
name: hydra-dispatcher-env
@ -50,9 +54,6 @@ spec:
- name: hydra-dispatcher-php-ini
mountPath: /etc/php81/conf.d/03_base.ini
subPath: 03_base.ini
- name: xdebug-dispatcher-config
mountPath: /etc/php81/conf.d/50_xdebug.ini
subPath: 50_xdebug.ini
resources: {}
securityContext:
runAsNonRoot: true
@ -60,8 +61,16 @@ spec:
runAsUser: 1000
- name: hydra-dispatcher-caddy
image: reg.cadoles.com/cadoles/hydra-dispatcher-base:2024.9.24-develop.1122.f88a5eb
imagePullPolicy: Always
args: ["/usr/sbin/caddy", "run", "--adapter", "caddyfile", "--config", "/etc/caddy/Caddyfile"]
imagePullPolicy: IfNotPresent
args:
[
"/usr/sbin/caddy",
"run",
"--adapter",
"caddyfile",
"--config",
"/etc/caddy/Caddyfile",
]
readinessProbe:
httpGet:
path: /health
@ -106,6 +115,3 @@ spec:
- name: hydra-dispatcher-php-ini
configMap:
name: hydra-dispatcher-php-ini
- name: xdebug-dispatcher-config
configMap:
name: xdebug-dispatcher-config