From 05c5f7714c1c9ac0028b360f8a4e092d812f507b Mon Sep 17 00:00:00 2001
From: voidtek <vdacosta@voidtek.com>
Date: Tue, 1 Oct 2019 21:15:41 +0100
Subject: [PATCH 1/2] Add docker and git module.

---
 .gitignore             |  7 +++++++
 .gitmodules            |  3 +++
 docker-compose.dev.yml | 24 ++++++++++++++++++++++++
 docker-compose.yml     | 13 +++++++++++++
 4 files changed, 47 insertions(+)
 create mode 100644 .gitmodules
 create mode 100644 docker-compose.dev.yml
 create mode 100644 docker-compose.yml

diff --git a/.gitignore b/.gitignore
index 4f56359..6a324d8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,3 +33,10 @@ web/sites/*/files
 # Ignore local files
 *.local.php
 *.local.yml
+
+# Ignore editor files
+/.idea
+
+# Ignore local docker files
+/docker-compose.*.yml
+!/docker-compose.dev.yml
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..8281c23
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "web/profiles/d8mspro"]
+	path = web/profiles/d8mspro
+	url = git@github.com:dxvargas/d8mspro.git
diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
new file mode 100644
index 0000000..106d687
--- /dev/null
+++ b/docker-compose.dev.yml
@@ -0,0 +1,24 @@
+version: '2'
+services:
+  web:
+    volumes:
+      - ~/cache:/cache
+  phpmyadmin:
+    depends_on:
+      - mysql
+    image: phpmyadmin/phpmyadmin
+    restart: always
+    ports:
+      - '8080:80'
+    environment:
+      PMA_HOST: mysql
+      MYSQL_ROOT_PASSWORD: ''
+  selenium:
+    image: selenium/standalone-chrome-debug:3.11
+    environment:
+      - DISPLAY=:99
+      - SE_OPTS=-debug
+    ports:
+      - "5900:5900"
+    expose:
+      - '4444'
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 0000000..9e0a3be
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,13 @@
+version: '2'
+services:
+  web:
+    image: fpfis/httpd-php-ci:7.1
+    working_dir: /var/www/html/d8ms
+    ports:
+      - 80:8080
+    volumes:
+      - .:/var/www/html/d8ms
+  mysql:
+    image: percona/percona-server:5.6
+    environment:
+      MYSQL_ALLOW_EMPTY_PASSWORD: "yes"

From 9c02f1ce533e8215a2b0ca2f61b90e9988b55006 Mon Sep 17 00:00:00 2001
From: voidtek <vdacosta@voidtek.com>
Date: Fri, 17 Jan 2020 20:34:42 +0000
Subject: [PATCH 2/2] Update docker syntaxe.

---
 docker-compose.dev.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
index 106d687..e367f9b 100644
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -9,7 +9,7 @@ services:
     image: phpmyadmin/phpmyadmin
     restart: always
     ports:
-      - '8080:80'
+      - 8080:80
     environment:
       PMA_HOST: mysql
       MYSQL_ROOT_PASSWORD: ''
@@ -19,6 +19,6 @@ services:
       - DISPLAY=:99
       - SE_OPTS=-debug
     ports:
-      - "5900:5900"
+      - 5900:5900
     expose:
-      - '4444'
\ No newline at end of file
+      - 4444