From 4d67975f5cba0d186d7cf10c9c81d53081e0a644 Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Thu, 16 Jan 2025 13:53:02 +0900 Subject: [PATCH] Added OpenSSL package to server and sqlite3 images. Required to perform rehash of added CA certificates --- Dockerfiles/proxy-mysql/alpine/Dockerfile | 1 + Dockerfiles/proxy-mysql/alpine/docker-entrypoint.sh | 2 ++ Dockerfiles/proxy-mysql/centos/Dockerfile | 1 + Dockerfiles/proxy-mysql/centos/docker-entrypoint.sh | 2 ++ Dockerfiles/proxy-mysql/ol/Dockerfile | 1 + Dockerfiles/proxy-mysql/ol/docker-entrypoint.sh | 2 ++ Dockerfiles/proxy-mysql/rhel/Dockerfile | 1 + Dockerfiles/proxy-mysql/rhel/docker-entrypoint.sh | 2 ++ Dockerfiles/proxy-mysql/ubuntu/Dockerfile | 1 + Dockerfiles/proxy-mysql/ubuntu/docker-entrypoint.sh | 2 ++ Dockerfiles/proxy-sqlite3/alpine/Dockerfile | 1 + Dockerfiles/proxy-sqlite3/alpine/docker-entrypoint.sh | 2 ++ Dockerfiles/proxy-sqlite3/centos/Dockerfile | 1 + Dockerfiles/proxy-sqlite3/centos/docker-entrypoint.sh | 2 ++ Dockerfiles/proxy-sqlite3/ol/Dockerfile | 1 + Dockerfiles/proxy-sqlite3/ol/docker-entrypoint.sh | 2 ++ Dockerfiles/proxy-sqlite3/rhel/Dockerfile | 1 + Dockerfiles/proxy-sqlite3/rhel/docker-entrypoint.sh | 2 ++ Dockerfiles/proxy-sqlite3/ubuntu/Dockerfile | 1 + Dockerfiles/proxy-sqlite3/ubuntu/docker-entrypoint.sh | 2 ++ Dockerfiles/server-mysql/alpine/Dockerfile | 1 + Dockerfiles/server-mysql/alpine/docker-entrypoint.sh | 2 ++ Dockerfiles/server-mysql/centos/Dockerfile | 1 + Dockerfiles/server-mysql/centos/docker-entrypoint.sh | 2 ++ Dockerfiles/server-mysql/ol/Dockerfile | 1 + Dockerfiles/server-mysql/ol/docker-entrypoint.sh | 2 ++ Dockerfiles/server-mysql/rhel/Dockerfile | 1 + Dockerfiles/server-mysql/rhel/docker-entrypoint.sh | 2 ++ Dockerfiles/server-mysql/ubuntu/Dockerfile | 1 + Dockerfiles/server-mysql/ubuntu/docker-entrypoint.sh | 2 ++ Dockerfiles/server-pgsql/alpine/Dockerfile | 1 + Dockerfiles/server-pgsql/alpine/docker-entrypoint.sh | 2 ++ Dockerfiles/server-pgsql/centos/Dockerfile | 1 + Dockerfiles/server-pgsql/centos/docker-entrypoint.sh | 2 ++ Dockerfiles/server-pgsql/ol/Dockerfile | 1 + Dockerfiles/server-pgsql/ol/docker-entrypoint.sh | 2 ++ Dockerfiles/server-pgsql/rhel/Dockerfile | 1 + Dockerfiles/server-pgsql/rhel/docker-entrypoint.sh | 2 ++ Dockerfiles/server-pgsql/ubuntu/Dockerfile | 1 + Dockerfiles/server-pgsql/ubuntu/docker-entrypoint.sh | 2 ++ compose_zabbix_components.yaml | 6 ++++++ 41 files changed, 66 insertions(+) diff --git a/Dockerfiles/proxy-mysql/alpine/Dockerfile b/Dockerfiles/proxy-mysql/alpine/Dockerfile index 2ef5140ea..5b6d23bde 100644 --- a/Dockerfiles/proxy-mysql/alpine/Dockerfile +++ b/Dockerfiles/proxy-mysql/alpine/Dockerfile @@ -43,6 +43,7 @@ RUN set -eux && \ traceroute \ nmap \ iputils \ + openssl \ libcap \ libcurl \ libevent \ diff --git a/Dockerfiles/proxy-mysql/alpine/docker-entrypoint.sh b/Dockerfiles/proxy-mysql/alpine/docker-entrypoint.sh index 7c74977bd..e154be06c 100755 --- a/Dockerfiles/proxy-mysql/alpine/docker-entrypoint.sh +++ b/Dockerfiles/proxy-mysql/alpine/docker-entrypoint.sh @@ -527,6 +527,8 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "WebDriverURL" "${ZBX_WEBDRIVERURL}" update_config_var $ZBX_CONFIG "StartBrowserPollers" "${ZBX_STARTBROWSERPOLLERS}" + + command -v openssl >/dev/null 2>&1 && openssl rehash -v "$ZABBIX_USER_HOME_DIR/ssl/ssl_ca/" 1>/dev/null } clear_zbx_env() { diff --git a/Dockerfiles/proxy-mysql/centos/Dockerfile b/Dockerfiles/proxy-mysql/centos/Dockerfile index bc1ca0385..ff53e5858 100644 --- a/Dockerfiles/proxy-mysql/centos/Dockerfile +++ b/Dockerfiles/proxy-mysql/centos/Dockerfile @@ -54,6 +54,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ net-snmp-libs \ OpenIPMI-libs \ openldap \ + openssl \ openssl-libs \ pcre2 \ shadow-utils \ diff --git a/Dockerfiles/proxy-mysql/centos/docker-entrypoint.sh b/Dockerfiles/proxy-mysql/centos/docker-entrypoint.sh index 5c2c83d02..9c6f6b64d 100755 --- a/Dockerfiles/proxy-mysql/centos/docker-entrypoint.sh +++ b/Dockerfiles/proxy-mysql/centos/docker-entrypoint.sh @@ -524,6 +524,8 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "WebDriverURL" "${ZBX_WEBDRIVERURL}" update_config_var $ZBX_CONFIG "StartBrowserPollers" "${ZBX_STARTBROWSERPOLLERS}" + + command -v openssl >/dev/null 2>&1 && openssl rehash -v "$ZABBIX_USER_HOME_DIR/ssl/ssl_ca/" 1>/dev/null } clear_zbx_env() { diff --git a/Dockerfiles/proxy-mysql/ol/Dockerfile b/Dockerfiles/proxy-mysql/ol/Dockerfile index 731e2210b..55427e910 100644 --- a/Dockerfiles/proxy-mysql/ol/Dockerfile +++ b/Dockerfiles/proxy-mysql/ol/Dockerfile @@ -54,6 +54,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ net-snmp-libs \ OpenIPMI-libs \ openldap \ + openssl \ openssl-libs \ pcre2 \ zlib \ diff --git a/Dockerfiles/proxy-mysql/ol/docker-entrypoint.sh b/Dockerfiles/proxy-mysql/ol/docker-entrypoint.sh index 5c2c83d02..9c6f6b64d 100755 --- a/Dockerfiles/proxy-mysql/ol/docker-entrypoint.sh +++ b/Dockerfiles/proxy-mysql/ol/docker-entrypoint.sh @@ -524,6 +524,8 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "WebDriverURL" "${ZBX_WEBDRIVERURL}" update_config_var $ZBX_CONFIG "StartBrowserPollers" "${ZBX_STARTBROWSERPOLLERS}" + + command -v openssl >/dev/null 2>&1 && openssl rehash -v "$ZABBIX_USER_HOME_DIR/ssl/ssl_ca/" 1>/dev/null } clear_zbx_env() { diff --git a/Dockerfiles/proxy-mysql/rhel/Dockerfile b/Dockerfiles/proxy-mysql/rhel/Dockerfile index 0df074b04..71a6580bb 100644 --- a/Dockerfiles/proxy-mysql/rhel/Dockerfile +++ b/Dockerfiles/proxy-mysql/rhel/Dockerfile @@ -69,6 +69,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ libcurl-minimal \ libevent \ openldap \ + openssl \ libssh \ libxml2 \ mysql \ diff --git a/Dockerfiles/proxy-mysql/rhel/docker-entrypoint.sh b/Dockerfiles/proxy-mysql/rhel/docker-entrypoint.sh index 5c2c83d02..9c6f6b64d 100755 --- a/Dockerfiles/proxy-mysql/rhel/docker-entrypoint.sh +++ b/Dockerfiles/proxy-mysql/rhel/docker-entrypoint.sh @@ -524,6 +524,8 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "WebDriverURL" "${ZBX_WEBDRIVERURL}" update_config_var $ZBX_CONFIG "StartBrowserPollers" "${ZBX_STARTBROWSERPOLLERS}" + + command -v openssl >/dev/null 2>&1 && openssl rehash -v "$ZABBIX_USER_HOME_DIR/ssl/ssl_ca/" 1>/dev/null } clear_zbx_env() { diff --git a/Dockerfiles/proxy-mysql/ubuntu/Dockerfile b/Dockerfiles/proxy-mysql/ubuntu/Dockerfile index 86146c49e..03e97f524 100644 --- a/Dockerfiles/proxy-mysql/ubuntu/Dockerfile +++ b/Dockerfiles/proxy-mysql/ubuntu/Dockerfile @@ -47,6 +47,7 @@ RUN --mount=type=cache,target=/var/cache/apt/,sharing=locked \ nmap \ ca-certificates \ fping \ + openssl \ libcurl4t64 \ libevent-2.1 \ libevent-pthreads-2.1 \ diff --git a/Dockerfiles/proxy-mysql/ubuntu/docker-entrypoint.sh b/Dockerfiles/proxy-mysql/ubuntu/docker-entrypoint.sh index 5c2c83d02..9c6f6b64d 100755 --- a/Dockerfiles/proxy-mysql/ubuntu/docker-entrypoint.sh +++ b/Dockerfiles/proxy-mysql/ubuntu/docker-entrypoint.sh @@ -524,6 +524,8 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "WebDriverURL" "${ZBX_WEBDRIVERURL}" update_config_var $ZBX_CONFIG "StartBrowserPollers" "${ZBX_STARTBROWSERPOLLERS}" + + command -v openssl >/dev/null 2>&1 && openssl rehash -v "$ZABBIX_USER_HOME_DIR/ssl/ssl_ca/" 1>/dev/null } clear_zbx_env() { diff --git a/Dockerfiles/proxy-sqlite3/alpine/Dockerfile b/Dockerfiles/proxy-sqlite3/alpine/Dockerfile index ee8365e7c..b1b45a453 100644 --- a/Dockerfiles/proxy-sqlite3/alpine/Dockerfile +++ b/Dockerfiles/proxy-sqlite3/alpine/Dockerfile @@ -43,6 +43,7 @@ RUN set -eux && \ nmap \ fping \ iputils \ + openssl \ libcap \ libcurl \ libevent \ diff --git a/Dockerfiles/proxy-sqlite3/alpine/docker-entrypoint.sh b/Dockerfiles/proxy-sqlite3/alpine/docker-entrypoint.sh index 855107933..4022eeb25 100755 --- a/Dockerfiles/proxy-sqlite3/alpine/docker-entrypoint.sh +++ b/Dockerfiles/proxy-sqlite3/alpine/docker-entrypoint.sh @@ -273,6 +273,8 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "WebDriverURL" "${ZBX_WEBDRIVERURL}" update_config_var $ZBX_CONFIG "StartBrowserPollers" "${ZBX_STARTBROWSERPOLLERS}" + + command -v openssl >/dev/null 2>&1 && openssl rehash -v "$ZABBIX_USER_HOME_DIR/ssl/ssl_ca/" 1>/dev/null } clear_zbx_env() { diff --git a/Dockerfiles/proxy-sqlite3/centos/Dockerfile b/Dockerfiles/proxy-sqlite3/centos/Dockerfile index 06d0399eb..50e2413b6 100644 --- a/Dockerfiles/proxy-sqlite3/centos/Dockerfile +++ b/Dockerfiles/proxy-sqlite3/centos/Dockerfile @@ -50,6 +50,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ net-snmp-libs \ OpenIPMI-libs \ openldap \ + openssl \ openssl-libs \ pcre2 \ shadow-utils \ diff --git a/Dockerfiles/proxy-sqlite3/centos/docker-entrypoint.sh b/Dockerfiles/proxy-sqlite3/centos/docker-entrypoint.sh index 855107933..4022eeb25 100755 --- a/Dockerfiles/proxy-sqlite3/centos/docker-entrypoint.sh +++ b/Dockerfiles/proxy-sqlite3/centos/docker-entrypoint.sh @@ -273,6 +273,8 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "WebDriverURL" "${ZBX_WEBDRIVERURL}" update_config_var $ZBX_CONFIG "StartBrowserPollers" "${ZBX_STARTBROWSERPOLLERS}" + + command -v openssl >/dev/null 2>&1 && openssl rehash -v "$ZABBIX_USER_HOME_DIR/ssl/ssl_ca/" 1>/dev/null } clear_zbx_env() { diff --git a/Dockerfiles/proxy-sqlite3/ol/Dockerfile b/Dockerfiles/proxy-sqlite3/ol/Dockerfile index f89e48548..b532c7654 100644 --- a/Dockerfiles/proxy-sqlite3/ol/Dockerfile +++ b/Dockerfiles/proxy-sqlite3/ol/Dockerfile @@ -51,6 +51,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ net-snmp-libs \ OpenIPMI-libs \ openldap \ + openssl \ openssl-libs \ pcre2 \ zlib \ diff --git a/Dockerfiles/proxy-sqlite3/ol/docker-entrypoint.sh b/Dockerfiles/proxy-sqlite3/ol/docker-entrypoint.sh index 855107933..4022eeb25 100755 --- a/Dockerfiles/proxy-sqlite3/ol/docker-entrypoint.sh +++ b/Dockerfiles/proxy-sqlite3/ol/docker-entrypoint.sh @@ -273,6 +273,8 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "WebDriverURL" "${ZBX_WEBDRIVERURL}" update_config_var $ZBX_CONFIG "StartBrowserPollers" "${ZBX_STARTBROWSERPOLLERS}" + + command -v openssl >/dev/null 2>&1 && openssl rehash -v "$ZABBIX_USER_HOME_DIR/ssl/ssl_ca/" 1>/dev/null } clear_zbx_env() { diff --git a/Dockerfiles/proxy-sqlite3/rhel/Dockerfile b/Dockerfiles/proxy-sqlite3/rhel/Dockerfile index ca29ceac7..806fcd66f 100644 --- a/Dockerfiles/proxy-sqlite3/rhel/Dockerfile +++ b/Dockerfiles/proxy-sqlite3/rhel/Dockerfile @@ -68,6 +68,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ libcurl-minimal \ libevent \ openldap \ + openssl \ libssh \ libxml2 \ net-snmp-agent-libs \ diff --git a/Dockerfiles/proxy-sqlite3/rhel/docker-entrypoint.sh b/Dockerfiles/proxy-sqlite3/rhel/docker-entrypoint.sh index 855107933..4022eeb25 100755 --- a/Dockerfiles/proxy-sqlite3/rhel/docker-entrypoint.sh +++ b/Dockerfiles/proxy-sqlite3/rhel/docker-entrypoint.sh @@ -273,6 +273,8 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "WebDriverURL" "${ZBX_WEBDRIVERURL}" update_config_var $ZBX_CONFIG "StartBrowserPollers" "${ZBX_STARTBROWSERPOLLERS}" + + command -v openssl >/dev/null 2>&1 && openssl rehash -v "$ZABBIX_USER_HOME_DIR/ssl/ssl_ca/" 1>/dev/null } clear_zbx_env() { diff --git a/Dockerfiles/proxy-sqlite3/ubuntu/Dockerfile b/Dockerfiles/proxy-sqlite3/ubuntu/Dockerfile index 2685834c0..1606ef1fe 100644 --- a/Dockerfiles/proxy-sqlite3/ubuntu/Dockerfile +++ b/Dockerfiles/proxy-sqlite3/ubuntu/Dockerfile @@ -46,6 +46,7 @@ RUN --mount=type=cache,target=/var/cache/apt/,sharing=locked \ nmap \ ca-certificates \ fping \ + openssl \ libcurl4t64 \ libevent-2.1 \ libevent-pthreads-2.1 \ diff --git a/Dockerfiles/proxy-sqlite3/ubuntu/docker-entrypoint.sh b/Dockerfiles/proxy-sqlite3/ubuntu/docker-entrypoint.sh index 855107933..4022eeb25 100755 --- a/Dockerfiles/proxy-sqlite3/ubuntu/docker-entrypoint.sh +++ b/Dockerfiles/proxy-sqlite3/ubuntu/docker-entrypoint.sh @@ -273,6 +273,8 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "WebDriverURL" "${ZBX_WEBDRIVERURL}" update_config_var $ZBX_CONFIG "StartBrowserPollers" "${ZBX_STARTBROWSERPOLLERS}" + + command -v openssl >/dev/null 2>&1 && openssl rehash -v "$ZABBIX_USER_HOME_DIR/ssl/ssl_ca/" 1>/dev/null } clear_zbx_env() { diff --git a/Dockerfiles/server-mysql/alpine/Dockerfile b/Dockerfiles/server-mysql/alpine/Dockerfile index ab0ccf74b..6be21ef3c 100644 --- a/Dockerfiles/server-mysql/alpine/Dockerfile +++ b/Dockerfiles/server-mysql/alpine/Dockerfile @@ -44,6 +44,7 @@ RUN set -eux && \ nmap \ tzdata \ iputils \ + openssl \ libcap \ libcurl \ libevent \ diff --git a/Dockerfiles/server-mysql/alpine/docker-entrypoint.sh b/Dockerfiles/server-mysql/alpine/docker-entrypoint.sh index c42830469..c0fccc6eb 100755 --- a/Dockerfiles/server-mysql/alpine/docker-entrypoint.sh +++ b/Dockerfiles/server-mysql/alpine/docker-entrypoint.sh @@ -575,6 +575,8 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "WebDriverURL" "${ZBX_WEBDRIVERURL}" update_config_var $ZBX_CONFIG "StartBrowserPollers" "${ZBX_STARTBROWSERPOLLERS}" + + command -v openssl >/dev/null 2>&1 && openssl rehash -v "$ZABBIX_USER_HOME_DIR/ssl/ssl_ca/" 1>/dev/null } clear_zbx_env() { diff --git a/Dockerfiles/server-mysql/centos/Dockerfile b/Dockerfiles/server-mysql/centos/Dockerfile index d8778a6e7..409d88f7f 100644 --- a/Dockerfiles/server-mysql/centos/Dockerfile +++ b/Dockerfiles/server-mysql/centos/Dockerfile @@ -58,6 +58,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ net-snmp-libs \ OpenIPMI-libs \ openldap \ + openssl \ openssl-libs \ pcre2 \ shadow-utils \ diff --git a/Dockerfiles/server-mysql/centos/docker-entrypoint.sh b/Dockerfiles/server-mysql/centos/docker-entrypoint.sh index a3ad3ba03..64c7b30e0 100755 --- a/Dockerfiles/server-mysql/centos/docker-entrypoint.sh +++ b/Dockerfiles/server-mysql/centos/docker-entrypoint.sh @@ -572,6 +572,8 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "WebDriverURL" "${ZBX_WEBDRIVERURL}" update_config_var $ZBX_CONFIG "StartBrowserPollers" "${ZBX_STARTBROWSERPOLLERS}" + + command -v openssl >/dev/null 2>&1 && openssl rehash -v "$ZABBIX_USER_HOME_DIR/ssl/ssl_ca/" 1>/dev/null } clear_zbx_env() { diff --git a/Dockerfiles/server-mysql/ol/Dockerfile b/Dockerfiles/server-mysql/ol/Dockerfile index 010253338..d34cb2d61 100644 --- a/Dockerfiles/server-mysql/ol/Dockerfile +++ b/Dockerfiles/server-mysql/ol/Dockerfile @@ -57,6 +57,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ net-snmp-libs \ OpenIPMI-libs \ openldap \ + openssl \ openssl-libs \ pcre2 \ zlib \ diff --git a/Dockerfiles/server-mysql/ol/docker-entrypoint.sh b/Dockerfiles/server-mysql/ol/docker-entrypoint.sh index a3ad3ba03..64c7b30e0 100755 --- a/Dockerfiles/server-mysql/ol/docker-entrypoint.sh +++ b/Dockerfiles/server-mysql/ol/docker-entrypoint.sh @@ -572,6 +572,8 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "WebDriverURL" "${ZBX_WEBDRIVERURL}" update_config_var $ZBX_CONFIG "StartBrowserPollers" "${ZBX_STARTBROWSERPOLLERS}" + + command -v openssl >/dev/null 2>&1 && openssl rehash -v "$ZABBIX_USER_HOME_DIR/ssl/ssl_ca/" 1>/dev/null } clear_zbx_env() { diff --git a/Dockerfiles/server-mysql/rhel/Dockerfile b/Dockerfiles/server-mysql/rhel/Dockerfile index 5e6a95242..6d8331eb3 100644 --- a/Dockerfiles/server-mysql/rhel/Dockerfile +++ b/Dockerfiles/server-mysql/rhel/Dockerfile @@ -67,6 +67,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ shadow-utils \ iputils \ hostname \ + openssl \ libssh \ libpsl \ libbrotli \ diff --git a/Dockerfiles/server-mysql/rhel/docker-entrypoint.sh b/Dockerfiles/server-mysql/rhel/docker-entrypoint.sh index a3ad3ba03..64c7b30e0 100755 --- a/Dockerfiles/server-mysql/rhel/docker-entrypoint.sh +++ b/Dockerfiles/server-mysql/rhel/docker-entrypoint.sh @@ -572,6 +572,8 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "WebDriverURL" "${ZBX_WEBDRIVERURL}" update_config_var $ZBX_CONFIG "StartBrowserPollers" "${ZBX_STARTBROWSERPOLLERS}" + + command -v openssl >/dev/null 2>&1 && openssl rehash -v "$ZABBIX_USER_HOME_DIR/ssl/ssl_ca/" 1>/dev/null } clear_zbx_env() { diff --git a/Dockerfiles/server-mysql/ubuntu/Dockerfile b/Dockerfiles/server-mysql/ubuntu/Dockerfile index 3a2022a5c..59849b436 100644 --- a/Dockerfiles/server-mysql/ubuntu/Dockerfile +++ b/Dockerfiles/server-mysql/ubuntu/Dockerfile @@ -49,6 +49,7 @@ RUN --mount=type=cache,target=/var/cache/apt/,sharing=locked \ iputils-ping \ traceroute \ fping \ + openssl \ libcurl4t64 \ libevent-2.1 \ libevent-pthreads-2.1 \ diff --git a/Dockerfiles/server-mysql/ubuntu/docker-entrypoint.sh b/Dockerfiles/server-mysql/ubuntu/docker-entrypoint.sh index a3ad3ba03..64c7b30e0 100755 --- a/Dockerfiles/server-mysql/ubuntu/docker-entrypoint.sh +++ b/Dockerfiles/server-mysql/ubuntu/docker-entrypoint.sh @@ -572,6 +572,8 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "WebDriverURL" "${ZBX_WEBDRIVERURL}" update_config_var $ZBX_CONFIG "StartBrowserPollers" "${ZBX_STARTBROWSERPOLLERS}" + + command -v openssl >/dev/null 2>&1 && openssl rehash -v "$ZABBIX_USER_HOME_DIR/ssl/ssl_ca/" 1>/dev/null } clear_zbx_env() { diff --git a/Dockerfiles/server-pgsql/alpine/Dockerfile b/Dockerfiles/server-pgsql/alpine/Dockerfile index 9b58bcc15..d104b9219 100644 --- a/Dockerfiles/server-pgsql/alpine/Dockerfile +++ b/Dockerfiles/server-pgsql/alpine/Dockerfile @@ -44,6 +44,7 @@ RUN set -eux && \ fping \ tzdata \ iputils \ + openssl \ libcap \ libcurl \ libevent \ diff --git a/Dockerfiles/server-pgsql/alpine/docker-entrypoint.sh b/Dockerfiles/server-pgsql/alpine/docker-entrypoint.sh index 75020f0ac..592418f37 100755 --- a/Dockerfiles/server-pgsql/alpine/docker-entrypoint.sh +++ b/Dockerfiles/server-pgsql/alpine/docker-entrypoint.sh @@ -601,6 +601,8 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "WebDriverURL" "${ZBX_WEBDRIVERURL}" update_config_var $ZBX_CONFIG "StartBrowserPollers" "${ZBX_STARTBROWSERPOLLERS}" + + command -v openssl >/dev/null 2>&1 && openssl rehash -v "$ZABBIX_USER_HOME_DIR/ssl/ssl_ca/" 1>/dev/null } clear_zbx_env() { diff --git a/Dockerfiles/server-pgsql/centos/Dockerfile b/Dockerfiles/server-pgsql/centos/Dockerfile index a7ab3379a..053bd7814 100644 --- a/Dockerfiles/server-pgsql/centos/Dockerfile +++ b/Dockerfiles/server-pgsql/centos/Dockerfile @@ -56,6 +56,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ net-snmp-libs \ OpenIPMI-libs \ openldap \ + openssl \ openssl-libs \ pcre2 \ postgresql \ diff --git a/Dockerfiles/server-pgsql/centos/docker-entrypoint.sh b/Dockerfiles/server-pgsql/centos/docker-entrypoint.sh index 75020f0ac..592418f37 100755 --- a/Dockerfiles/server-pgsql/centos/docker-entrypoint.sh +++ b/Dockerfiles/server-pgsql/centos/docker-entrypoint.sh @@ -601,6 +601,8 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "WebDriverURL" "${ZBX_WEBDRIVERURL}" update_config_var $ZBX_CONFIG "StartBrowserPollers" "${ZBX_STARTBROWSERPOLLERS}" + + command -v openssl >/dev/null 2>&1 && openssl rehash -v "$ZABBIX_USER_HOME_DIR/ssl/ssl_ca/" 1>/dev/null } clear_zbx_env() { diff --git a/Dockerfiles/server-pgsql/ol/Dockerfile b/Dockerfiles/server-pgsql/ol/Dockerfile index 700726d62..483e69768 100644 --- a/Dockerfiles/server-pgsql/ol/Dockerfile +++ b/Dockerfiles/server-pgsql/ol/Dockerfile @@ -55,6 +55,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ net-snmp-libs \ OpenIPMI-libs \ openldap \ + openssl \ openssl-libs \ pcre2 \ postgresql \ diff --git a/Dockerfiles/server-pgsql/ol/docker-entrypoint.sh b/Dockerfiles/server-pgsql/ol/docker-entrypoint.sh index 75020f0ac..592418f37 100755 --- a/Dockerfiles/server-pgsql/ol/docker-entrypoint.sh +++ b/Dockerfiles/server-pgsql/ol/docker-entrypoint.sh @@ -601,6 +601,8 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "WebDriverURL" "${ZBX_WEBDRIVERURL}" update_config_var $ZBX_CONFIG "StartBrowserPollers" "${ZBX_STARTBROWSERPOLLERS}" + + command -v openssl >/dev/null 2>&1 && openssl rehash -v "$ZABBIX_USER_HOME_DIR/ssl/ssl_ca/" 1>/dev/null } clear_zbx_env() { diff --git a/Dockerfiles/server-pgsql/rhel/Dockerfile b/Dockerfiles/server-pgsql/rhel/Dockerfile index b099a0ef5..7b2e99998 100644 --- a/Dockerfiles/server-pgsql/rhel/Dockerfile +++ b/Dockerfiles/server-pgsql/rhel/Dockerfile @@ -67,6 +67,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ shadow-utils \ iputils \ hostname \ + openssl \ libssh \ libpsl \ libbrotli \ diff --git a/Dockerfiles/server-pgsql/rhel/docker-entrypoint.sh b/Dockerfiles/server-pgsql/rhel/docker-entrypoint.sh index 75020f0ac..592418f37 100755 --- a/Dockerfiles/server-pgsql/rhel/docker-entrypoint.sh +++ b/Dockerfiles/server-pgsql/rhel/docker-entrypoint.sh @@ -601,6 +601,8 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "WebDriverURL" "${ZBX_WEBDRIVERURL}" update_config_var $ZBX_CONFIG "StartBrowserPollers" "${ZBX_STARTBROWSERPOLLERS}" + + command -v openssl >/dev/null 2>&1 && openssl rehash -v "$ZABBIX_USER_HOME_DIR/ssl/ssl_ca/" 1>/dev/null } clear_zbx_env() { diff --git a/Dockerfiles/server-pgsql/ubuntu/Dockerfile b/Dockerfiles/server-pgsql/ubuntu/Dockerfile index 80c350f2f..390aada35 100644 --- a/Dockerfiles/server-pgsql/ubuntu/Dockerfile +++ b/Dockerfiles/server-pgsql/ubuntu/Dockerfile @@ -49,6 +49,7 @@ RUN --mount=type=cache,target=/var/cache/apt/,sharing=locked \ iputils-ping \ traceroute \ fping \ + openssl \ libcurl4t64 \ libevent-2.1 \ libevent-pthreads-2.1 \ diff --git a/Dockerfiles/server-pgsql/ubuntu/docker-entrypoint.sh b/Dockerfiles/server-pgsql/ubuntu/docker-entrypoint.sh index 75020f0ac..592418f37 100755 --- a/Dockerfiles/server-pgsql/ubuntu/docker-entrypoint.sh +++ b/Dockerfiles/server-pgsql/ubuntu/docker-entrypoint.sh @@ -601,6 +601,8 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "WebDriverURL" "${ZBX_WEBDRIVERURL}" update_config_var $ZBX_CONFIG "StartBrowserPollers" "${ZBX_STARTBROWSERPOLLERS}" + + command -v openssl >/dev/null 2>&1 && openssl rehash -v "$ZABBIX_USER_HOME_DIR/ssl/ssl_ca/" 1>/dev/null } clear_zbx_env() { diff --git a/compose_zabbix_components.yaml b/compose_zabbix_components.yaml index 913c3a025..2d5f07426 100644 --- a/compose_zabbix_components.yaml +++ b/compose_zabbix_components.yaml @@ -18,6 +18,9 @@ services: - ${DATA_DIRECTORY}/var/lib/zabbix/enc:/var/lib/zabbix/enc:ro - ${DATA_DIRECTORY}/var/lib/zabbix/ssh_keys:/var/lib/zabbix/ssh_keys:ro - ${DATA_DIRECTORY}/var/lib/zabbix/mibs:/var/lib/zabbix/mibs:ro + - ${DATA_DIRECTORY}/var/lib/zabbix/ssl/certs:/var/lib/zabbix/ssl/certs:ro + - ${DATA_DIRECTORY}/var/lib/zabbix/ssl/keys:/var/lib/zabbix/ssl/keys:ro + - ${DATA_DIRECTORY}/var/lib/zabbix/ssl/ssl_ca:/var/lib/zabbix/ssl/ssl_ca:rw - snmptraps:/var/lib/zabbix/snmptraps:roz tmpfs: /tmp ulimits: @@ -171,6 +174,9 @@ services: - ${DATA_DIRECTORY}/var/lib/zabbix/enc:/var/lib/zabbix/enc:ro - ${DATA_DIRECTORY}/var/lib/zabbix/ssh_keys:/var/lib/zabbix/ssh_keys:ro - ${DATA_DIRECTORY}/var/lib/zabbix/mibs:/var/lib/zabbix/mibs:ro + - ${DATA_DIRECTORY}/var/lib/zabbix/ssl/certs:/var/lib/zabbix/ssl/certs:ro + - ${DATA_DIRECTORY}/var/lib/zabbix/ssl/keys:/var/lib/zabbix/ssl/keys:ro + - ${DATA_DIRECTORY}/var/lib/zabbix/ssl/ssl_ca:/var/lib/zabbix/ssl/ssl_ca:rw - snmptraps:/var/lib/zabbix/snmptraps:ro tmpfs: /tmp ulimits: