From e144605e635424e336ee8bc4bd3387714b04a3ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Terje=20Bra=CC=8Aten?= Date: Fri, 5 Aug 2022 14:56:04 +0100 Subject: [PATCH 1/4] Use the maintained version of maildev --- maildev/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/maildev/Dockerfile b/maildev/Dockerfile index c12e3ba..6513fb4 100644 --- a/maildev/Dockerfile +++ b/maildev/Dockerfile @@ -1,5 +1,5 @@ -FROM djfarrelly/maildev +FROM maildev/maildev -LABEL maintainer="Maxime Hélias " +LABEL maintainer="Dan Farrelly" EXPOSE 80 25 From 045cd075b96dea90cd7d1f2b18904e695876c1c8 Mon Sep 17 00:00:00 2001 From: Silas de Rooy Date: Thu, 13 Oct 2022 12:53:56 +0200 Subject: [PATCH 2/4] 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 fcf0785..9d9e0fe 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 83ddacd..2bf0557 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 ## Install Oh My ZSH + + + +
+ +## Install Dnsutils extension + +1 - First install `dnsutils` in the Workspace and the PHP-FPM Containers: +
+a) open the `.env` file +
+b) search for the `WORKSPACE_INSTALL_DNSUTILS` argument under the Workspace Container +
+c) set it to `true` +
+d) search for the `PHP_FPM_INSTALL_DNSUTILS` argument under the PHP-FPM Container +
+e) set it to `true` +
+ +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 d1997b3..ad0f7c9 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 74fb92c..f99c3ac 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 46ecbaf..04a2955 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 5eee667..36c1838 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 # #-------------------------------------------------------------------------- From 71ae532527901e5e3a19d0dae3661a3078381471 Mon Sep 17 00:00:00 2001 From: Silas de Rooy Date: Thu, 13 Oct 2022 13:01:09 +0200 Subject: [PATCH 3/4] dnsutils is a package --- DOCUMENTATION/content/documentation/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DOCUMENTATION/content/documentation/index.md b/DOCUMENTATION/content/documentation/index.md index 2bf0557..0ac9950 100644 --- a/DOCUMENTATION/content/documentation/index.md +++ b/DOCUMENTATION/content/documentation/index.md @@ -2257,7 +2257,7 @@ For configuration information, visit the [bash-git-prompt repository](https://gi
- + ## Install Dnsutils extension 1 - First install `dnsutils` in the Workspace and the PHP-FPM Containers: From b8501c0a2b2aa4caaaff0e562929bc9a1727f9e7 Mon Sep 17 00:00:00 2001 From: Silas de Rooy Date: Thu, 13 Oct 2022 13:02:40 +0200 Subject: [PATCH 4/4] removed extension word --- DOCUMENTATION/content/documentation/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DOCUMENTATION/content/documentation/index.md b/DOCUMENTATION/content/documentation/index.md index 0ac9950..14b4d5a 100644 --- a/DOCUMENTATION/content/documentation/index.md +++ b/DOCUMENTATION/content/documentation/index.md @@ -2258,7 +2258,7 @@ For configuration information, visit the [bash-git-prompt repository](https://gi
-## Install Dnsutils extension +## Install Dnsutils 1 - First install `dnsutils` in the Workspace and the PHP-FPM Containers: