From 045cd075b96dea90cd7d1f2b18904e695876c1c8 Mon Sep 17 00:00:00 2001
From: Silas de Rooy <silas@mailcamp.nl>
Date: Thu, 13 Oct 2022 12:53:56 +0200
Subject: [PATCH] add dnsutils extension to workspace asn php-fmp

---
 .env.example                                 |  2 ++
 DOCUMENTATION/content/documentation/index.md | 25 ++++++++++++++++++++
 DOCUMENTATION/content/introduction/index.md  |  1 +
 docker-compose.yml                           |  2 ++
 php-fpm/Dockerfile                           | 12 ++++++++++
 workspace/Dockerfile                         | 10 ++++++++
 6 files changed, 52 insertions(+)

diff --git a/.env.example b/.env.example
index fcf07853..9d9e0fe9 100644
--- a/.env.example
+++ b/.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
 
 ### PHP_FPM ###############################################
 
@@ -278,6 +279,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
diff --git a/DOCUMENTATION/content/documentation/index.md b/DOCUMENTATION/content/documentation/index.md
index 83ddacd3..2bf05578 100644
--- a/DOCUMENTATION/content/documentation/index.md
+++ b/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-Extension"></a>
+## Install Dnsutils extension
+
+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.
diff --git a/DOCUMENTATION/content/introduction/index.md b/DOCUMENTATION/content/introduction/index.md
index d1997b36..ad0f7c99 100644
--- a/DOCUMENTATION/content/introduction/index.md
+++ b/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)*
diff --git a/docker-compose.yml b/docker-compose.yml
index 74fb92c2..f99c3ac0 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -174,6 +174,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
@@ -287,6 +288,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
diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile
index 46ecbaf2..04a29552 100644
--- a/php-fpm/Dockerfile
+++ b/php-fpm/Dockerfile
@@ -1270,6 +1270,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:
 ###########################################################################
diff --git a/workspace/Dockerfile b/workspace/Dockerfile
index 5eee6679..36c18385 100644
--- a/workspace/Dockerfile
+++ b/workspace/Dockerfile
@@ -1773,7 +1773,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
 
 #
 #--------------------------------------------------------------------------