github-mirrors/zabbix-docker
1
0
Fork 0
mirror of https://mirror.skon.top/github.com/zabbix/zabbix-docker synced 2026-04-20 21:00:35 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Cleaning code
Some checks failed
Build images (DockerHub) / Initialize build (push) Has been cancelled
Details
Build images (DockerHub) / Build base on ${{ matrix.os }} (push) Has been cancelled
Details
Build images (DockerHub) / Build ${{ matrix.build }} base on ${{ matrix.os }} (push) Has been cancelled
Details
Build images (DockerHub) / Build ${{ matrix.build }} on ${{ matrix.os }} (push) Has been cancelled
Details
Build images (RedHat) / Initialize build (push) Has been cancelled
Details
Build images (RedHat) / Build ${{ matrix.build }} base (${{ matrix.arch }}) (push) Has been cancelled
Details
Build images (RedHat) / Build ${{ matrix.build }} image (${{ matrix.arch }}) (push) Has been cancelled
Details
Build images (RedHat) / Clear images cache (${{ matrix.arch }}) (push) Has been cancelled
Details

Browse Source
This commit is contained in:
Alexey Pustovalov
2026-04-18 15:40:14 +09:00
parent f3b5d23786
commit 4cb9d7a0e6
22 changed files with 74 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Dockerfiles/agent/centos/Dockerfile
View File

@@ -52,17 +52,17 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
shadow-utils \
zlib" && \
microdnf -y install \
--disablerepo "*" \
--enablerepo "extras-common" \
--disablerepo="*" \
--enablerepo="extras-common" \
--setopt=install_weak_deps=0 \
--setopt=keepcache=0 \
--best \
--nodocs \
epel-release && \
microdnf -y install \
--disablerepo "*" \
--enablerepo "baseos" \
--enablerepo "appstream" \
--disablerepo="*" \
--enablerepo="baseos" \
--enablerepo="appstream" \
--enablerepo="epel" \
--setopt=install_weak_deps=0 \
--setopt=keepcache=0 \
@@ -70,7 +70,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
--nodocs \
${INSTALL_PKGS} && \
microdnf -y reinstall \
--enablerepo "baseos" \
--enablerepo="baseos" \
--setopt=install_weak_deps=0 \
--setopt=keepcache=0 \
--best \

4
Dockerfiles/agent/ol/Dockerfile
View File

@@ -50,8 +50,8 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
openssl-libs \
zlib" && \
microdnf -y install \
--disablerepo "*" \
--enablerepo "ol10_baseos_latest" \
--disablerepo="*" \
--enablerepo="ol10_baseos_latest" \
--setopt=install_weak_deps=0 \
--setopt=keepcache=0 \
--best \

32
Dockerfiles/agent2/centos/Dockerfile
View File

@@ -52,23 +52,25 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
c-ares \
openssl-libs" && \
microdnf -y install \
--disablerepo "*" \
--enablerepo "extras-common" \
--setopt=install_weak_deps=0 \
--setopt=keepcache=0 \
--best \
--nodocs epel-release && \
--disablerepo="*" \
--enablerepo="extras-common" \
--setopt=install_weak_deps=0 \
--setopt=keepcache=0 \
--best \
--nodocs \
epel-release && \
microdnf -y install \
--disablerepo "*" \
--enablerepo "baseos" \
--enablerepo "appstream" \
--enablerepo="epel" \
--setopt=install_weak_deps=0 \
--setopt=keepcache=0 \
--best \
--nodocs ${INSTALL_PKGS} && \
--disablerepo="*" \
--enablerepo="baseos" \
--enablerepo="appstream" \
--enablerepo="epel" \
--setopt=install_weak_deps=0 \
--setopt=keepcache=0 \
--best \
--nodocs \
${INSTALL_PKGS} && \
microdnf -y reinstall \
--enablerepo "baseos" \
--enablerepo="baseos" \
--setopt=install_weak_deps=0 \
--setopt=keepcache=0 \
--best \

4
Dockerfiles/agent2/ol/Dockerfile
View File

@@ -51,8 +51,8 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
c-ares \
openssl-libs" && \
microdnf -y install \
--disablerepo "*" \
--enablerepo "ol10_baseos_latest" \
--disablerepo="*" \
--enablerepo="ol10_baseos_latest" \
--setopt=install_weak_deps=0 \
--setopt=keepcache=0 \
--best \

12
Dockerfiles/build-base/centos/Dockerfile
View File

@@ -52,18 +52,18 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
unixODBC-devel \
zlib-devel" && \
microdnf -y install \
--disablerepo "*" \
--enablerepo "extras-common" \
--disablerepo="*" \
--enablerepo="extras-common" \
--setopt=install_weak_deps=0 \
--setopt=keepcache=0 \
--best \
--nodocs \
epel-release && \
microdnf -y install \
--disablerepo "*" \
--enablerepo "baseos" \
--enablerepo "appstream" \
--enablerepo "crb" \
--disablerepo="*" \
--enablerepo="baseos" \
--enablerepo="appstream" \
--enablerepo="crb" \
--enablerepo="epel" \
--setopt=install_weak_deps=0 \
--setopt=keepcache=0 \

12
Dockerfiles/build-base/ol/Dockerfile
View File

@@ -53,18 +53,18 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
unixODBC-devel \
zlib-devel" && \
microdnf -y install \
--disablerepo "*" \
--enablerepo "ol10_baseos_latest" \
--disablerepo="*" \
--enablerepo="ol10_baseos_latest" \
--setopt=install_weak_deps=0 \
--setopt=keepcache=0 \
--best \
--nodocs \
oracle-epel-release-el10 && \
microdnf -y install \
--disablerepo "*" \
--enablerepo "ol10_baseos_latest" \
--enablerepo "ol10_appstream" \
--enablerepo "ol10_codeready_builder" \
--disablerepo="*" \
--enablerepo="ol10_baseos_latest" \
--enablerepo="ol10_appstream" \
--enablerepo="ol10_codeready_builder" \
--enablerepo="ol10_u1_developer_EPEL" \
--setopt=install_weak_deps=0 \
--setopt=keepcache=0 \

14
Dockerfiles/java-gateway/centos/Dockerfile
View File

@@ -40,13 +40,13 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
java-21-openjdk-headless \
findutils" && \
microdnf -y install \
--disablerepo="*" \
--enablerepo="baseos" \
--enablerepo="appstream" \
--setopt=install_weak_deps=0 \
--setopt=keepcache=0 \
--best \
--nodocs \
--disablerepo="*" \
--enablerepo="baseos" \
--enablerepo="appstream" \
--setopt=install_weak_deps=0 \
--setopt=keepcache=0 \
--best \
--nodocs \
${INSTALL_PKGS} && \
groupadd \
--system \

4
Dockerfiles/proxy-mysql/centos/Dockerfile
View File

@@ -83,7 +83,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
--nodocs \
epel-release && \
microdnf -y install \
--disablerepo "*" \
--disablerepo="*" \
--enablerepo="baseos" \
--enablerepo="appstream" \
--enablerepo="crb" \
@@ -94,7 +94,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
--nodocs \
${INSTALL_PKGS} && \
microdnf -y reinstall \
--enablerepo "baseos" \
--enablerepo="baseos" \
--setopt=install_weak_deps=0 \
--setopt=keepcache=0 \
--best \

4
Dockerfiles/proxy-mysql/ol/Dockerfile
View File

@@ -75,8 +75,8 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
gzip \
unixODBC" && \
microdnf -y install \
--disablerepo "*" \
--enablerepo "ol10_baseos_latest" \
--disablerepo="*" \
--enablerepo="ol10_baseos_latest" \
--setopt=install_weak_deps=0 \
--setopt=keepcache=0 \
--best \

1
Dockerfiles/proxy-mysql/rhel/Dockerfile
View File

@@ -113,6 +113,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
--disablerepo="*" \
--enablerepo="ubi-10-baseos-rpms" \
--setopt=install_weak_deps=0 \
--setopt=keepcache=0 \
--best \
--setopt=tsflags=nodocs \
tzdata && \

4
Dockerfiles/proxy-sqlite3/ol/Dockerfile
View File

@@ -68,8 +68,8 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
zlib \
unixODBC" && \
microdnf -y install \
--disablerepo "*" \
--enablerepo "ol10_baseos_latest" \
--disablerepo="*" \
--enablerepo="ol10_baseos_latest" \
--setopt=install_weak_deps=0 \
--setopt=keepcache=0 \
--best \

2
Dockerfiles/proxy-sqlite3/rhel/Dockerfile
View File

@@ -106,7 +106,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
microdnf -y update \
--disableplugin=subscription-manager \
--disablerepo="*" \
--enablerepo "ubi-10-baseos-rpms" \
--enablerepo="ubi-10-baseos-rpms" \
--setopt=install_weak_deps=0 \
--best \
--setopt=tsflags=nodocs \

8
Dockerfiles/server-mysql/centos/Dockerfile
View File

@@ -86,10 +86,10 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
--nodocs \
epel-release && \
microdnf -y install \
--disablerepo "*" \
--enablerepo "baseos" \
--enablerepo "appstream" \
--enablerepo "crb" \
--disablerepo="*" \
--enablerepo="baseos" \
--enablerepo="appstream" \
--enablerepo="crb" \
--enablerepo="epel" \
--setopt=install_weak_deps=0 \
--setopt=keepcache=0 \

