Merge branch 'master' into proxy

DOCUMENTATION/_settings/content/documentation/index.md

@@ -706,6 +706,23 @@ docker-compose up -d mariadb phpmyadmin
 
 
 
+<br>
+<a name="Use-Adminer"></a>
+## Use Adminer
+
+1 - Run the Adminer Container (`adminer`) with the `docker-compose up` command. Example:
+
+```bash
+docker-compose up -d adminer  
+```
+
+2 - Open your browser and visit the localhost on port **8080**:  `http://localhost:8080`
+
+
+
+
+
+
 <br>
 <a name="Use-pgAdmin"></a>
 ## Use PgAdmin

DOCUMENTATION/_settings/content/getting-started/index.md

@@ -138,7 +138,7 @@ You can rename the config files, project folders and domains as you like, just m
 If you are using **Docker Toolbox** (VM), do one of the following:
 
 - Upgrade to Docker [Native](https://www.docker.com/products/docker) for Mac/Windows (Recommended). Check out [Upgrading Laradock](#upgrading-laradock)
-- Use Laradock v3.* (Visit the `Laradock-ToolBox` [Branch](https://github.com/laradock/laradock/tree/Laradock-ToolBox)).
+- Use Laradock v3.* (Visit the `LaraDock-ToolBox` [Branch](https://github.com/laradock/laradock/tree/LaraDock-ToolBox)).
 
 <br>
 
@@ -168,7 +168,7 @@ docker-compose up -d nginx mysql
 
 You can select your own combination of containers form the list below:
 
-> `nginx`, `hhvm`, `php-fpm`, `mysql`, `redis`, `postgres`, `mariadb`, `neo4j`, `mongo`, `apache2`, `caddy`, `memcached`, `beanstalkd`, `beanstalkd-console`, `rabbitmq`, `beanstalkd-console`, `workspace`, `phpmyadmin`, `aerospike`, `pgadmin`, `elasticsearch`, `rethinkdb`, `postgres-postgis`, `certbot`, `mailhog`, `minio` and more...!
+> `nginx`, `hhvm`, `php-fpm`, `mysql`, `redis`, `postgres`, `mariadb`, `neo4j`, `mongo`, `apache2`, `caddy`, `memcached`, `beanstalkd`, `beanstalkd-console`, `rabbitmq`, `beanstalkd-console`, `workspace`, `phpmyadmin`, `adminer`, `aerospike`, `pgadmin`, `elasticsearch`, `rethinkdb`, `postgres-postgis`, `certbot`, `mailhog`, `minio` and more...!
 
 *(Please note that sometimes we forget to update the docs, so check the `docker-compose.yml` file to see an updated list of all available containers).*
 

DOCUMENTATION/_settings/content/introduction/index.md

@@ -169,6 +169,7 @@ What's better than a **Demo Video**:
 	- RabbitMQ Console
 - **Tools:**
 	- PhpMyAdmin
+  - Adminer
 	- PgAdmin
 	- ElasticSearch
 	- Selenium

README.md

@@ -19,7 +19,8 @@ Laradock is a Docker PHP development environment that facilitate running **PHP**
 - [Philippe Trépanier](https://github.com/philtrep) (philtrep)
 - [Mike Erickson](https://github.com/mikeerickson) (mikeerickson)
 - [Dwi Fahni Denni](https://github.com/zeroc0d3) (zeroc0d3)
-- Join Us.
+- [Thor Erik](https://github.com/thorerik) (thorerik)
+- Contribute and join us!
 
 **Amazing Contributors:**
 

adminer/Dockerfile

@@ -0,0 +1,9 @@
+FROM adminer:latest
+
+MAINTAINER Patrick Artounian <partounian@gmail.com>
+
+# Add volume for sessions to allow session persistence
+VOLUME /sessions
+
+# We expose Adminer on port 8080 (Adminer's default)
+EXPOSE 8080

docker-compose.yml

@@ -390,6 +390,17 @@ services:
       networks:
         - frontend
 
+### Adminer Container ####################################
+
+    adminer:
+      build: ./adminer
+      ports:
+        - "${ADM_PORT}:8080"
+      depends_on:
+        - php-fpm
+      networks:
+        - frontend 
+
 ### pgAdmin Container #######################################
 
     pgadmin:
@@ -534,6 +545,8 @@ volumes:
     driver: "local"
   phpmyadmin:
     driver: "local"
+  adminer:
+    driver: "local"
   aerospike:
     driver: "local"
   caddy:

env-example

@@ -122,6 +122,9 @@ PMA_PASSWORD=secret
 PMA_ROOT_PASSWORD=secret
 PMA_PORT=88
 
+### ADMINER Container
+ADM_PORT=88
+
 ### VARNISH Container
 VARNISH_CONFIG=/etc/varnish/default.vcl
 VARNISH_PORT=8080