From 8e556008d883a953a9068347a1e5344c9d385ba4 Mon Sep 17 00:00:00 2001 From: Maxime Helias Date: Sat, 14 Oct 2017 20:01:16 +0200 Subject: [PATCH] Add MailDev Container --- .travis.yml | 6 +++--- DOCUMENTATION/content/introduction/index.md | 2 +- docker-compose.yml | 11 +++++++++++ env-example | 5 +++++ maildev/Dockerfile | 5 +++++ 5 files changed, 25 insertions(+), 4 deletions(-) create mode 100644 maildev/Dockerfile diff --git a/.travis.yml b/.travis.yml index f54fc735..887b61ac 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,9 +33,9 @@ env: - PHP_VERSION=70 BUILD_SERVICE=aerospike - PHP_VERSION=71 BUILD_SERVICE=aerospike - - PHP_VERSION=56 BUILD_SERVICE="memcached beanstalkd beanstalkd-console rabbitmq adminer elasticsearch certbot mailhog selenium jenkins proxy proxy2 balancer" - - PHP_VERSION=70 BUILD_SERVICE="memcached beanstalkd beanstalkd-console rabbitmq adminer elasticsearch certbot mailhog selenium jenkins proxy proxy2 balancer" - - PHP_VERSION=71 BUILD_SERVICE="memcached beanstalkd beanstalkd-console rabbitmq adminer elasticsearch certbot mailhog selenium jenkins proxy proxy2 balancer" + - PHP_VERSION=56 BUILD_SERVICE="memcached beanstalkd beanstalkd-console rabbitmq adminer elasticsearch certbot mailhog maildev selenium jenkins proxy proxy2 balancer" + - PHP_VERSION=70 BUILD_SERVICE="memcached beanstalkd beanstalkd-console rabbitmq adminer elasticsearch certbot mailhog maildev selenium jenkins proxy proxy2 balancer" + - PHP_VERSION=71 BUILD_SERVICE="memcached beanstalkd beanstalkd-console rabbitmq adminer elasticsearch certbot mailhog maildev selenium jenkins proxy proxy2 balancer" - HUGO_VERSION=0.20.2 diff --git a/DOCUMENTATION/content/introduction/index.md b/DOCUMENTATION/content/introduction/index.md index 115a79c6..58e35680 100644 --- a/DOCUMENTATION/content/introduction/index.md +++ b/DOCUMENTATION/content/introduction/index.md @@ -97,7 +97,7 @@ Beanstalkd - RabbitMQ - PHP Worker - **Queueing Management:** Beanstalkd Console - RabbitMQ Console - **Random Tools:** -HAProxy - Certbot - Blackfire - Selenium - Jenkins - ElasticSearch - Kibana - Mailhog - Minio - Varnish - Swoole - Laravel Echo... +HAProxy - Certbot - Blackfire - Selenium - Jenkins - ElasticSearch - Kibana - Mailhog - MailDev - Minio - Varnish - Swoole - Laravel Echo... Laradock introduces the **Workspace** Image, as a development environment. It contains a rich set of helpful tools, all pre-configured to work and integrate with almost any combination of Containers and tools you may choose. diff --git a/docker-compose.yml b/docker-compose.yml index e0fee7de..ae47a28d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -550,6 +550,17 @@ services: - frontend - backend +### MailDev Container ####################################### + + maildev: + build: ./maildev + ports: + - "${MAILDEV_HTTP_PORT}:80" + - "${MAILDEV_SMTP_PORT}:25" + networks: + - frontend + - backend + ### Selenium Container ######################################## selenium: diff --git a/env-example b/env-example index 0fe6ddb8..52cfb46f 100644 --- a/env-example +++ b/env-example @@ -205,6 +205,11 @@ PMA_PASSWORD=secret PMA_ROOT_PASSWORD=secret PMA_PORT=8080 +### MAILDEV ############################################################################################################ + +MAILDEV_HTTP_PORT=1080 +MAILDEV_SMTP_PORT=25 + ### VARNISH ############################################################################################################ VARNISH_CONFIG=/etc/varnish/default.vcl diff --git a/maildev/Dockerfile b/maildev/Dockerfile new file mode 100644 index 00000000..4484c832 --- /dev/null +++ b/maildev/Dockerfile @@ -0,0 +1,5 @@ +FROM djfarrelly/maildev + +MAINTAINER Maxime Hélias + +EXPOSE 80 25