mariadb, phpmyadmin, phpcontainer updates

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

mariadb/sample-extends.yml

@@ -1,5 +1,7 @@
 services:
+
   mariadb:
     extends:
       file: ${COOKBOOK}/mariadb/docker-compose.yml
       service: mariadb
+

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

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"
+      
 ```

phpcontainer/sample-extends.yml

@@ -7,4 +7,4 @@ services:
     volumes:
       - "./project:/data"
       - "./config/php.ini:/usr/local/etc/php/php.ini"
-      
+      

phpcontainer/sample.env

@@ -1,2 +1,9 @@
-PHPCONTAINER_IMAGE=4lights/phpcontainer:v4
-VOL_PATH=/project-dir/project-name/data #HELP: volpath
+# 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

phpmyadmin/env-sample

@@ -1,6 +0,0 @@
-# Domains & Project
-PREFIX=p1
-PHPMYADMIN_DOMAIN_NAME=phpmyadmin.nickyeoman.com
-
-# Software versions
-PHPMYADMIN_V=5.0

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