From 4ace5fb035b4ec0875c289a3d17e3a5eafabd858 Mon Sep 17 00:00:00 2001
From: Jonathan Rosenbaum <bike@bikeshopi.org>
Date: Sun, 8 Jun 2025 22:07:27 +0000
Subject: [PATCH] Solves an issue of hardwiring user/password in wordpress for
 database.

---
 docker-compose.template.yml | 4 +++-
 wp-config.php               | 6 +++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/docker-compose.template.yml b/docker-compose.template.yml
index f1d75b5..3589c01 100644
--- a/docker-compose.template.yml
+++ b/docker-compose.template.yml
@@ -46,7 +46,9 @@ services:
       - ./wp-config.php:/var/www/html/wp-config.php            
     environment:
       - WORDPRESS_DB_HOST=database_${COMPOSE_PROJECT_NAME}:3306            
-      - WORDPRESS_DB_PASSWORD=${WORDPRESS_DB_PASSWORD:-fake}      
+      - WORDPRESS_DB_PASSWORD=${WORDPRESS_DB_PASSWORD:-fake}
+      - MYSQL_DATABASE=${MYSQL_DATABASE:-wordpress}
+      - MYSQL_USER=${MYSQL_USER:-wordpress}             
       - VIRTUAL_HOST=${VIRTUAL_HOST:-wordpress}
       - LETSENCRYPT_HOST=${LETSENCRYPT_HOST:-wordpress}
       - LETSENCRYPT_EMAIL=${LETSENCRYPT_EMAIL:-me}
diff --git a/wp-config.php b/wp-config.php
index 08def2d..f3d2e68 100644
--- a/wp-config.php
+++ b/wp-config.php
@@ -20,13 +20,13 @@
 
 // ** MySQL settings - You can get this info from your web host ** //
 /** The name of the database for WordPress */
-define('DB_NAME', 'wordpress');
+define('DB_NAME', getenv('MYSQL_DATABASE'));
 
 /** MySQL database username */
-define('DB_USER', 'root');
+define('DB_USER', getenv('MYSQL_USER'));
 
 /** MySQL database password */
-define('DB_PASSWORD', 'wordpress');
+define('DB_PASSWORD', getenv('WORDPRESS_DB_PASSWORD'));
 
 /** MySQL hostname */
 define('DB_HOST', getenv('WORDPRESS_DB_HOST'));