add and fix a lot of services

templates/compose/wordpress-with-mysql.yaml

@@ -1,28 +1,37 @@
 # documentation: https://wordpress.org
-# slogan: WordPress with MySQL. Wordpress is open source software you can use to create a beautiful website, blog, or app.
+# slogan: Wordpress is open source software you can use to create a beautiful website, blog, or app.
 # tags: cms, blog, content, management, mysql
 # logo: svgs/wordpress.svg
 
 services:
-   wordpress:
-     image: wordpress:latest
-     volumes:
-       - wordpress-files:/var/www/html
-     environment:
-       - SERVICE_FQDN
-       - WORDPRESS_DB_HOST=mysql
-       - WORDPRESS_DB_USER=$SERVICE_USER_WORDPRESS
-       - WORDPRESS_DB_PASSWORD=$SERVICE_PASSWORD_WORDPRESS
-       - WORDPRESS_DB_NAME=wordpress
-     depends_on:
-       - mysql
-
-   mysql:
-     image: mysql:5.7
-     volumes:
-       - mysql-data:/var/lib/mysql
-     environment:
-       - MYSQL_ROOT_PASSWORD=$SERVICE_PASSWORD_ROOT
-       - MYSQL_DATABASE=wordpress
-       - MYSQL_USER=$SERVICE_USER_WORDPRESS
-       - MYSQL_PASSWORD=$SERVICE_PASSWORD_WORDPRESS
+  wordpress:
+    image: wordpress:latest
+    volumes:
+      - wordpress-files:/var/www/html
+    environment:
+      - SERVICE_FQDN_WORDPRESS
+      - WORDPRESS_DB_HOST=mysql
+      - WORDPRESS_DB_USER=$SERVICE_USER_WORDPRESS
+      - WORDPRESS_DB_PASSWORD=$SERVICE_PASSWORD_WORDPRESS
+      - WORDPRESS_DB_NAME=wordpress
+    depends_on:
+      - mysql
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost"]
+      interval: 2s
+      timeout: 10s
+      retries: 10
+  mysql:
+    image: mysql:5.7
+    volumes:
+      - mysql-data:/var/lib/mysql
+    environment:
+      - MYSQL_ROOT_PASSWORD=$SERVICE_PASSWORD_ROOT
+      - MYSQL_DATABASE=wordpress
+      - MYSQL_USER=$SERVICE_USER_WORDPRESS
+      - MYSQL_PASSWORD=$SERVICE_PASSWORD_WORDPRESS
+    healthcheck:
+      test: ["CMD", "mysqladmin", "ping", "-h", "localhost"]
+      interval: 5s
+      timeout: 20s
+      retries: 10