From 79f91a9d7bb27440a77236fb281621cabce81cef Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Wed, 20 Jul 2022 17:37:00 +0300 Subject: [PATCH] Added nmap and traceroute utilities to server / proxy images --- Dockerfiles/proxy-mysql/alpine/Dockerfile | 2 ++ Dockerfiles/proxy-mysql/centos/Dockerfile | 2 ++ Dockerfiles/proxy-mysql/ol/Dockerfile | 2 ++ Dockerfiles/proxy-mysql/rhel/Dockerfile | 2 ++ Dockerfiles/proxy-mysql/ubuntu/Dockerfile | 2 ++ Dockerfiles/proxy-sqlite3/alpine/Dockerfile | 2 ++ Dockerfiles/proxy-sqlite3/centos/Dockerfile | 2 ++ Dockerfiles/proxy-sqlite3/ol/Dockerfile | 2 ++ Dockerfiles/proxy-sqlite3/rhel/Dockerfile | 2 ++ Dockerfiles/proxy-sqlite3/ubuntu/Dockerfile | 2 ++ Dockerfiles/server-mysql/alpine/Dockerfile | 2 ++ Dockerfiles/server-mysql/centos/Dockerfile | 2 ++ Dockerfiles/server-mysql/ol/Dockerfile | 2 ++ Dockerfiles/server-mysql/rhel/Dockerfile | 2 ++ Dockerfiles/server-mysql/ubuntu/Dockerfile | 2 ++ Dockerfiles/server-pgsql/alpine/Dockerfile | 2 ++ Dockerfiles/server-pgsql/centos/Dockerfile | 2 ++ Dockerfiles/server-pgsql/ol/Dockerfile | 2 ++ Dockerfiles/server-pgsql/ubuntu/Dockerfile | 2 ++ 19 files changed, 38 insertions(+) diff --git a/Dockerfiles/proxy-mysql/alpine/Dockerfile b/Dockerfiles/proxy-mysql/alpine/Dockerfile index 12059784c..01956c560 100644 --- a/Dockerfiles/proxy-mysql/alpine/Dockerfile +++ b/Dockerfiles/proxy-mysql/alpine/Dockerfile @@ -36,6 +36,8 @@ COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/database/mysql/create_proxy.sql RUN set -eux && \ INSTALL_PKGS="bash \ tini \ + traceroute \ + nmap \ iputils \ libcurl \ libevent \ diff --git a/Dockerfiles/proxy-mysql/centos/Dockerfile b/Dockerfiles/proxy-mysql/centos/Dockerfile index 76fcdb8fe..e80178934 100644 --- a/Dockerfiles/proxy-mysql/centos/Dockerfile +++ b/Dockerfiles/proxy-mysql/centos/Dockerfile @@ -37,6 +37,8 @@ RUN set -eux && \ REPOLIST="baseos,appstream,epel" && \ INSTALL_PKGS="libevent \ tini \ + traceroute \ + nmap \ gzip \ libssh \ file-libs \ diff --git a/Dockerfiles/proxy-mysql/ol/Dockerfile b/Dockerfiles/proxy-mysql/ol/Dockerfile index a66a4ad9e..fa19d24b8 100644 --- a/Dockerfiles/proxy-mysql/ol/Dockerfile +++ b/Dockerfiles/proxy-mysql/ol/Dockerfile @@ -37,6 +37,8 @@ COPY ["conf/etc/yum.repos.d/oracle-epel-ol8.repo", "/etc/yum.repos.d/oracle-epel RUN set -eux && \ INSTALL_PKGS="libevent \ tini \ + traceroute \ + nmap \ gzip \ libssh \ file-libs \ diff --git a/Dockerfiles/proxy-mysql/rhel/Dockerfile b/Dockerfiles/proxy-mysql/rhel/Dockerfile index 532e703d2..8a7f92106 100644 --- a/Dockerfiles/proxy-mysql/rhel/Dockerfile +++ b/Dockerfiles/proxy-mysql/rhel/Dockerfile @@ -55,6 +55,8 @@ COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/database/mysql/create_proxy.sql RUN set -eux && \ INSTALL_PKGS="bash \ tini \ + traceroute \ + nmap \ shadow-utils \ fping \ iputils \ diff --git a/Dockerfiles/proxy-mysql/ubuntu/Dockerfile b/Dockerfiles/proxy-mysql/ubuntu/Dockerfile index 4a21082ce..da17efad4 100644 --- a/Dockerfiles/proxy-mysql/ubuntu/Dockerfile +++ b/Dockerfiles/proxy-mysql/ubuntu/Dockerfile @@ -37,6 +37,8 @@ COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/database/mysql/create_proxy.sql RUN set -eux && \ echo "#!/bin/sh\nexit 101" > /usr/sbin/policy-rc.d && \ INSTALL_PKGS="tini \ + traceroute \ + nmap \ ca-certificates \ fping \ libcurl4 \ diff --git a/Dockerfiles/proxy-sqlite3/alpine/Dockerfile b/Dockerfiles/proxy-sqlite3/alpine/Dockerfile index 5c05e7628..547551c8f 100644 --- a/Dockerfiles/proxy-sqlite3/alpine/Dockerfile +++ b/Dockerfiles/proxy-sqlite3/alpine/Dockerfile @@ -35,6 +35,8 @@ COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/conf/zabbix_proxy.conf", "/etc/ RUN set -eux && \ INSTALL_PKGS="bash \ tini \ + traceroute \ + nmap \ fping \ iputils \ libcurl \ diff --git a/Dockerfiles/proxy-sqlite3/centos/Dockerfile b/Dockerfiles/proxy-sqlite3/centos/Dockerfile index b86b53263..88f97b56d 100644 --- a/Dockerfiles/proxy-sqlite3/centos/Dockerfile +++ b/Dockerfiles/proxy-sqlite3/centos/Dockerfile @@ -36,6 +36,8 @@ RUN set -eux && \ REPOLIST="baseos,appstream,epel" && \ INSTALL_PKGS="libevent \ tini \ + traceroute \ + nmap \ libssh \ fping \ file-libs \ diff --git a/Dockerfiles/proxy-sqlite3/ol/Dockerfile b/Dockerfiles/proxy-sqlite3/ol/Dockerfile index 130aa410a..6a8d1d238 100644 --- a/Dockerfiles/proxy-sqlite3/ol/Dockerfile +++ b/Dockerfiles/proxy-sqlite3/ol/Dockerfile @@ -36,6 +36,8 @@ COPY ["conf/etc/yum.repos.d/oracle-epel-ol8.repo", "/etc/yum.repos.d/oracle-epel RUN set -eux && \ INSTALL_PKGS="libevent \ tini \ + traceroute \ + nmap \ libssh \ fping \ file-libs \ diff --git a/Dockerfiles/proxy-sqlite3/rhel/Dockerfile b/Dockerfiles/proxy-sqlite3/rhel/Dockerfile index 372188a13..b9b473373 100644 --- a/Dockerfiles/proxy-sqlite3/rhel/Dockerfile +++ b/Dockerfiles/proxy-sqlite3/rhel/Dockerfile @@ -54,6 +54,8 @@ COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/conf/zabbix_proxy.conf", "/etc/ RUN set -eux && \ INSTALL_PKGS="bash \ tini \ + traceroute \ + nmap \ shadow-utils \ fping \ iputils \ diff --git a/Dockerfiles/proxy-sqlite3/ubuntu/Dockerfile b/Dockerfiles/proxy-sqlite3/ubuntu/Dockerfile index 364c93af1..44df45cb2 100644 --- a/Dockerfiles/proxy-sqlite3/ubuntu/Dockerfile +++ b/Dockerfiles/proxy-sqlite3/ubuntu/Dockerfile @@ -36,6 +36,8 @@ RUN set -eux && \ echo "#!/bin/sh\nexit 101" > /usr/sbin/policy-rc.d && \ INSTALL_PKGS="bash \ tini \ + traceroute \ + nmap \ ca-certificates \ fping \ libcurl4 \ diff --git a/Dockerfiles/server-mysql/alpine/Dockerfile b/Dockerfiles/server-mysql/alpine/Dockerfile index 321c060cb..a96b071ee 100644 --- a/Dockerfiles/server-mysql/alpine/Dockerfile +++ b/Dockerfiles/server-mysql/alpine/Dockerfile @@ -37,6 +37,8 @@ RUN set -eux && \ INSTALL_PKGS="bash \ tini \ fping \ + traceroute \ + nmap \ tzdata \ iputils \ libcurl \ diff --git a/Dockerfiles/server-mysql/centos/Dockerfile b/Dockerfiles/server-mysql/centos/Dockerfile index 690844d94..6af02ebfa 100644 --- a/Dockerfiles/server-mysql/centos/Dockerfile +++ b/Dockerfiles/server-mysql/centos/Dockerfile @@ -37,6 +37,8 @@ RUN set -eux && \ REPOLIST="baseos,appstream,epel" && \ INSTALL_PKGS="fping \ tini \ + traceroute \ + nmap \ file-libs \ tzdata \ iputils \ diff --git a/Dockerfiles/server-mysql/ol/Dockerfile b/Dockerfiles/server-mysql/ol/Dockerfile index 0d35c6a1f..7600c6f3c 100644 --- a/Dockerfiles/server-mysql/ol/Dockerfile +++ b/Dockerfiles/server-mysql/ol/Dockerfile @@ -38,6 +38,8 @@ RUN set -eux && \ INSTALL_PKGS="bash \ fping \ tini \ + traceroute \ + nmap \ file-libs \ tzdata \ iputils \ diff --git a/Dockerfiles/server-mysql/rhel/Dockerfile b/Dockerfiles/server-mysql/rhel/Dockerfile index bfc470211..bf27c77b9 100644 --- a/Dockerfiles/server-mysql/rhel/Dockerfile +++ b/Dockerfiles/server-mysql/rhel/Dockerfile @@ -55,6 +55,8 @@ COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/database/mysql/create_server.sq RUN set -eux && \ INSTALL_PKGS="bash \ tini \ + traceroute \ + nmap \ fping \ shadow-utils \ tzdata \ diff --git a/Dockerfiles/server-mysql/ubuntu/Dockerfile b/Dockerfiles/server-mysql/ubuntu/Dockerfile index 647e00c62..942883e9a 100644 --- a/Dockerfiles/server-mysql/ubuntu/Dockerfile +++ b/Dockerfiles/server-mysql/ubuntu/Dockerfile @@ -37,6 +37,8 @@ RUN set -eux && \ echo "#!/bin/sh\nexit 101" > /usr/sbin/policy-rc.d && \ INSTALL_PKGS="bash \ tini \ + traceroute \ + nmap \ tzdata \ ca-certificates \ iputils-ping \ diff --git a/Dockerfiles/server-pgsql/alpine/Dockerfile b/Dockerfiles/server-pgsql/alpine/Dockerfile index b4697264a..34e2b1f94 100644 --- a/Dockerfiles/server-pgsql/alpine/Dockerfile +++ b/Dockerfiles/server-pgsql/alpine/Dockerfile @@ -37,6 +37,8 @@ COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/database/postgresql/timescaledb RUN set -eux && \ INSTALL_PKGS="bash \ tini \ + traceroute \ + nmap \ fping \ tzdata \ iputils \ diff --git a/Dockerfiles/server-pgsql/centos/Dockerfile b/Dockerfiles/server-pgsql/centos/Dockerfile index 9cf6cc2a0..7b31bd58b 100644 --- a/Dockerfiles/server-pgsql/centos/Dockerfile +++ b/Dockerfiles/server-pgsql/centos/Dockerfile @@ -39,6 +39,8 @@ RUN set -eux && \ INSTALL_PKGS="fping \ file-libs \ tini \ + traceroute \ + nmap \ iputils \ tzdata \ traceroute \ diff --git a/Dockerfiles/server-pgsql/ol/Dockerfile b/Dockerfiles/server-pgsql/ol/Dockerfile index c0d3de6df..76369769e 100644 --- a/Dockerfiles/server-pgsql/ol/Dockerfile +++ b/Dockerfiles/server-pgsql/ol/Dockerfile @@ -39,6 +39,8 @@ RUN set -eux && \ INSTALL_PKGS="fping \ file-libs \ tini \ + traceroute \ + nmap \ iputils \ tzdata \ traceroute \ diff --git a/Dockerfiles/server-pgsql/ubuntu/Dockerfile b/Dockerfiles/server-pgsql/ubuntu/Dockerfile index 55732e957..66b6a9937 100644 --- a/Dockerfiles/server-pgsql/ubuntu/Dockerfile +++ b/Dockerfiles/server-pgsql/ubuntu/Dockerfile @@ -38,6 +38,8 @@ RUN set -eux && \ echo "#!/bin/sh\nexit 101" > /usr/sbin/policy-rc.d && \ INSTALL_PKGS="bash \ tini \ + traceroute \ + nmap \ tzdata \ ca-certificates \ iputils-ping \