mirror of
https://github.com/zabbix/zabbix-docker.git
synced 2025-06-27 13:21:45 +02:00
Added OpenSSL package to server and sqlite3 images. Required to perform rehash of added CA certificates
This commit is contained in:
parent
792e0270a1
commit
df3dbcc479
@ -44,6 +44,7 @@ RUN set -eux && \
|
|||||||
traceroute \
|
traceroute \
|
||||||
nmap \
|
nmap \
|
||||||
iputils \
|
iputils \
|
||||||
|
openssl \
|
||||||
libcap \
|
libcap \
|
||||||
libcurl \
|
libcurl \
|
||||||
libevent \
|
libevent \
|
||||||
|
@ -509,6 +509,8 @@ update_zbx_config() {
|
|||||||
else
|
else
|
||||||
update_config_var $ZBX_CONFIG "AllowRoot" "1"
|
update_config_var $ZBX_CONFIG "AllowRoot" "1"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
command -v openssl >/dev/null 2>&1 && openssl rehash -v "$ZABBIX_USER_HOME_DIR/ssl/ssl_ca/" 1>/dev/null
|
||||||
}
|
}
|
||||||
|
|
||||||
clear_zbx_env() {
|
clear_zbx_env() {
|
||||||
|
@ -55,6 +55,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
|
|||||||
net-snmp-libs \
|
net-snmp-libs \
|
||||||
OpenIPMI-libs \
|
OpenIPMI-libs \
|
||||||
openldap \
|
openldap \
|
||||||
|
openssl \
|
||||||
openssl-libs \
|
openssl-libs \
|
||||||
pcre2 \
|
pcre2 \
|
||||||
shadow-utils \
|
shadow-utils \
|
||||||
|
@ -506,6 +506,8 @@ update_zbx_config() {
|
|||||||
else
|
else
|
||||||
update_config_var $ZBX_CONFIG "AllowRoot" "1"
|
update_config_var $ZBX_CONFIG "AllowRoot" "1"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
command -v openssl >/dev/null 2>&1 && openssl rehash -v "$ZABBIX_USER_HOME_DIR/ssl/ssl_ca/" 1>/dev/null
|
||||||
}
|
}
|
||||||
|
|
||||||
clear_zbx_env() {
|
clear_zbx_env() {
|
||||||
|
@ -55,6 +55,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
|
|||||||
net-snmp-libs \
|
net-snmp-libs \
|
||||||
OpenIPMI-libs \
|
OpenIPMI-libs \
|
||||||
openldap \
|
openldap \
|
||||||
|
openssl \
|
||||||
openssl-libs \
|
openssl-libs \
|
||||||
pcre2 \
|
pcre2 \
|
||||||
zlib \
|
zlib \
|
||||||
|
@ -506,6 +506,11 @@ update_zbx_config() {
|
|||||||
else
|
else
|
||||||
update_config_var $ZBX_CONFIG "AllowRoot" "1"
|
update_config_var $ZBX_CONFIG "AllowRoot" "1"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
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() {
|
clear_zbx_env() {
|
||||||
|
@ -70,6 +70,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
|
|||||||
libcurl \
|
libcurl \
|
||||||
libevent \
|
libevent \
|
||||||
openldap \
|
openldap \
|
||||||
|
openssl \
|
||||||
libssh \
|
libssh \
|
||||||
libxml2 \
|
libxml2 \
|
||||||
mysql \
|
mysql \
|
||||||
|
@ -506,6 +506,8 @@ update_zbx_config() {
|
|||||||
else
|
else
|
||||||
update_config_var $ZBX_CONFIG "AllowRoot" "1"
|
update_config_var $ZBX_CONFIG "AllowRoot" "1"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
command -v openssl >/dev/null 2>&1 && openssl rehash -v "$ZABBIX_USER_HOME_DIR/ssl/ssl_ca/" 1>/dev/null
|
||||||
}
|
}
|
||||||
|
|
||||||
clear_zbx_env() {
|
clear_zbx_env() {
|
||||||
|
@ -48,6 +48,7 @@ RUN --mount=type=cache,target=/var/cache/apt/,sharing=locked \
|
|||||||
nmap \
|
nmap \
|
||||||
ca-certificates \
|
ca-certificates \
|
||||||
fping \
|
fping \
|
||||||
|
openssl \
|
||||||
libcurl4t64 \
|
libcurl4t64 \
|
||||||
libevent-2.1 \
|
libevent-2.1 \
|
||||||
libmysqlclient21 \
|
libmysqlclient21 \
|
||||||
|
@ -506,6 +506,8 @@ update_zbx_config() {
|
|||||||
else
|
else
|
||||||
update_config_var $ZBX_CONFIG "AllowRoot" "1"
|
update_config_var $ZBX_CONFIG "AllowRoot" "1"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
command -v openssl >/dev/null 2>&1 && openssl rehash -v "$ZABBIX_USER_HOME_DIR/ssl/ssl_ca/" 1>/dev/null
|
||||||
}
|
}
|
||||||
|
|
||||||
clear_zbx_env() {
|
clear_zbx_env() {
|
||||||
|
@ -44,6 +44,7 @@ RUN set -eux && \
|
|||||||
nmap \
|
nmap \
|
||||||
fping \
|
fping \
|
||||||
iputils \
|
iputils \
|
||||||
|
openssl \
|
||||||
libcap \
|
libcap \
|
||||||
libcurl \
|
libcurl \
|
||||||
libevent \
|
libevent \
|
||||||
|
@ -262,6 +262,8 @@ update_zbx_config() {
|
|||||||
else
|
else
|
||||||
update_config_var $ZBX_CONFIG "AllowRoot" "1"
|
update_config_var $ZBX_CONFIG "AllowRoot" "1"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
command -v openssl >/dev/null 2>&1 && openssl rehash -v "$ZABBIX_USER_HOME_DIR/ssl/ssl_ca/" 1>/dev/null
|
||||||
}
|
}
|
||||||
|
|
||||||
clear_zbx_env() {
|
clear_zbx_env() {
|
||||||
|
@ -51,6 +51,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
|
|||||||
net-snmp-libs \
|
net-snmp-libs \
|
||||||
OpenIPMI-libs \
|
OpenIPMI-libs \
|
||||||
openldap \
|
openldap \
|
||||||
|
openssl \
|
||||||
openssl-libs \
|
openssl-libs \
|
||||||
pcre2 \
|
pcre2 \
|
||||||
shadow-utils \
|
shadow-utils \
|
||||||
|
@ -262,6 +262,8 @@ update_zbx_config() {
|
|||||||
else
|
else
|
||||||
update_config_var $ZBX_CONFIG "AllowRoot" "1"
|
update_config_var $ZBX_CONFIG "AllowRoot" "1"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
command -v openssl >/dev/null 2>&1 && openssl rehash -v "$ZABBIX_USER_HOME_DIR/ssl/ssl_ca/" 1>/dev/null
|
||||||
}
|
}
|
||||||
|
|
||||||
clear_zbx_env() {
|
clear_zbx_env() {
|
||||||
|
@ -52,6 +52,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
|
|||||||
net-snmp-libs \
|
net-snmp-libs \
|
||||||
OpenIPMI-libs \
|
OpenIPMI-libs \
|
||||||
openldap \
|
openldap \
|
||||||
|
openssl \
|
||||||
openssl-libs \
|
openssl-libs \
|
||||||
pcre2 \
|
pcre2 \
|
||||||
zlib \
|
zlib \
|
||||||
|
@ -262,6 +262,8 @@ update_zbx_config() {
|
|||||||
else
|
else
|
||||||
update_config_var $ZBX_CONFIG "AllowRoot" "1"
|
update_config_var $ZBX_CONFIG "AllowRoot" "1"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
command -v openssl >/dev/null 2>&1 && openssl rehash -v "$ZABBIX_USER_HOME_DIR/ssl/ssl_ca/" 1>/dev/null
|
||||||
}
|
}
|
||||||
|
|
||||||
clear_zbx_env() {
|
clear_zbx_env() {
|
||||||
|
@ -69,6 +69,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
|
|||||||
libcurl \
|
libcurl \
|
||||||
libevent \
|
libevent \
|
||||||
openldap \
|
openldap \
|
||||||
|
openssl \
|
||||||
libssh \
|
libssh \
|
||||||
libxml2 \
|
libxml2 \
|
||||||
net-snmp-agent-libs \
|
net-snmp-agent-libs \
|
||||||
|
@ -262,6 +262,8 @@ update_zbx_config() {
|
|||||||
else
|
else
|
||||||
update_config_var $ZBX_CONFIG "AllowRoot" "1"
|
update_config_var $ZBX_CONFIG "AllowRoot" "1"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
command -v openssl >/dev/null 2>&1 && openssl rehash -v "$ZABBIX_USER_HOME_DIR/ssl/ssl_ca/" 1>/dev/null
|
||||||
}
|
}
|
||||||
|
|
||||||
clear_zbx_env() {
|
clear_zbx_env() {
|
||||||
|
@ -47,6 +47,7 @@ RUN --mount=type=cache,target=/var/cache/apt/,sharing=locked \
|
|||||||
nmap \
|
nmap \
|
||||||
ca-certificates \
|
ca-certificates \
|
||||||
fping \
|
fping \
|
||||||
|
openssl \
|
||||||
libcurl4t64 \
|
libcurl4t64 \
|
||||||
libevent-2.1 \
|
libevent-2.1 \
|
||||||
libevent-pthreads-2.1 \
|
libevent-pthreads-2.1 \
|
||||||
|
@ -262,6 +262,8 @@ update_zbx_config() {
|
|||||||
else
|
else
|
||||||
update_config_var $ZBX_CONFIG "AllowRoot" "1"
|
update_config_var $ZBX_CONFIG "AllowRoot" "1"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
command -v openssl >/dev/null 2>&1 && openssl rehash -v "$ZABBIX_USER_HOME_DIR/ssl/ssl_ca/" 1>/dev/null
|
||||||
}
|
}
|
||||||
|
|
||||||
clear_zbx_env() {
|
clear_zbx_env() {
|
||||||
|
@ -45,6 +45,7 @@ RUN set -eux && \
|
|||||||
nmap \
|
nmap \
|
||||||
tzdata \
|
tzdata \
|
||||||
iputils \
|
iputils \
|
||||||
|
openssl \
|
||||||
libcap \
|
libcap \
|
||||||
libcurl \
|
libcurl \
|
||||||
libevent \
|
libevent \
|
||||||
|
@ -554,6 +554,8 @@ update_zbx_config() {
|
|||||||
else
|
else
|
||||||
update_config_var $ZBX_CONFIG "AllowRoot" "1"
|
update_config_var $ZBX_CONFIG "AllowRoot" "1"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
command -v openssl >/dev/null 2>&1 && openssl rehash -v "$ZABBIX_USER_HOME_DIR/ssl/ssl_ca/" 1>/dev/null
|
||||||
}
|
}
|
||||||
|
|
||||||
clear_zbx_env() {
|
clear_zbx_env() {
|
||||||
|
@ -59,6 +59,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
|
|||||||
net-snmp-libs \
|
net-snmp-libs \
|
||||||
OpenIPMI-libs \
|
OpenIPMI-libs \
|
||||||
openldap \
|
openldap \
|
||||||
|
openssl \
|
||||||
openssl-libs \
|
openssl-libs \
|
||||||
pcre2 \
|
pcre2 \
|
||||||
shadow-utils \
|
shadow-utils \
|
||||||
|
@ -551,6 +551,8 @@ update_zbx_config() {
|
|||||||
else
|
else
|
||||||
update_config_var $ZBX_CONFIG "AllowRoot" "1"
|
update_config_var $ZBX_CONFIG "AllowRoot" "1"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
command -v openssl >/dev/null 2>&1 && openssl rehash -v "$ZABBIX_USER_HOME_DIR/ssl/ssl_ca/" 1>/dev/null
|
||||||
}
|
}
|
||||||
|
|
||||||
clear_zbx_env() {
|
clear_zbx_env() {
|
||||||
|
@ -59,6 +59,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
|
|||||||
net-snmp-libs \
|
net-snmp-libs \
|
||||||
OpenIPMI-libs \
|
OpenIPMI-libs \
|
||||||
openldap \
|
openldap \
|
||||||
|
openssl \
|
||||||
openssl-libs \
|
openssl-libs \
|
||||||
pcre2 \
|
pcre2 \
|
||||||
zlib \
|
zlib \
|
||||||
|
@ -551,6 +551,8 @@ update_zbx_config() {
|
|||||||
else
|
else
|
||||||
update_config_var $ZBX_CONFIG "AllowRoot" "1"
|
update_config_var $ZBX_CONFIG "AllowRoot" "1"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
command -v openssl >/dev/null 2>&1 && openssl rehash -v "$ZABBIX_USER_HOME_DIR/ssl/ssl_ca/" 1>/dev/null
|
||||||
}
|
}
|
||||||
|
|
||||||
clear_zbx_env() {
|
clear_zbx_env() {
|
||||||
|
@ -69,6 +69,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
|
|||||||
iputils \
|
iputils \
|
||||||
hostname \
|
hostname \
|
||||||
libcurl \
|
libcurl \
|
||||||
|
openssl \
|
||||||
libevent \
|
libevent \
|
||||||
openldap \
|
openldap \
|
||||||
libssh \
|
libssh \
|
||||||
|
@ -551,6 +551,8 @@ update_zbx_config() {
|
|||||||
else
|
else
|
||||||
update_config_var $ZBX_CONFIG "AllowRoot" "1"
|
update_config_var $ZBX_CONFIG "AllowRoot" "1"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
command -v openssl >/dev/null 2>&1 && openssl rehash -v "$ZABBIX_USER_HOME_DIR/ssl/ssl_ca/" 1>/dev/null
|
||||||
}
|
}
|
||||||
|
|
||||||
clear_zbx_env() {
|
clear_zbx_env() {
|
||||||
|
@ -50,6 +50,7 @@ RUN --mount=type=cache,target=/var/cache/apt/,sharing=locked \
|
|||||||
iputils-ping \
|
iputils-ping \
|
||||||
traceroute \
|
traceroute \
|
||||||
fping \
|
fping \
|
||||||
|
openssl \
|
||||||
libcurl4t64 \
|
libcurl4t64 \
|
||||||
libevent-2.1 \
|
libevent-2.1 \
|
||||||
libmysqlclient21 \
|
libmysqlclient21 \
|
||||||
|
@ -551,6 +551,8 @@ update_zbx_config() {
|
|||||||
else
|
else
|
||||||
update_config_var $ZBX_CONFIG "AllowRoot" "1"
|
update_config_var $ZBX_CONFIG "AllowRoot" "1"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
command -v openssl >/dev/null 2>&1 && openssl rehash -v "$ZABBIX_USER_HOME_DIR/ssl/ssl_ca/" 1>/dev/null
|
||||||
}
|
}
|
||||||
|
|
||||||
clear_zbx_env() {
|
clear_zbx_env() {
|
||||||
|
@ -45,6 +45,7 @@ RUN set -eux && \
|
|||||||
fping \
|
fping \
|
||||||
tzdata \
|
tzdata \
|
||||||
iputils \
|
iputils \
|
||||||
|
openssl \
|
||||||
libcap \
|
libcap \
|
||||||
libcurl \
|
libcurl \
|
||||||
libevent \
|
libevent \
|
||||||
|
@ -580,6 +580,8 @@ update_zbx_config() {
|
|||||||
else
|
else
|
||||||
update_config_var $ZBX_CONFIG "AllowRoot" "1"
|
update_config_var $ZBX_CONFIG "AllowRoot" "1"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
command -v openssl >/dev/null 2>&1 && openssl rehash -v "$ZABBIX_USER_HOME_DIR/ssl/ssl_ca/" 1>/dev/null
|
||||||
}
|
}
|
||||||
|
|
||||||
clear_zbx_env() {
|
clear_zbx_env() {
|
||||||
|
@ -57,6 +57,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
|
|||||||
net-snmp-libs \
|
net-snmp-libs \
|
||||||
OpenIPMI-libs \
|
OpenIPMI-libs \
|
||||||
openldap \
|
openldap \
|
||||||
|
openssl \
|
||||||
openssl-libs \
|
openssl-libs \
|
||||||
pcre2 \
|
pcre2 \
|
||||||
postgresql \
|
postgresql \
|
||||||
|
@ -580,6 +580,8 @@ update_zbx_config() {
|
|||||||
else
|
else
|
||||||
update_config_var $ZBX_CONFIG "AllowRoot" "1"
|
update_config_var $ZBX_CONFIG "AllowRoot" "1"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
command -v openssl >/dev/null 2>&1 && openssl rehash -v "$ZABBIX_USER_HOME_DIR/ssl/ssl_ca/" 1>/dev/null
|
||||||
}
|
}
|
||||||
|
|
||||||
clear_zbx_env() {
|
clear_zbx_env() {
|
||||||
|
@ -57,6 +57,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
|
|||||||
net-snmp-libs \
|
net-snmp-libs \
|
||||||
OpenIPMI-libs \
|
OpenIPMI-libs \
|
||||||
openldap \
|
openldap \
|
||||||
|
openssl \
|
||||||
openssl-libs \
|
openssl-libs \
|
||||||
pcre2 \
|
pcre2 \
|
||||||
postgresql \
|
postgresql \
|
||||||
|
@ -580,6 +580,8 @@ update_zbx_config() {
|
|||||||
else
|
else
|
||||||
update_config_var $ZBX_CONFIG "AllowRoot" "1"
|
update_config_var $ZBX_CONFIG "AllowRoot" "1"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
command -v openssl >/dev/null 2>&1 && openssl rehash -v "$ZABBIX_USER_HOME_DIR/ssl/ssl_ca/" 1>/dev/null
|
||||||
}
|
}
|
||||||
|
|
||||||
clear_zbx_env() {
|
clear_zbx_env() {
|
||||||
|
@ -50,6 +50,7 @@ RUN --mount=type=cache,target=/var/cache/apt/,sharing=locked \
|
|||||||
iputils-ping \
|
iputils-ping \
|
||||||
traceroute \
|
traceroute \
|
||||||
fping \
|
fping \
|
||||||
|
openssl \
|
||||||
libcurl4t64 \
|
libcurl4t64 \
|
||||||
libevent-2.1 \
|
libevent-2.1 \
|
||||||
libevent-pthreads-2.1 \
|
libevent-pthreads-2.1 \
|
||||||
|
@ -580,6 +580,8 @@ update_zbx_config() {
|
|||||||
else
|
else
|
||||||
update_config_var $ZBX_CONFIG "AllowRoot" "1"
|
update_config_var $ZBX_CONFIG "AllowRoot" "1"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
command -v openssl >/dev/null 2>&1 && openssl rehash -v "$ZABBIX_USER_HOME_DIR/ssl/ssl_ca/" 1>/dev/null
|
||||||
}
|
}
|
||||||
|
|
||||||
clear_zbx_env() {
|
clear_zbx_env() {
|
||||||
|
@ -17,6 +17,9 @@ services:
|
|||||||
- ${DATA_DIRECTORY}/var/lib/zabbix/enc:/var/lib/zabbix/enc:ro
|
- ${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/ssh_keys:/var/lib/zabbix/ssh_keys:ro
|
||||||
- ${DATA_DIRECTORY}/var/lib/zabbix/mibs:/var/lib/zabbix/mibs: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
|
- snmptraps:/var/lib/zabbix/snmptraps:roz
|
||||||
tmpfs: /tmp
|
tmpfs: /tmp
|
||||||
ulimits:
|
ulimits:
|
||||||
@ -168,6 +171,9 @@ services:
|
|||||||
- ${DATA_DIRECTORY}/var/lib/zabbix/enc:/var/lib/zabbix/enc:ro
|
- ${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/ssh_keys:/var/lib/zabbix/ssh_keys:ro
|
||||||
- ${DATA_DIRECTORY}/var/lib/zabbix/mibs:/var/lib/zabbix/mibs: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
|
- snmptraps:/var/lib/zabbix/snmptraps:ro
|
||||||
tmpfs: /tmp
|
tmpfs: /tmp
|
||||||
ulimits:
|
ulimits:
|
||||||
|
Loading…
x
Reference in New Issue
Block a user