From 0c1684a7511b32018fee56c91caa942524f6c767 Mon Sep 17 00:00:00 2001
From: vladimir <vladimir@nixdi.com>
Date: Fri, 17 Mar 2017 16:48:50 +0200
Subject: [PATCH 1/3] [feature] Add Dockerfile and update README

---
 Dockerfile |  9 +++++++
 README.md  | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 80 insertions(+)
 create mode 100644 Dockerfile

diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 00000000..efb056d1
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,9 @@
+FROM centos
+RUN curl --silent --location https://rpm.nodesource.com/setup_7.x | bash -
+RUN yum install -y git make gcc nodejs && yum clean all
+RUN git clone git://github.com/andris9/mailtrain.git /app
+WORKDIR /app/
+ENV NODE_ENV production
+RUN npm install --no-progress --production && npm install --no-progress passport-ldapjs
+EXPOSE 3000
+CMD ["/usr/bin/node", "index.js"]
diff --git a/README.md b/README.md
index 3711c676..5770513e 100644
--- a/README.md
+++ b/README.md
@@ -115,6 +115,77 @@ If you are using the bundled ZoneMTA then you should make sure you are using a p
 
 With proper SPF, DKIM and PTR records (DMARC wouldn't hurt either) I got perfect 10/10 score out from [MailTester](https://www.mail-tester.com/) when sending a campaign message to a MailTester test address. I did not have VERP turned on, so the sender address matched return path address.
 
+### Simple Install (Docker)
+##### Requirements:
+    * Docker
+    * docker-compose
+  
+  1. Download Mailtrain files using git: `git clone git://github.com/andris9/mailtrain.git` (or download [zipped repo](https://github.com/andris9/mailtrain/archive/master.zip)) and open Mailtrain folder `cd mailtrain`
+  2. Run `sudo docker build -t mailtrain-node:latest .`
+  3. Copy default.toml to production.toml. Run `sudo mkdir -p /etc/mailtrain && sudo cp config/default.toml /etc/mailtrain/production.toml`
+  4. Create `/etc/docker-compose.yml`. Example (dont forget change MYSQL_ROOT_PASS and MYSQL_USER_PASSWORD to your passwords):
+  ```
+  version: '2'
+  services:
+    mailtrain-mysql:
+        image: mysql:latest
+        ports:
+          - "3306:3306"
+        container_name: "mailtrain-mysql"
+        restart: always
+        environment:
+           MYSQL_ROOT_PASSWORD: "MYSQL_ROOT_PASS"
+           MYSQL_DATABASE: "mailtrain"
+           MYSQL_USER: "mailtrain"
+           MYSQL_PASSWORD: "MYSQL_USER_PASSWORD"
+        volumes:
+           - mailtrain-mysq-data:/var/lib/mysql
+
+    mailtrain-redis:
+        image: redis:3.0
+        container_name: "mailtrain-redis"
+        volumes:
+           - mailtrain-redis-data:/data
+
+    mailtrain-node:
+      image: mailtrain-node:latest
+      container_name: "mailtrain-node"
+      links:
+        - "mailtrain-mysql:mailtrain-mysql"
+        - "mailtrain-redis:mailtrain-redis"
+      ports:
+        - "3000:3000"
+      volumes:
+        - "/etc/mailtrain/production.toml:/app/config/production.toml"
+  volumes:
+    mailtrain-mysq-data: {}
+    mailtrain-redis-data: {}
+
+  ```
+  5. Update MySQL and Redis credintial in `/etc/mailtrain/production.toml` like this:
+  ```
+  [mysql]
+  host="mailtrain-mysql"
+  user="mailtrain"
+  password="MYSQL_USER_PASSWORD"
+  database="mailtrain"
+  port=3306
+  charset="utf8mb4"
+  timezone="UTC"
+
+  [redis]
+  enabled=true
+  host="mailtrain-redis"
+  port=6379
+  db=5
+  ```
+  6. Run docker container with command `sudo docker-compose -f /etc/docker-compose.yml up -d`
+  7. Open [http://localhost:3000/](http://localhost:3000/)
+  8. Authenticate as `admin`:`test`
+  9. Navigate to [http://localhost:3000/settings](http://localhost:3000/settings) and update service configuration
+  10. Navigate to [http://localhost:3000/users/account](http://localhost:3000/users/account) and update user information and password
+
+
 ### Manual Install (any OS that supports Node.js)
 
   1. Download Mailtrain files using git: `git clone git://github.com/andris9/mailtrain.git` (or download [zipped repo](https://github.com/andris9/mailtrain/archive/master.zip)) and open Mailtrain folder `cd mailtrain`

From d1451f48b2c558ede3cefeeaf15f81567020a07f Mon Sep 17 00:00:00 2001
From: vladimir <vladimir@nixdi.com>
Date: Fri, 17 Mar 2017 17:27:27 +0200
Subject: [PATCH 2/3] [bugfix] Add data volumes for grapejs and grapejs uploads

---
 README.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/README.md b/README.md
index 5770513e..459967cd 100644
--- a/README.md
+++ b/README.md
@@ -157,9 +157,12 @@ With proper SPF, DKIM and PTR records (DMARC wouldn't hurt either) I got perfect
         - "3000:3000"
       volumes:
         - "/etc/mailtrain/production.toml:/app/config/production.toml"
+        - "mailtrain-node-data:/app/public/grapejs/uploads"
+        - "mailtrain-node-data:/app/public/mosaico/uploads"
   volumes:
     mailtrain-mysq-data: {}
     mailtrain-redis-data: {}
+    mailtrain-node-data: {}
 
   ```
   5. Update MySQL and Redis credintial in `/etc/mailtrain/production.toml` like this:

From 9bfa61c92c57926f33a55411867c57490e1a1cac Mon Sep 17 00:00:00 2001
From: vladimir <vladimir@nixdi.com>
Date: Tue, 21 Mar 2017 11:07:24 +0200
Subject: [PATCH 3/3] Add ImageMagick install to Dockerfile

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index efb056d1..4d8f46cf 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM centos
 RUN curl --silent --location https://rpm.nodesource.com/setup_7.x | bash -
-RUN yum install -y git make gcc nodejs && yum clean all
+RUN yum install -y git make gcc nodejs ImageMagick && yum clean all
 RUN git clone git://github.com/andris9/mailtrain.git /app
 WORKDIR /app/
 ENV NODE_ENV production