Merge branch 'ChieftainY2k-feature/phpmyadmin' into develop

Author: htuscher

README.md

@@ -17,6 +17,7 @@ Supports:
 - Memcached (disabled)
 - Mailcatcher (if no mail sandbox is used, eg. [Vagrant Development VM](https://github.com/mblaschke/vagrant-development))
 - FTP server (vsftpd)
+- PhpMyAdmin
 - maybe more later...
 
 This Docker boilerplate is based on the [Docker best practices](https://docs.docker.com/articles/dockerfile_best-practices/) and doesn't use too much magic. Configuration of each docker container is available in the `docker/` directory - feel free to customize.

docker-compose.development.yml

@@ -155,6 +155,21 @@ services:
   #    - etc/environment.yml
   #    - etc/environment.development.yml
 
+  #######################################
+  # phpMyAdmin
+  #######################################
+  #phpmyadmin:
+  #  image: phpmyadmin/phpmyadmin
+  #  links:
+  #    - mysql
+  #  environment:
+  #    - PMA_ARBITRARY=1
+  #    - VIRTUAL_HOST=phpmyadmin.docker
+  #  ports:
+  #    - "8001:80"
+  #  volumes:
+  #    - /sessions
+
   #######################################
   # Storage
   #######################################

documentation/DOCKER-INFO.md

@@ -16,6 +16,7 @@ memcached (optional)      | Memcached server
 redis (optional)          | Redis server
 ftps (optional)           | FTP server (vsftpd)
 mailcatcher (optional)    | Mailserver with easy web and REST interface for mailing
+phpmyadmin (optional)     | Tool written in PHP, intended to handle the administration of MySQL over the Web
 
 The `app/` directory will be mounted under `/app` inside `app` container.
 
@@ -32,6 +33,7 @@ memcached (optional)      | [Memcached](https://registry.hub.docker.com/_/memcac
 redis (optional)          | [Redis](https://registry.hub.docker.com/_/redis/) *official*
 ftp (optional)            | [Ubuntu](https://registry.hub.docker.com/_/ubuntu/) *official*
 mailcatcher (optional)    | [Mailcatcher](https://registry.hub.docker.com/u/schickling/mailcatcher/) from _schickling_
+phpmyadmin (optional)     | [PhpMyAdmin](https://hub.docker.com/r/phpmyadmin/phpmyadmin/) *official*
 
 ## Makefile
 

documentation/SERVICES.md

@@ -81,3 +81,13 @@ Ports         | 20,21
 User          | dev (if not changed in env)
 Password      | dev (if not changed in env)
 Path          | /storage/ftp (if not changed in env)
+
+### PhpMyAdmin
+
+Setting       | Value
+------------- | -------------
+Host          | phpmyadmin
+Ports         | 8001
+Log in server | mysql
+Username      | dev (if not changed in env, see mysql container configuration)
+Password      | dev (if not changed in env, see mysql container configuration)