- split base and utils docker compose configuration

closes #15

Author: r-brown

.env.example

@@ -38,11 +38,11 @@ REDIS_PORT=6379
 
 # Mail
 MAIL_DRIVER=smtp
-MAIL_HOST=smtp.mailtrap.io
-MAIL_PORT=2525
+MAIL_HOST=mailhog
+MAIL_PORT=1025
 MAIL_USERNAME=
 MAIL_PASSWORD=
-MAIL_ENCRYPTION=tls
+MAIL_ENCRYPTION=
 
 # AWS S3
 #AWS_KEY=

README.md

@@ -127,7 +127,7 @@ Now you can browse the site at [http://localhost:8080](http://localhost:8080)  
 Here is a Docker based local development environment prepared, which provides a very flexible and extensible way of building your custom Laravel 5 applications.
 
 ### What's Inside
-This project is based on [docker-compose](https://docs.docker.com/compose/). By default, the following containers are started: _laravel-env (centos:7 based), mysql, phpmyadmin, nginx_. The `/var/www/laravel-boilerplate` directory is the web root which is mapped to the nginx container.
+This project is based on [docker-compose](https://docs.docker.com/compose/). By default, the following containers are started: _laravel-env (centos:7 based), mysql, nginx_. Additional containers (_phpmyadmin, mailhog_) are externalized into `docker-compose.utils.yml`. The `/var/www/laravel-boilerplate` directory is the web root which is mapped to the nginx container.
 You can directly edit configuration files from within the repo as they are mapped to the correct locations in containers.
 
 <p align="center"><img src="https://raw.githubusercontent.com/Labs64/laravel-boilerplate/master/dockerfiles/img/laravel-boilerplate-docker.png" alt="Laravel Boilerplate Docker"></p>
@@ -151,7 +151,9 @@ $ cp .env.example .env
 
 3. Start environment
 ```
-$ docker-compose up -d
+$ docker-compose up -d  # to start base containers
+or
+$ docker-compose -f docker-compose.yml -f docker-compose.utils.yml up -d  # to start base and utils containers
 ```
 
 4. Build project

config/mail.php

@@ -29,7 +29,7 @@
     |
     */
 
-    'host' => env('MAIL_HOST', 'smtp.mailgun.org'),
+    'host' => env('MAIL_HOST', 'mailhog'),
 
     /*
     |--------------------------------------------------------------------------
@@ -42,7 +42,7 @@
     |
     */
 
-    'port' => env('MAIL_PORT', 587),
+    'port' => env('MAIL_PORT', 1025),
 
     /*
     |--------------------------------------------------------------------------
@@ -71,7 +71,7 @@
     |
     */
 
-    'encryption' => env('MAIL_ENCRYPTION', 'tls'),
+    'encryption' => env('MAIL_ENCRYPTION', ''),
 
     /*
     |--------------------------------------------------------------------------

docker-compose.utils.yml

@@ -0,0 +1,18 @@
+version: '2'
+services:
+  mailhog:
+    image: mailhog/mailhog
+    ports:
+      - "1025:1025"
+      - "8025:8025"
+    restart: always
+  phpmyadmin:
+    image: phpmyadmin/phpmyadmin
+    links:
+      - mysql
+    ports:
+      - '8080:80'
+    restart: always
+    environment:
+      PMA_HOST: mysql
+      PMA_PORT: 3306

docker-compose.yml

@@ -2,7 +2,6 @@ version: '2'
 services:
   mysql:
     image: mysql:latest
-    container_name: mysql
     volumes:
       - "./data/db:/var/lib/mysql"
     ports:
@@ -13,20 +12,8 @@ services:
       - MYSQL_DATABASE=laravel_boilerplate
       - MYSQL_USER=root
       - MYSQL_PASSWORD=secret
-  phpmyadmin:
-    image: phpmyadmin/phpmyadmin
-    container_name: phpmyadmin
-    links:
-      - mysql
-    ports:
-      - '8080:80'
-    restart: always
-    environment:
-      PMA_HOST: mysql
-      PMA_PORT: 3306
   laravel-env:
     build: ./dockerfiles
-    container_name: laravel-env
     depends_on:
       - mysql
     volumes:
@@ -37,7 +24,6 @@ services:
       - "./dockerfiles/config/php/xdebug.ini:/usr/local/etc/php/conf.d/xdebug.ini"
   nginx:
     image: nginx:latest
-    container_name: nginx
     depends_on:
       - laravel-env
     volumes: