From bf0497c02af86d08f62f1508024996c49fb63d6b Mon Sep 17 00:00:00 2001
From: Hyperling <me@hyperling.com>
Date: Mon, 20 Oct 2025 19:35:59 -0700
Subject: [PATCH] Configuration for WordPress is working but still a few things
 to tweak, test, and enhance.

---
 .../WordpressExample/docker-compose.main.yml  | 69 +++++++++++--------
 Config/WordpressExample/env.main              | 32 +++++----
 2 files changed, 62 insertions(+), 39 deletions(-)

diff --git a/Config/WordpressExample/docker-compose.main.yml b/Config/WordpressExample/docker-compose.main.yml
index d6ffe0c..656f35f 100644
--- a/Config/WordpressExample/docker-compose.main.yml
+++ b/Config/WordpressExample/docker-compose.main.yml
@@ -17,35 +17,18 @@
 
 services:
 
-  wp-app:
-    container_name: wp-app
-    image: wordpress
-    depends_on:
-      - wp-db
-    restart: always
-    ports:
-      - 8080:80
-    environment:
-      WORDPRESS_DB_HOST: wp-db
-      WORDPRESS_DB_NAME: $MARIADB_DATABASE
-      WORDPRESS_DB_USER: $MARIADB_USER
-      WORDPRESS_DB_PASSWORD: $MARIADB_PASSWORD
-      WORDPRESS_DEBUG: $WORDPRESS_DEBUG
-      WP_CPU: $WP_CPU
-      WP_MEM: $WP_MEM
-    volumes:
-      - ../../Volumes/WordPress/wordpress:/var/www/html
-    deploy:
-      mode: global
-      resources:
-        limits:
-          cpus: $WP_CPU
-          memory: $WP_MEM
-
   wp-db:
     container_name: wp-db
     image: mariadb:lts
     restart: always
+    volumes:
+      - ../../Volumes/WordPress/mariadb:/var/lib/mysql
+    healthcheck:
+      test: ["CMD", "healthcheck.sh", "--connect", "--innodb_initialized"]
+      start_period: 5s
+      interval: 5s
+      timeout: 5s
+      retries: 10
     environment:
       # https://mariadb.com/docs/server/server-management/automated-mariadb-deployment-and-administration/docker-and-mariadb/mariadb-server-docker-official-image-environment-variables
       MARIADB_DATABASE: $MARIADB_DATABASE
@@ -55,11 +38,43 @@ services:
       MARIADB_AUTO_UPGRADE: $MARIADB_AUTO_UPGRADE
       WP_CPU_DB: $WP_CPU_DB
       WP_MEM_DB: $WP_MEM_DB
-    volumes:
-      - ../../Volumes/WordPress/mariadb:/var/lib/mysql
     deploy:
       mode: global
       resources:
         limits:
           cpus: $WP_CPU_DB
           memory: $WP_MEM_DB
+
+  wp-app:
+    container_name: wp-app
+    image: wordpress:latest
+    restart: always
+    ports:
+      - 8080:80
+    depends_on:
+      wp-db:
+        condition: service_healthy
+    links:
+      - wp-db
+    volumes:
+      - ../../Volumes/WordPress/wordpress:/var/www/html
+    environment:
+      WORDPRESS_ADMIN_USERNAME: $WORDPRESS_ADMIN_USERNAME
+      WORDPRESS_ADMIN_PASSWORD: $WORDPRESS_ADMIN_PASSWORD
+      WORDPRESS_DB_HOST: wp-db
+      WORDPRESS_DB_NAME: $MARIADB_DATABASE
+      # TBD/TODO: Does not work, but recommended. :(
+      #WORDPRESS_DB_USER: $MARIADB_USER
+      #WORDPRESS_DB_PASSWORD: $MARIADB_PASSWORD
+      # Works, but not recommended. Lol.
+      WORDPRESS_DB_USER: root
+      WORDPRESS_DB_PASSWORD: $MARIADB_ROOT_PASSWORD
+      WORDPRESS_DEBUG: $WORDPRESS_DEBUG
+      WP_CPU: $WP_CPU
+      WP_MEM: $WP_MEM
+    deploy:
+      mode: global
+      resources:
+        limits:
+          cpus: $WP_CPU
+          memory: $WP_MEM
diff --git a/Config/WordpressExample/env.main b/Config/WordpressExample/env.main
index 2785adb..da7d110 100644
--- a/Config/WordpressExample/env.main
+++ b/Config/WordpressExample/env.main
@@ -1,24 +1,32 @@
 # This file should be copied to `.env` and have its values changes as needed.
 
+## Docker ##
+
 COMPOSE_BAKE=true
 
+## End Docker ##
+
 
 ## WordPress ##
 
-# Uncomment this to get ebug output in the log.
-#WORDPRESS_DEBUG=1
+# TBD/TODO: These do not actually seem to work.
+WORDPRESS_ADMIN_USERNAME='wp_user'
+WORDPRESS_ADMIN_PASSWORD='wordpress_password'
+
+# Uncomment this to get debug output in the log.
+WORDPRESS_DEBUG=1
 
 ## End WordPress ##
 
 
 ## Database ##
 
-MARIADB_DATABASE=wordpress
+MARIADB_DATABASE='wordpress'
 
-MARIADB_USER=wp
-MARIADB_PASSWORD=db_wp_password
+MARIADB_USER='db_user'
+MARIADB_PASSWORD='database_password'
 
-MARIADB_ROOT_PASSWORD=db_root_password
+MARIADB_ROOT_PASSWORD='db_root_password'
 
 # Comment this if you do not want MariaDB to run upgrade scripts on new versions.
 MARIADB_AUTO_UPGRADE=1
@@ -41,14 +49,14 @@ MARIADB_AUTO_UPGRADE=1
 #WP_MEM_DB=0.50G
 
 # Tested Minimum
-#WP_CPU=0.50
-#WP_MEM=0.50G
-#WP_CPU_DB=0.10
-#WP_MEM_DB=0.10G
+#WP_CPU=0.35
+#WP_MEM=0.35G
+#WP_CPU_DB=0.15
+#WP_MEM_DB=0.15G
 
 # Tested Recommended
-WP_CPU=1.00
-WP_MEM=1.00G
+WP_CPU=0.50
+WP_MEM=0.50G
 WP_CPU_DB=0.25
 WP_MEM_DB=0.25G