From 2d51548879017639d9a222272f4550587cbe2003 Mon Sep 17 00:00:00 2001
From: Bo-Yi Wu <appleboy.tw@gmail.com>
Date: Mon, 22 Aug 2016 11:01:34 +0800
Subject: [PATCH 1/2] support phpmyadmin container.

Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
---
 docker-compose.yml    | 20 ++++++++++++++++++++
 phpmyadmin/Dockerfile | 11 +++++++++++
 2 files changed, 31 insertions(+)
 create mode 100644 phpmyadmin/Dockerfile

diff --git a/docker-compose.yml b/docker-compose.yml
index 29348e6f..0d3c33a5 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -209,6 +209,25 @@ services:
         links:
             - php-fpm
 
+### phpMyAdmin Container ##################################
+
+    phpmyadmin:
+        build: ./phpmyadmin
+        environment:
+            PMA_ARBITRARY: 1
+            MYSQL_USER: homestead
+            MYSQL_PASSWORD: secret
+            MYSQL_ROOT_PASSWORD: root
+        volumes_from:
+            - volumes_data
+        ports:
+            - "8000:80"
+        links:
+            # for mysql container
+            - "mysql:db"
+            # for mariadb container
+            # - "mariadb:db"
+
 ### Laravel Application Code Container ######################
 
     volumes_source:
@@ -231,5 +250,6 @@ services:
             - ./data/redis:/data
             - ./data/neo4j:/var/lib/neo4j/data
             - ./data/mongo:/data/db
+            - ./data/sessions:/sessions
 
 ### Add more Containers below ###############################
diff --git a/phpmyadmin/Dockerfile b/phpmyadmin/Dockerfile
new file mode 100644
index 00000000..87cb30b4
--- /dev/null
+++ b/phpmyadmin/Dockerfile
@@ -0,0 +1,11 @@
+FROM phpmyadmin/phpmyadmin
+
+MAINTAINER Bo-Yi Wu <appleboy.tw@gmail.com>
+
+# Add volume for sessions to allow session persistence
+VOLUME /sessions
+
+# We expose phpMyAdmin on port 80
+EXPOSE 80
+
+ENTRYPOINT [ "/run.sh" ]

From 3c8861d1d273deb68cf42fe2f323531ed7be5b9d Mon Sep 17 00:00:00 2001
From: Bo-Yi Wu <appleboy.tw@gmail.com>
Date: Mon, 22 Aug 2016 11:02:21 +0800
Subject: [PATCH 2/2] remove empty data folder for mariadb.

ref:
https://github.com/docker-library/mariadb/blob/d969a465ee48fe10f4b532276f7337ddaaf3fc36/10.1/Dockerfile#L83

Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
---
 docker-compose.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 0d3c33a5..a15a005e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -245,7 +245,6 @@ services:
         volumes:
             - ./data/mysql:/var/lib/mysql
             - ./data/postgres:/var/lib/postgres
-            - ./data/mariadb:/var/lib/mariadb
             - ./data/memcached:/var/lib/memcached
             - ./data/redis:/data
             - ./data/neo4j:/var/lib/neo4j/data