Update master branch with latest devs from unstable branch #34
@ -24,15 +24,15 @@ spec:
|
||||
readinessProbe:
|
||||
exec:
|
||||
command:
|
||||
- sh
|
||||
- -c
|
||||
- test -f /etc/php81/php-fpm.d/www.conf
|
||||
- sh
|
||||
- -c
|
||||
- test -f /etc/php81/php-fpm.d/www.conf
|
||||
livenessProbe:
|
||||
exec:
|
||||
command:
|
||||
- php
|
||||
- bin/console
|
||||
- -V
|
||||
- php
|
||||
- bin/console
|
||||
- -V
|
||||
initialDelaySeconds: 10
|
||||
periodSeconds: 30
|
||||
resources: {}
|
||||
@ -41,34 +41,26 @@ spec:
|
||||
runAsGroup: 1000
|
||||
runAsUser: 1000
|
||||
envFrom:
|
||||
- configMapRef:
|
||||
name: hydra-sql-env
|
||||
- configMapRef:
|
||||
name: hydra-sql-env
|
||||
env:
|
||||
- name: PHP_FPM_LISTEN
|
||||
value: 127.0.0.1:9000
|
||||
- name: PHP_MEMORY_LIMIT
|
||||
value: 128m
|
||||
- name: PHP_FPM_MEMORY_LIMIT
|
||||
value: 128m
|
||||
- name: PHP_FPM_LOG_LEVEL
|
||||
value: warning
|
||||
- name: PHP_FPM_LISTEN
|
||||
value: 127.0.0.1:9000
|
||||
- name: PHP_MEMORY_LIMIT
|
||||
value: 128m
|
||||
- name: PHP_FPM_MEMORY_LIMIT
|
||||
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: sql-login-config
|
||||
mountPath: "/app/config/sql_login_configuration/sql_login.yaml"
|
||||
subPath: "sql_login.yaml"
|
||||
|
||||
- name: hydra-sql-caddy
|
||||
image: reg.cadoles.com/cadoles/hydra-sql-base:2024.4.2-develop.953.fc87b24
|
||||
imagePullPolicy: Always
|
||||
args:
|
||||
[
|
||||
"/usr/sbin/caddy",
|
||||
"run",
|
||||
"--adapter",
|
||||
"caddyfile",
|
||||
"--config",
|
||||
"/etc/caddy/Caddyfile",
|
||||
]
|
||||
args: ["/usr/sbin/caddy", "run", "--adapter", "caddyfile", "--config", "/etc/caddy/Caddyfile"]
|
||||
readinessProbe:
|
||||
httpGet:
|
||||
path: /health
|
||||
@ -84,34 +76,34 @@ spec:
|
||||
timeoutSeconds: 5
|
||||
periodSeconds: 15
|
||||
envFrom:
|
||||
- configMapRef:
|
||||
name: hydra-sql-env
|
||||
- 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/"
|
||||
- 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
|
||||
name: http
|
||||
- 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:
|
||||
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
|
||||
|
Loading…
Reference in New Issue
Block a user