Merge branch 'laradock:master' into master

.env.example

@@ -205,6 +205,7 @@ WORKSPACE_INSTALL_TRADER=false
 WORKSPACE_PROTOC_VERSION=latest
 WORKSPACE_INSTALL_MEMCACHED=true
 WORKSPACE_INSTALL_EVENT=false
+WORKSPACE_INSTALL_DNSUTILS=true
 WORKSPACE_XDEBUG_PORT=9003
 
 ### PHP_FPM ###############################################
@@ -279,6 +280,7 @@ PHP_FPM_INSTALL_DOCKER_CLIENT=false
 PHP_FPM_DEFAULT_LOCALE=POSIX
 PHP_FPM_XDEBUG_PORT=9003
 PHP_FPM_INSTALL_EVENT=false
+PHP_FPM_INSTALL_DNSUTILS=true
 
 PHP_FPM_PUID=1000
 PHP_FPM_PGID=1000

DOCUMENTATION/content/documentation/index.md

@@ -2253,6 +2253,31 @@ For configuration information, visit the [bash-git-prompt repository](https://gi
 <a name="Install-Oh-My-Zsh"></a>
 ## Install Oh My ZSH
 
+
+
+
+<br>
+<a name="Install-Dnsutils"></a>
+## Install Dnsutils
+
+1 - First install `dnsutils` in the Workspace and the PHP-FPM Containers:
+<br>
+a) open the `.env` file
+<br>
+b) search for the `WORKSPACE_INSTALL_DNSUTILS` argument under the Workspace Container
+<br>
+c) set it to `true`
+<br>
+d) search for the `PHP_FPM_INSTALL_DNSUTILS` argument under the PHP-FPM Container
+<br>
+e) set it to `true`
+<br>
+
+2 - Re-build the containers `docker-compose build workspace php-fpm`
+
+
+
+
 > With the Laravel autocomplete plugin.
 
 [Zsh](https://en.wikipedia.org/wiki/Z_shell) is an extended Bourne shell with many improvements, including some features of Bash, ksh, and tcsh.

DOCUMENTATION/content/introduction/index.md

@@ -180,6 +180,7 @@ That's it! enjoy :)
          - `SOAP` 
          - `Drush` 
          - `Wordpress CLI`
+         - `dnsutils`
     - Apache ZooKeeper *(Centralized service for distributed systems to a hierarchical key-value store)*
     - Kibana *(Visualize your Elasticsearch data and navigate the Elastic Stack)*
     - Dejavu *(Edit your Elasticsearch data)*

docker-compose.yml

@@ -175,6 +175,7 @@ services:
           - INSTALL_DOCKER_CLIENT=${WORKSPACE_INSTALL_DOCKER_CLIENT}
           - INSTALL_MEMCACHED=${WORKSPACE_INSTALL_MEMCACHED}
           - INSTALL_EVENT=${WORKSPACE_INSTALL_EVENT}
+          - INSTALL_DNSUTILS=${WORKSPACE_INSTALL_DNSUTILS}
           - http_proxy
           - https_proxy
           - no_proxy
@@ -289,6 +290,7 @@ services:
           - PHP_FPM_NEW_RELIC_KEY=${PHP_FPM_NEW_RELIC_KEY}
           - PHP_FPM_NEW_RELIC_APP_NAME=${PHP_FPM_NEW_RELIC_APP_NAME}
           - INSTALL_DOCKER_CLIENT=${PHP_FPM_INSTALL_DOCKER_CLIENT}
+          - INSTALL_DNSUTILS=${PHP_FPM_INSTALL_DNSUTILS}
           - http_proxy
           - https_proxy
           - no_proxy

maildev/Dockerfile

@@ -1,5 +1,5 @@
-FROM djfarrelly/maildev
+FROM maildev/maildev
 
-LABEL maintainer="Maxime Hélias <maximehelias16@gmail.com>"
+LABEL maintainer="Dan Farrelly"
 
 EXPOSE 80 25

php-fpm/Dockerfile

@@ -1257,6 +1257,18 @@ RUN set -eux; \
       php -m  | grep -q 'event' \
 ;fi
 
+###########################################################################
+# DNS utilities:
+###########################################################################
+
+USER root
+
+ARG INSTALL_DNSUTILS=false
+
+RUN if [ ${INSTALL_DNSUTILS} = true ]; then \
+    apt-get update && apt-get install -y dnsutils \
+;fi
+
 ###########################################################################
 # Check PHP version:
 ###########################################################################

workspace/Dockerfile

@@ -1763,7 +1763,17 @@ RUN set -eux; \
       php -m  | grep -q 'event' \
 ;fi
 
+###########################################################################
+# DNS utilities:
+###########################################################################
 
+USER root
+
+ARG INSTALL_DNSUTILS=false
+
+RUN if [ ${INSTALL_DNSUTILS} = true ]; then \
+    apt-get update && apt-get install -y dnsutils \
+;fi
 
 #
 #--------------------------------------------------------------------------