diff options
| -rwxr-xr-x | setup.sh | 8 | ||||
| -rwxr-xr-x | srcs/nginx/src/entrypoint.sh | 4 | ||||
| -rwxr-xr-x | srcs/phpmyadmin/entrypoint.sh | 5 | ||||
| -rw-r--r-- | srcs/phpmyadmin/phpmyadmin.yaml | 8 | ||||
| -rwxr-xr-x | srcs/wordpress/entrypoint.sh | 5 | ||||
| -rw-r--r-- | srcs/wordpress/wordpress.yaml | 8 |
6 files changed, 20 insertions, 18 deletions
@@ -9,8 +9,8 @@ log () { if [ -z "$update_only" ] then - minikube delete minikube start --driver=virtualbox + minikube dashboard & eval $(minikube docker-env) @@ -55,9 +55,3 @@ create_service phpmyadmin create_service mysql create_service grafana create_service influxdb - -if [ -z "$update_only" ] -then - log "LAUCHING dashboard" - minikube dashboard -fi diff --git a/srcs/nginx/src/entrypoint.sh b/srcs/nginx/src/entrypoint.sh index 315f55a..00aca44 100755 --- a/srcs/nginx/src/entrypoint.sh +++ b/srcs/nginx/src/entrypoint.sh @@ -10,6 +10,4 @@ touch /run/openrc/softlevel /telegraf/usr/bin/telegraf & nginx -t || exit 1 -nginx -sleep infinity & -wait +nginx -g 'daemon off;' diff --git a/srcs/phpmyadmin/entrypoint.sh b/srcs/phpmyadmin/entrypoint.sh index c89e0d4..0e3b159 100755 --- a/srcs/phpmyadmin/entrypoint.sh +++ b/srcs/phpmyadmin/entrypoint.sh @@ -8,9 +8,6 @@ openrc touch /run/openrc/softlevel rc-update add php-fpm7 default -rc-update add nginx default -rc-service nginx restart rc-service php-fpm7 restart -sleep infinity & -wait +nginx -g 'daemon off;' diff --git a/srcs/phpmyadmin/phpmyadmin.yaml b/srcs/phpmyadmin/phpmyadmin.yaml index f9d8927..2334509 100644 --- a/srcs/phpmyadmin/phpmyadmin.yaml +++ b/srcs/phpmyadmin/phpmyadmin.yaml @@ -21,6 +21,14 @@ spec: - image: phpmyadmin-service imagePullPolicy: Never name: cacharle-phpmyadmin-container + livenessProbe: + exec: + command: + - /bin/sh + - -c + - ps aux | grep -v grep | grep php-fpm + initialDelaySeconds: 5 + periodSeconds: 5 --- diff --git a/srcs/wordpress/entrypoint.sh b/srcs/wordpress/entrypoint.sh index c89e0d4..0e3b159 100755 --- a/srcs/wordpress/entrypoint.sh +++ b/srcs/wordpress/entrypoint.sh @@ -8,9 +8,6 @@ openrc touch /run/openrc/softlevel rc-update add php-fpm7 default -rc-update add nginx default -rc-service nginx restart rc-service php-fpm7 restart -sleep infinity & -wait +nginx -g 'daemon off;' diff --git a/srcs/wordpress/wordpress.yaml b/srcs/wordpress/wordpress.yaml index 5cd9323..17e260c 100644 --- a/srcs/wordpress/wordpress.yaml +++ b/srcs/wordpress/wordpress.yaml @@ -21,6 +21,14 @@ spec: - image: wordpress-service imagePullPolicy: Never name: cacharle-wordpress-container + livenessProbe: + exec: + command: + - /bin/sh + - -c + - ps aux | grep -v grep | grep php-fpm + initialDelaySeconds: 5 + periodSeconds: 5 --- |