README.md

@@ -11,20 +11,20 @@ Master Repo: https://git.4lt.ca/4lt/novaconium
 
 ## Getting Started
 
-### Installation (docker)
+### Installation 
 
 ```bash
 mkdir project_name;
 cd project_name;
-
+# Native
 composer require 4lt/novaconium
-
+# Composer
-docker run --rm --interactive --tty --volume $PWD:/app composer:latest require 4lt/novaconium
+docker run --rm --interactive --tty --volume $PWD:/app composer require 4lt/novaconium
 cp -R vendor/4lt/novaconium/defaults/App/ .
 cp -R vendor/4lt/novaconium/defaults/public/ .
 ```
 
-### Install Composer on Debian
+#### Compose install (debian)
 
 ```bash
 sudo nala install curl php-cli php-mbstring git unzip
@@ -33,20 +33,6 @@ sudo php composer-setup.php --install-dir=/usr/local/bin --filename=composer
 rm composer-setup.php
 ```
 
-## APP Database config
-
-Open the /App/config.php file and change the database section to match the above:
-
-```php
-'database' => [ 
-        'host' => 'mariadb',
-        'name' => 'mydb',
-        'user' => 'dbuser',
-        'pass' => 'AlsoChangeThisPassword0123456789',
-        'port' => 3306
-    ],
-```
-
 ## Documentation
 
 * [Docker Setup](https://git.4lt.ca/4lt/novaconium)

docs/docker.md

@@ -1,66 +1,72 @@
-# Docker Cheatsheet (for Novaconium)
+# Getting Started With Docker
 
-## Compose update project
+## Clone Docker Cookbooks
 
-```docker run --rm --interactive --tty --volume $PWD:/app composer:latest update```
+[Github Docker Compose Cookbooks](https://github.com/nickyeoman/docker-compose-cookbooks)
-
-## Sample Docker Compose File
 
+```bash
+git clone git@github.com:nickyeoman/docker-compose-cookbooks.git /docker-compose-cookbooks
 ```
-services:
 
-  corxn: 
+## Setup Docker Compose File
-    image: ${CORXN_IMAGE}
-    restart: always
-    volumes:
-      - "./novaconium:/data"
-      - "./config/php.ini:/usr/local/etc/php/php.ini"
-    networks:
-      - my_internal
-      - proxy
-    ports:
-      - 8000:80
 
-  mariadb:
+Read the sample extends file of /docker-compose-cookbooks/phpcontainer/sample-extends.yml 
-    image: ${MARIADB_IMAGE}
-    restart: always
-    command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW --innodb-file-per-table=1 --skip-innodb-read-only-compressed
-    environment:
-      - MARIADB_DATABASE=${DB}
-      - MARIADB_PASSWORD=${DB_PASSWORD}
-      - MARIADB_ROOT_PASSWORD=${DB_ROOT_PASSWORD}
-      - MARIADB_USER=${DB_sUSER}
-    volumes:
-      - ${VOL_PATH}/db:/var/lib/mysql
-    networks:
-      - my_internal
 
-networks:
+```bash
-  proxy:
+# ensure docker-compose exists
-    external: true
+[[ -f docker-compose.yml ]] || echo "services:" > docker-compose.yml
-  my_internal:
+
-    driver: bridge
+# PHP container
+tail -n+2 /docker-compose-cookbooks/phpcontainer/sample-extends.yml >> docker-compose.yml
+
+# PHP settings
+cp -r /docker-compose-cookbooks/phpcontainer/config .
+
+# Set project directory
+sed -i 's|- "./project:/data"|- "./:/data"|' docker-compose.yml
+
+# Mariadb container
+tail -n +2 /docker-compose-cookbooks/mariadb/sample-extends.yml >> docker-compose.yml
 
 ```
 
-### ENV File
+## ENV File
 
-The .env file should look something like this:
+Then setup the .env file, which should look something like this:
 
 ```
-CORXN_IMAGE=4lights/corxn:latest
+COOKBOOK=/docker-compose-cookbooks
+COMPOSE_PROJECT_NAME=myProject
 TZ=America/Vancouver
 VOL_CONFIG_PATH=/data/myProject/config
 VOL_PATH=/data/myProject/data
 
+# PHP Container
+PHPCONTAINER_IMAGE=4lights/phpcontainer:latest
+
 # MariaDB
 MARIADB_IMAGE=mariadb:latest
-DB=mydbname
+MARIADB_MARIADB_DATABASE=mydb
-DB_ROOT_PASSWORD=ChangeThisPassword0123456789ABCD
+MARIADB_MARIADB_ROOT_PASSWORD=ChangeThisPassword0123456789ABCD
-DB_PASSWORD=AlsoChangeThisPassword0123456789
+MARIADB_MARIADB_PASSWORD=AlsoChangeThisPassword0123456789
-DB_USER=dbuser
+MARIADB_MARIADB_USER=dbuser
 ```
 
+## APP Database config
+
+Open the /App/config.php file and change the database section to match the above:
+
+```php
+'database' => [ 
+        'host' => 'mariadb',
+        'name' => 'mydb',
+        'user' => 'dbuser',
+        'pass' => 'AlsoChangeThisPassword0123456789',
+        'port' => 3306
+    ],
+```
+
+
 ## Start Docker
 
 ```docker compose up -d```