From 1413ca488608af27aa8e1bf291b6120cd494d481 Mon Sep 17 00:00:00 2001
From: Jace Manshadi <j_manshad@sfu.ca>
Date: Mon, 22 Oct 2018 17:48:01 -0700
Subject: [PATCH 1/2] update documentation to reflect the fact....

..that MariaDB is now the default DB as outlined by remy on this post
https://community.passbolt.com/t/how-to-setup-with-mariadb/1125/6?u=jace
---
 README.md | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index 85b47bd..eea5fea 100644
--- a/README.md
+++ b/README.md
@@ -37,10 +37,10 @@ docker image with the default passbolt credentials.
 
 ```bash
 $ docker run -e MYSQL_ROOT_PASSWORD=<root_password> \
-             -e MYSQL_DATABASE=<mysql_database> \
-             -e MYSQL_USER=<mysql_user> \
-             -e MYSQL_PASSWORD=<mysql_password> \
-             mysql
+             -e MYSQL_DATABASE=<mariadb_database> \
+             -e MYSQL_USER=<mariadb_user> \
+             -e MYSQL_PASSWORD=<mariadb_password> \
+             mariadb
 ```
 
 Then you can start passbolt just by providing the database container ip in the
@@ -48,10 +48,12 @@ Then you can start passbolt just by providing the database container ip in the
 
 ```bash
 $ docker run --name passbolt \
-             -e DATASOURCES_DEFAULT_HOST=<mysql_container_host> \
-             -e DATASOURCES_DEFAULT_PASSWORD=<mysql_password> \
-             -e DATASOURCES_DEFAULT_USERNAME=<mysql_user> \
-             -e DATASOURCES_DEFAULT_DATABASE=<mysql_database> \
+             -p 80:80
+             -p 443:443
+             -e DATASOURCES_DEFAULT_HOST=<mariadb_container_host> \
+             -e DATASOURCES_DEFAULT_PASSWORD=<mariadb_password> \
+             -e DATASOURCES_DEFAULT_USERNAME=<mariadb_user> \
+             -e DATASOURCES_DEFAULT_DATABASE=<mariadb_database> \
              -e APP_FULL_BASE_URL=https://mydomain.com \
              passbolt/passbolt:develop-debian
 ```
@@ -155,4 +157,4 @@ $ docker-compose up
 
 * rng-tools or haveged are required on host machine to speed up entropy generation on containers.
 This way gpg key creation on passbolt container will be faster.
-* mysql >= 5.6
+* mariadb/mysql >= 5.6

From 29f6005448579c63930638880d03f33fe608a1b2 Mon Sep 17 00:00:00 2001
From: Jace Manshadi <j_manshad@sfu.ca>
Date: Mon, 22 Oct 2018 18:46:13 -0700
Subject: [PATCH 2/2] forgot to add backlash to indicate multiline command

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index eea5fea..bccb848 100644
--- a/README.md
+++ b/README.md
@@ -48,8 +48,8 @@ Then you can start passbolt just by providing the database container ip in the
 
 ```bash
 $ docker run --name passbolt \
-             -p 80:80
-             -p 443:443
+             -p 80:80 \
+             -p 443:443 \
              -e DATASOURCES_DEFAULT_HOST=<mariadb_container_host> \
              -e DATASOURCES_DEFAULT_PASSWORD=<mariadb_password> \
              -e DATASOURCES_DEFAULT_USERNAME=<mariadb_user> \