4
Dockerfiles/server-mysql/ol/Dockerfile
View File

@@ -76,8 +76,8 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
gzip \
unixODBC" && \
microdnf -y install \
--disablerepo "*" \
--enablerepo "ol10_baseos_latest" \
--disablerepo="*" \
--enablerepo="ol10_baseos_latest" \
--setopt=install_weak_deps=0 \
--setopt=keepcache=0 \
--best \

3
Dockerfiles/server-mysql/rhel/Dockerfile
View File

@@ -80,7 +80,6 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
iputils \
hostname \
openssl \
libssh \
libpsl \
libbrotli \
libevent \
@@ -115,7 +114,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
microdnf -y update \
--disableplugin=subscription-manager \
--disablerepo="*" \
--enablerepo "ubi-10-baseos-rpms" \
--enablerepo="ubi-10-baseos-rpms" \
--setopt=install_weak_deps=0 \
--best \
--setopt=tsflags=nodocs \

4
Dockerfiles/server-pgsql/ol/Dockerfile
View File

@@ -74,8 +74,8 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
gzip \
unixODBC" && \
microdnf -y install \
--disablerepo "*" \
--enablerepo "ol10_baseos_latest" \
--disablerepo="*" \
--enablerepo="ol10_baseos_latest" \
--setopt=install_weak_deps=0 \
--setopt=keepcache=0 \
--best \

2
Dockerfiles/web-apache-mysql/centos/Dockerfile
View File

@@ -89,7 +89,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
--nodocs \
${INSTALL_PKGS} && \
microdnf -y reinstall \
--enablerepo "baseos" \
--enablerepo="baseos" \
--setopt=install_weak_deps=0 \
--setopt=keepcache=0 \
--best \

2
Dockerfiles/web-apache-pgsql/ol/Dockerfile
View File

@@ -96,7 +96,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
-g zabbix \
--uid 1997 \
--shell /sbin/nologin \
--home-dir ${ZABBIX_USER_HOME_DIR} \
--home-dir ${ZABBIX_USER_HOME_DIR}/ \
zabbix && \
mkdir -p ${ZABBIX_CONF_DIR} \
${ZABBIX_CONF_DIR}/web \

4
Dockerfiles/web-service/ol/Dockerfile
View File

@@ -40,8 +40,8 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
INSTALL_PKGS="bash \
chromium-headless" && \
microdnf -y install \
--disablerepo "*" \
--enablerepo "ol10_baseos_latest" \
--disablerepo="*" \
--enablerepo="ol10_baseos_latest" \
--setopt=install_weak_deps=0 \
--setopt=keepcache=0 \
--best \

2
Dockerfiles/web-service/rhel/Dockerfile
View File

@@ -64,7 +64,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
rm -rf /tmp/epel-release-latest-10.noarch.rpm && \
ARCH_SUFFIX="$(arch)"; \
microdnf -y install \
--disablerepo "*" \
--disablerepo="*" \
--enablerepo="ubi-10-baseos-rpms" \
--enablerepo="ubi-10-appstream-rpms" \
--enablerepo="rhel-10-for-$ARCH_SUFFIX-baseos-rpms" \

13
templates/entrypoints/lib/clear_env.sh
View File

@@ -3,13 +3,8 @@
clear_zbx_env() {
[[ "${ZBX_CLEAR_ENV:-}" == "false" ]] && return
local env_var
while IFS='=' read -r env_var _; do
case "$env_var" in
ZABBIX_*) unset "$env_var" ;;
DB_*) unset "$env_var" ;;
MYSQL_*) unset "$env_var" ;;
POSTGRES_*) unset "$env_var" ;;
esac
done < <(env)
for env_var in "${!ZABBIX_@}" "${!DB_@}" "${!MYSQL_@}" "${!POSTGRES_@}"; do
[[ -n "$env_var" ]] || continue
unset "$env_var" 2>/dev/null || true
done
}

4
templates/entrypoints/lib/config.sh
View File

@@ -59,7 +59,7 @@ update_config_var() {
# Remove configuration parameter definition in case of unset or empty parameter value
if [ -z "$var_value" ]; then
sed -i -e "/^${var_name}=/d" "$config_path"
log_message="$log_message removed"
info "$log_message removed"
return
fi
@@ -70,7 +70,7 @@ update_config_var() {
else
sed -i -e "/^[#;] ${var_name}=/s/.*/&\n${var_name}=/" "$config_path"
fi
log_message="$log_message undefined"
info "$log_message undefined"
return
fi