Backport more tools for work flavour

Author: cytopia

.ansible/DOCKERFILES/Dockerfile-slim.j2

@@ -75,7 +75,7 @@ RUN set -eux \
 {%- endif %}
 
 ###
-### Add common build tools
+### Add common tools
 ###
 RUN set -eux \
 	&& DEBIAN_FRONTEND=noninteractive apt-get update \
@@ -90,6 +90,32 @@ RUN set -eux \
 		redis-tools \
 		sqlite3
 
+{% set tools_apt = [] -%}
+{%- for tool in base_software_enabled -%}
+	{%- if ('disabled' not in base_software_available[tool]) or (php_version not in base_software_available[tool]['disabled']) -%}
+		{%- if fn.tool_apt_get_package(php_version, tool, base_software_available) -%}
+			{{- tools_apt.append(fn.tool_apt_get_package(php_version, tool, base_software_available)) -}}
+		{%- endif -%}
+	{%- endif -%}
+{%- endfor %}
+
+{%- if tools_apt -%}
+###
+### Install tools type: apt
+###
+RUN set -eux \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
+	{{- "\n" -}}
+	{%- if tools_apt -%}
+		{{- "\t\t# ---------- type: apt ----------\n" -}}
+		{%- for apt in tools_apt | unique | sort -%}
+				{{- "\t\t" + apt + " \\" + "\n" -}}
+		{%- endfor -%}
+	{%- endif -%}
+	{{- "\t" -}}&& rm -rf /var/lib/apt/lists/*{{- "\n" -}}
+{% endif %}
+
 ###
 ### Devilbox required cli tools from group_vars (slim.yml)
 ###
@@ -226,6 +252,32 @@ RUN set -eux \
 FROM devilbox/php-fpm:{{ php_version }}-prod as devilbox-slim-base
 ARG ARCH
 
+{% set tools_apt = [] -%}
+{%- for tool in base_software_enabled -%}
+	{%- if ('disabled' not in base_software_available[tool]) or (php_version not in base_software_available[tool]['disabled']) -%}
+		{%- if fn.tool_apt_get_package(php_version, tool, base_software_available) -%}
+			{{- tools_apt.append(fn.tool_apt_get_package(php_version, tool, base_software_available)) -}}
+		{%- endif -%}
+	{%- endif -%}
+{%- endfor %}
+
+{%- if tools_apt -%}
+###
+### Install tools type: apt
+###
+RUN set -eux \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
+	{{- "\n" -}}
+	{%- if tools_apt -%}
+		{{- "\t\t# ---------- type: apt ----------\n" -}}
+		{%- for apt in tools_apt | unique | sort -%}
+				{{- "\t\t" + apt + " \\" + "\n" -}}
+		{%- endfor -%}
+	{%- endif -%}
+	{{- "\t" -}}&& rm -rf /var/lib/apt/lists/*{{- "\n" -}}
+{% endif %}
+
 ###
 ### Copy shared libraries (required by MongoDB, MySQL, PostgreSQL and Redis)
 ###

.ansible/DOCKERFILES/Dockerfile-work.j2

@@ -143,7 +143,7 @@ RUN set -eux \
 		{{ run_dep }} \
 {% endfor %}
 	&& rm -rf /var/lib/apt/lists/*
-{%- endif %}
+{% endif %}
 
 ###
 ### Copy nvm

.ansible/group_vars/all/slim.yml

@@ -74,6 +74,9 @@ base_apt_repositories_enabled:
 # Software to install (in defined order)
 # -------------------------------------------------------------------------------------------------
 base_software_enabled:
+  - dig     # required by Devilbox Intranet
+  - netcat  # required by Devilbox Intranet
+  - ping    # required by Devilbox Intranet
   - blackfire
   - mhsendmail
   - mongo_client
@@ -253,6 +256,33 @@ base_apt_repositories_available:
 #
 base_software_available:
 
+  ###
+  ### dig
+  ###
+  dig:
+    check: dig -v 2>&1 | grep -E '[0-9]\.[0-9]'
+    all:
+      type: apt
+      package: dnsutils
+
+  ###
+  ### netcat
+  ###
+  netcat:
+    check: nc -h 2>&1 | grep netcat
+    all:
+      type: apt
+      package: netcat-openbsd
+
+  ###
+  ### ping
+  ###
+  ping:
+    check: ping -V | grep ^ping
+    all:
+      type: apt
+      package: iputils-ping
+
   ###
   ### Blackfire
   ###

.ansible/group_vars/all/work-help.yml

@@ -59,6 +59,7 @@ help_software_available:
         && chmod +x /usr/local/bin/composer-2 \
       post: |
         ln -sf /usr/local/bin/composer-2 /usr/local/bin/composer \
+      run_dep: [unzip]  # Required for composer to unzip packages
     7.1:
       type: custom
       pre: |