From 5183fbb80ae54c478773fa0080f27ae11e39d89b Mon Sep 17 00:00:00 2001
From: Nick Yeoman <c@nickyeoman.com>
Date: Fri, 7 Feb 2025 16:16:38 -0800
Subject: [PATCH] mariadb, phpmyadmin, phpcontainer updates

---
 mariadb/docker-compose.yml      |  2 +-
 mariadb/sample-extends.yml      |  2 ++
 mariadb/sample.env              | 13 ++++++++-----
 phpcontainer/README.md          | 11 ++++++-----
 phpcontainer/sample-extends.yml |  2 +-
 phpcontainer/sample.env         | 11 +++++++++--
 phpmyadmin/env-sample           |  6 ------
 phpmyadmin/sample.env           |  9 +++++++--
 8 files changed, 34 insertions(+), 22 deletions(-)
 delete mode 100644 phpmyadmin/env-sample

diff --git a/mariadb/docker-compose.yml b/mariadb/docker-compose.yml
index cba82c7..60643de 100644
--- a/mariadb/docker-compose.yml
+++ b/mariadb/docker-compose.yml
@@ -9,4 +9,4 @@ services:
       - MARIADB_USER=${MARIADB_MARIADB_USER:-dbuser}
       - MARIADB_PASSWORD=${MARIADB_MARIADB_PASSWORD:-AlsoChangeThisPassword}
     volumes:
-      - ${VOL_PATH:-./data/}/mariadb_data:/var/lib/mysql
+      - ${VOL_PATH:-./data/}/mariadb:/var/lib/mysql
diff --git a/mariadb/sample-extends.yml b/mariadb/sample-extends.yml
index bf0f4d4..37d65a5 100644
--- a/mariadb/sample-extends.yml
+++ b/mariadb/sample-extends.yml
@@ -1,5 +1,7 @@
 services:
+
   mariadb:
     extends:
       file: ${COOKBOOK}/mariadb/docker-compose.yml
       service: mariadb
+
diff --git a/mariadb/sample.env b/mariadb/sample.env
index d963058..0e9eb94 100644
--- a/mariadb/sample.env
+++ b/mariadb/sample.env
@@ -1,10 +1,13 @@
-COOKBOOK=/git/docker-compose-cookbooks #HELP: cookbooks
-VOL_PATH=./data/ #HELP: volpath
-TZ="America/Vancouver"
+# Global
+COOKBOOK=/docker-compose-cookbooks
+COMPOSE_PROJECT_NAME=project
+TZ=America/Vancouver
+VOL_CONFIG_PATH=/data/projectName/config
+VOL_PATH=/data/projectName/data
 
 # MariaDB
 MARIADB_IMAGE=mariadb:latest
 MARIADB_MARIADB_DATABASE=mydb
-MARIADB_MARIADB_PASSWORD=AlsoChangeThisPassword #HELP: gen32
-MARIADB_MARIADB_ROOT_PASSWORD=ChangeThisPassword #HELP: gen32
+MARIADB_MARIADB_ROOT_PASSWORD=ChangeThisPassword0123456789ABCD
+MARIADB_MARIADB_PASSWORD=AlsoChangeThisPassword0123456789
 MARIADB_MARIADB_USER=dbuser
diff --git a/phpcontainer/README.md b/phpcontainer/README.md
index 0818c7b..4f344c8 100644
--- a/phpcontainer/README.md
+++ b/phpcontainer/README.md
@@ -19,13 +19,14 @@ VOL_PATH=/project_dir/project/data
 Now using extend you can call the service:
 
 ```yaml
-version: '3.4'
-
 services:
-  stash:
+
+  php-apache:
     extends:
       file: ${COOKBOOK}/phpcontainer/docker-compose.yml
       service: php-apache
-    env_file:
-      - .env
+    volumes:
+      - "./project:/data"
+      - "./config/php.ini:/usr/local/etc/php/php.ini"
+      
 ```
\ No newline at end of file
diff --git a/phpcontainer/sample-extends.yml b/phpcontainer/sample-extends.yml
index 31aabf5..f400fa0 100644
--- a/phpcontainer/sample-extends.yml
+++ b/phpcontainer/sample-extends.yml
@@ -7,4 +7,4 @@ services:
     volumes:
       - "./project:/data"
       - "./config/php.ini:/usr/local/etc/php/php.ini"
-      
\ No newline at end of file
+      
diff --git a/phpcontainer/sample.env b/phpcontainer/sample.env
index ceb825f..06cb868 100644
--- a/phpcontainer/sample.env
+++ b/phpcontainer/sample.env
@@ -1,2 +1,9 @@
-PHPCONTAINER_IMAGE=4lights/phpcontainer:v4
-VOL_PATH=/project-dir/project-name/data #HELP: volpath
\ No newline at end of file
+# Global
+COOKBOOK=/docker-compose-cookbooks
+COMPOSE_PROJECT_NAME=project
+TZ=America/Vancouver
+VOL_CONFIG_PATH=/data/projectName/config
+VOL_PATH=/data/projectName/data
+
+# PHP Container
+PHPCONTAINER_IMAGE=4lights/phpcontainer:latest
diff --git a/phpmyadmin/env-sample b/phpmyadmin/env-sample
deleted file mode 100644
index 6f09565..0000000
--- a/phpmyadmin/env-sample
+++ /dev/null
@@ -1,6 +0,0 @@
-# Domains & Project
-PREFIX=p1
-PHPMYADMIN_DOMAIN_NAME=phpmyadmin.nickyeoman.com
-
-# Software versions
-PHPMYADMIN_V=5.0
diff --git a/phpmyadmin/sample.env b/phpmyadmin/sample.env
index 187b89b..c5b8581 100644
--- a/phpmyadmin/sample.env
+++ b/phpmyadmin/sample.env
@@ -1,8 +1,13 @@
-COOKBOOK=/git/docker-compose-cookbooks #HELP: cookbooks
+COOKBOOK=/docker-compose-cookbooks
+COMPOSE_PROJECT_NAME=phpmyadmin
+TZ=America/Vancouver
+VOL_CONFIG_PATH=/data/projectName/config
+VOL_PATH=/data/projectName/data
+
 # phpmyadmin
 PHPMYADMIN_IMAGE=phpmyadmin/phpmyadmin:latest
 PHPMYADMIN_PMA_ARBITRARY=1
 PHPMYADMIN_PMA_HOST=mariadb
 PHPMYADMIN_PMA_USER=root
-PHPMYADMIN_PMA_PASSWORD=ChangeThisPassword
+PHPMYADMIN_PMA_PASSWORD=ChangeThisPassword0123456789ABCD
 PHPMYADMIN_UPLOAD_LIMIT=200M