From 7dea9cb8190dae59ca8bab1d7333b24ecfc3096d Mon Sep 17 00:00:00 2001
From: darta <josepmaria@isardvdi.com>
Date: Wed, 5 Jan 2022 17:19:19 +0100
Subject: [PATCH] chore(wordpress): depends_on and healthcheck for wp cli

---
 docker/mariadb/mariadb.yml     |  4 ++++
 docker/wordpress/wordpress.yml | 13 ++++++++++---
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/docker/mariadb/mariadb.yml b/docker/mariadb/mariadb.yml
index b0a0901..b794aa2 100644
--- a/docker/mariadb/mariadb.yml
+++ b/docker/mariadb/mariadb.yml
@@ -21,5 +21,9 @@ services:
       MYSQL_USER: wordpress
       MYSQL_PASSWORD: ${WORDPRESS_MARIADB_PASSWORD}
     restart: unless-stopped
+    healthcheck:
+        test: ["CMD", "mysqladmin" ,"ping", "-h", "localhost"]
+        timeout: 20s
+        retries: 10
     networks:
       - isard_net
\ No newline at end of file
diff --git a/docker/wordpress/wordpress.yml b/docker/wordpress/wordpress.yml
index 5fec4d6..be3f0ad 100644
--- a/docker/wordpress/wordpress.yml
+++ b/docker/wordpress/wordpress.yml
@@ -30,6 +30,11 @@ services:
     links:
       - isard-apps-mariadb
     restart: unless-stopped
+    healthcheck:
+        test: ["CMD", "curl", "-f", "http://localhost:80"]
+        interval: 30s
+        timeout: 10s
+        retries: 5
     networks:
       - isard_net
 
@@ -43,11 +48,13 @@ services:
       bash -c 'wp core install --path="/var/www/html" --url=wp.${DOMAIN} --title="${TITLE}" --admin_user=${WORDPRESS_ADMIN_USER} --admin_password=${WORDPRESS_ADMIN_PASSWORD} --admin_email=${SMTP_USER};
       wp core multisite-convert;'
     depends_on:
-      - isard-apps-mariadb
-      - isard-apps-wordpress
+      isard-apps-mariadb:
+        condition: service_healthy
+      isard-apps-wordpress:
+        condition: service_healthy
     networks:
       - isard_net
-    restart: on-failure
+    restart: "no"
     environment:
       WORDPRESS_DB_HOST: isard-apps-mariadb
       WORDPRESS_DB_NAME: "wordpress"