From 4e379233e1952b62bb374c7617c2339399e7d2a6 Mon Sep 17 00:00:00 2001
From: Alexey Pustovalov <alexey.pustovalov@zabbix.com>
Date: Tue, 17 Dec 2024 14:36:06 +0900
Subject: [PATCH] Added bash package to all images

---
 Dockerfiles/agent2/ubuntu/Dockerfile       | 3 ++-
 Dockerfiles/proxy-mysql/centos/Dockerfile  | 3 ++-
 Dockerfiles/proxy-mysql/ol/Dockerfile      | 3 ++-
 Dockerfiles/proxy-sqlite3/ol/Dockerfile    | 3 ++-
 Dockerfiles/server-mysql/centos/Dockerfile | 3 ++-
 Dockerfiles/server-pgsql/centos/Dockerfile | 3 ++-
 Dockerfiles/server-pgsql/ol/Dockerfile     | 3 ++-
 7 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/Dockerfiles/agent2/ubuntu/Dockerfile b/Dockerfiles/agent2/ubuntu/Dockerfile
index 29fe89824..e3785a9fb 100644
--- a/Dockerfiles/agent2/ubuntu/Dockerfile
+++ b/Dockerfiles/agent2/ubuntu/Dockerfile
@@ -33,7 +33,8 @@ COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}-output/agent2/conf/", "/etc/zab
 RUN --mount=type=cache,target=/var/lib/apt/,sharing=locked \
     set -eux && \
     echo "#!/bin/sh\nexit 101" > /usr/sbin/policy-rc.d && \
-    INSTALL_PKGS="tini \
+    INSTALL_PKGS="bash \
+            tini \
             tzdata \
             ca-certificates \
             smartmontools \
diff --git a/Dockerfiles/proxy-mysql/centos/Dockerfile b/Dockerfiles/proxy-mysql/centos/Dockerfile
index a2e38a272..7e2907431 100644
--- a/Dockerfiles/proxy-mysql/centos/Dockerfile
+++ b/Dockerfiles/proxy-mysql/centos/Dockerfile
@@ -35,7 +35,8 @@ COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}-output/proxy/database/mysql/",
 
 RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
     set -eux && \
-    INSTALL_PKGS="libevent \
+    INSTALL_PKGS="bash \
+            libevent \
             tini \
             traceroute \
             nmap \
diff --git a/Dockerfiles/proxy-mysql/ol/Dockerfile b/Dockerfiles/proxy-mysql/ol/Dockerfile
index daf2f9ee5..462ef1bae 100644
--- a/Dockerfiles/proxy-mysql/ol/Dockerfile
+++ b/Dockerfiles/proxy-mysql/ol/Dockerfile
@@ -36,7 +36,8 @@ COPY ["conf/etc/yum.repos.d/oracle-epel-ol9.repo", "/etc/yum.repos.d/oracle-epel
 
 RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
     set -eux && \
-    INSTALL_PKGS="libevent \
+    INSTALL_PKGS="bash \
+            libevent \
             tini \
             traceroute \
             nmap \
diff --git a/Dockerfiles/proxy-sqlite3/ol/Dockerfile b/Dockerfiles/proxy-sqlite3/ol/Dockerfile
index aa8533c33..f67e4a278 100644
--- a/Dockerfiles/proxy-sqlite3/ol/Dockerfile
+++ b/Dockerfiles/proxy-sqlite3/ol/Dockerfile
@@ -35,7 +35,8 @@ COPY ["conf/etc/yum.repos.d/oracle-epel-ol9.repo", "/etc/yum.repos.d/oracle-epel
 
 RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
     set -eux && \
-    INSTALL_PKGS="libevent \
+    INSTALL_PKGS="bash \
+            libevent \
             tini \
             traceroute \
             nmap \
diff --git a/Dockerfiles/server-mysql/centos/Dockerfile b/Dockerfiles/server-mysql/centos/Dockerfile
index 4ba5b8fea..64c17908c 100644
--- a/Dockerfiles/server-mysql/centos/Dockerfile
+++ b/Dockerfiles/server-mysql/centos/Dockerfile
@@ -35,7 +35,8 @@ COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}-output/server/database/mysql/cr
 
 RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
     set -eux && \
-    INSTALL_PKGS="fping \
+    INSTALL_PKGS="bash \
+            fping \
             tini \
             traceroute \
             nmap \
diff --git a/Dockerfiles/server-pgsql/centos/Dockerfile b/Dockerfiles/server-pgsql/centos/Dockerfile
index 36539b065..c13134435 100644
--- a/Dockerfiles/server-pgsql/centos/Dockerfile
+++ b/Dockerfiles/server-pgsql/centos/Dockerfile
@@ -35,7 +35,8 @@ COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}-output/server/database/postgres
 
 RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
     set -eux && \
-    INSTALL_PKGS="fping \
+    INSTALL_PKGS="bash \
+            fping \
             tini \
             file-libs \
             traceroute \
diff --git a/Dockerfiles/server-pgsql/ol/Dockerfile b/Dockerfiles/server-pgsql/ol/Dockerfile
index 4cad14488..e8a5e5519 100644
--- a/Dockerfiles/server-pgsql/ol/Dockerfile
+++ b/Dockerfiles/server-pgsql/ol/Dockerfile
@@ -36,7 +36,8 @@ COPY ["conf/etc/yum.repos.d/oracle-epel-ol9.repo", "/etc/yum.repos.d/oracle-epel
 
 RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
     set -eux && \
-    INSTALL_PKGS="fping \
+    INSTALL_PKGS="bash \
+            fping \
             file-libs \
             tini \
             hostname \