mirror of
https://github.com/zabbix/zabbix-docker.git
synced 2025-04-27 04:38:48 +02:00
Review RHEL images. Removed unnecessary packages / repisotories
This commit is contained in:
parent
8f04de55ee
commit
00a28c821c
5
.env
5
.env
@ -3,6 +3,7 @@ ZABBIX_ALPINE_IMAGE_TAG=alpine-6.4
|
|||||||
ZABBIX_CENTOS_IMAGE_TAG=centos-6.4
|
ZABBIX_CENTOS_IMAGE_TAG=centos-6.4
|
||||||
ZABBIX_OL_IMAGE_TAG=ol-6.4
|
ZABBIX_OL_IMAGE_TAG=ol-6.4
|
||||||
ZABBIX_UBUNTU_IMAGE_TAG=ubuntu-6.4
|
ZABBIX_UBUNTU_IMAGE_TAG=ubuntu-6.4
|
||||||
|
ZABBIX_RHEL_IMAGE_TAG=rhel-6.4
|
||||||
ZABBIX_IMAGE_TAG_POSTFIX=-latest
|
ZABBIX_IMAGE_TAG_POSTFIX=-latest
|
||||||
ZABBIX_LOCAL_IMAGE_TAG_POSTFIX=-local
|
ZABBIX_LOCAL_IMAGE_TAG_POSTFIX=-local
|
||||||
|
|
||||||
@ -65,6 +66,7 @@ ALPINE_CACHE_FROM=alpine:3.19
|
|||||||
CENTOS_CACHE_FROM=quay.io/centos/centos:stream9
|
CENTOS_CACHE_FROM=quay.io/centos/centos:stream9
|
||||||
OL_CACHE_FROM=oraclelinux:9-slim
|
OL_CACHE_FROM=oraclelinux:9-slim
|
||||||
UBUNTU_CACHE_FROM=ubuntu:jammy
|
UBUNTU_CACHE_FROM=ubuntu:jammy
|
||||||
|
RHEL_CACHE_FROM=registry.access.redhat.com/ubi9/ubi-minimal:9.3
|
||||||
|
|
||||||
# Base images
|
# Base images
|
||||||
BUILD_BASE_IMAGE=zabbix-build-base
|
BUILD_BASE_IMAGE=zabbix-build-base
|
||||||
@ -84,3 +86,6 @@ OL_OS_TAG_SHORT=ol
|
|||||||
|
|
||||||
UBUNTU_OS_TAG=Ubuntu
|
UBUNTU_OS_TAG=Ubuntu
|
||||||
UBUNTU_OS_TAG_SHORT=ubuntu
|
UBUNTU_OS_TAG_SHORT=ubuntu
|
||||||
|
|
||||||
|
RHEL_OS_TAG=Red Hat
|
||||||
|
RHEL_OS_TAG_SHORT=rhel
|
||||||
|
1
.gitignore
vendored
1
.gitignore
vendored
@ -3,3 +3,4 @@ zbx_env*/
|
|||||||
.*CERT_FILE
|
.*CERT_FILE
|
||||||
.*KEY_FILE
|
.*KEY_FILE
|
||||||
.*CA_FILE
|
.*CA_FILE
|
||||||
|
Dockerfiles/*/rhel/secrets/*
|
||||||
|
@ -54,7 +54,6 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
|
|||||||
set -eux && \
|
set -eux && \
|
||||||
INSTALL_PKGS="bash \
|
INSTALL_PKGS="bash \
|
||||||
tini \
|
tini \
|
||||||
tzdata \
|
|
||||||
iputils \
|
iputils \
|
||||||
shadow-utils \
|
shadow-utils \
|
||||||
pcre2 \
|
pcre2 \
|
||||||
@ -64,6 +63,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
|
|||||||
rpm -ivh /tmp/epel-release-latest-9.noarch.rpm && \
|
rpm -ivh /tmp/epel-release-latest-9.noarch.rpm && \
|
||||||
rm -rf /tmp/epel-release-latest-9.noarch.rpm && \
|
rm -rf /tmp/epel-release-latest-9.noarch.rpm && \
|
||||||
microdnf -y install \
|
microdnf -y install \
|
||||||
|
--disableplugin=subscription-manager \
|
||||||
--disablerepo "*" \
|
--disablerepo "*" \
|
||||||
--enablerepo "ubi-9-baseos-rpms" \
|
--enablerepo "ubi-9-baseos-rpms" \
|
||||||
--enablerepo "epel" \
|
--enablerepo "epel" \
|
||||||
@ -72,7 +72,17 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
|
|||||||
--best \
|
--best \
|
||||||
--setopt=tsflags=nodocs \
|
--setopt=tsflags=nodocs \
|
||||||
${INSTALL_PKGS} && \
|
${INSTALL_PKGS} && \
|
||||||
|
microdnf -y update \
|
||||||
|
--disableplugin=subscription-manager \
|
||||||
|
--disablerepo "*" \
|
||||||
|
--enablerepo "ubi-9-baseos-rpms" \
|
||||||
|
--setopt=install_weak_deps=0 \
|
||||||
|
--best \
|
||||||
|
--setopt=tsflags=nodocs \
|
||||||
|
tzdata && \
|
||||||
microdnf -y reinstall \
|
microdnf -y reinstall \
|
||||||
|
--disableplugin=subscription-manager \
|
||||||
|
--disablerepo "*" \
|
||||||
--enablerepo "ubi-9-baseos-rpms" \
|
--enablerepo "ubi-9-baseos-rpms" \
|
||||||
--setopt=install_weak_deps=0 \
|
--setopt=install_weak_deps=0 \
|
||||||
--setopt=keepcache=0 \
|
--setopt=keepcache=0 \
|
||||||
|
@ -59,7 +59,6 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
|
|||||||
set -eux && \
|
set -eux && \
|
||||||
INSTALL_PKGS="bash \
|
INSTALL_PKGS="bash \
|
||||||
tini \
|
tini \
|
||||||
tzdata \
|
|
||||||
iputils \
|
iputils \
|
||||||
shadow-utils \
|
shadow-utils \
|
||||||
pcre2 \
|
pcre2 \
|
||||||
@ -70,6 +69,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
|
|||||||
rpm -ivh /tmp/epel-release-latest-9.noarch.rpm && \
|
rpm -ivh /tmp/epel-release-latest-9.noarch.rpm && \
|
||||||
rm -rf /tmp/epel-release-latest-9.noarch.rpm && \
|
rm -rf /tmp/epel-release-latest-9.noarch.rpm && \
|
||||||
microdnf -y install \
|
microdnf -y install \
|
||||||
|
--disableplugin=subscription-manager \
|
||||||
--disablerepo "*" \
|
--disablerepo "*" \
|
||||||
--enablerepo "ubi-9-baseos-rpms" \
|
--enablerepo "ubi-9-baseos-rpms" \
|
||||||
--enablerepo "epel" \
|
--enablerepo "epel" \
|
||||||
@ -78,7 +78,17 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
|
|||||||
--best \
|
--best \
|
||||||
--setopt=tsflags=nodocs \
|
--setopt=tsflags=nodocs \
|
||||||
${INSTALL_PKGS} && \
|
${INSTALL_PKGS} && \
|
||||||
|
microdnf -y update \
|
||||||
|
--disableplugin=subscription-manager \
|
||||||
|
--disablerepo "*" \
|
||||||
|
--enablerepo "ubi-9-baseos-rpms" \
|
||||||
|
--setopt=install_weak_deps=0 \
|
||||||
|
--best \
|
||||||
|
--setopt=tsflags=nodocs \
|
||||||
|
tzdata && \
|
||||||
microdnf -y reinstall \
|
microdnf -y reinstall \
|
||||||
|
--disableplugin=subscription-manager \
|
||||||
|
--disablerepo "*" \
|
||||||
--enablerepo "ubi-9-baseos-rpms" \
|
--enablerepo "ubi-9-baseos-rpms" \
|
||||||
--setopt=install_weak_deps=0 \
|
--setopt=install_weak_deps=0 \
|
||||||
--setopt=keepcache=0 \
|
--setopt=keepcache=0 \
|
||||||
|
@ -30,6 +30,7 @@ LABEL description="Prepared environment to build Zabbix components" \
|
|||||||
COPY ["licenses", "/licenses"]
|
COPY ["licenses", "/licenses"]
|
||||||
|
|
||||||
RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
|
RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
|
||||||
|
--mount=type=bind,target=/run/secrets/,src=secrets/ \
|
||||||
set -eux && \
|
set -eux && \
|
||||||
INSTALL_PKGS="autoconf \
|
INSTALL_PKGS="autoconf \
|
||||||
automake \
|
automake \
|
||||||
|
@ -55,6 +55,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
|
|||||||
shadow-utils \
|
shadow-utils \
|
||||||
java-17-openjdk-headless" && \
|
java-17-openjdk-headless" && \
|
||||||
microdnf -y install \
|
microdnf -y install \
|
||||||
|
--disableplugin=subscription-manager \
|
||||||
--disablerepo "*" \
|
--disablerepo "*" \
|
||||||
--enablerepo "ubi-9-baseos-rpms" \
|
--enablerepo "ubi-9-baseos-rpms" \
|
||||||
--enablerepo "ubi-9-appstream-rpms" \
|
--enablerepo "ubi-9-appstream-rpms" \
|
||||||
|
@ -54,6 +54,7 @@ COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/conf/zabbix_proxy.conf", "/etc/
|
|||||||
COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/database/mysql/create_proxy.sql.gz", "/usr/share/doc/zabbix-proxy-mysql/create.sql.gz"]
|
COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/database/mysql/create_proxy.sql.gz", "/usr/share/doc/zabbix-proxy-mysql/create.sql.gz"]
|
||||||
|
|
||||||
RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
|
RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
|
||||||
|
--mount=type=bind,target=/run/secrets/,src=secrets/ \
|
||||||
set -eux && \
|
set -eux && \
|
||||||
INSTALL_PKGS="bash \
|
INSTALL_PKGS="bash \
|
||||||
tini \
|
tini \
|
||||||
@ -91,7 +92,17 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
|
|||||||
--best \
|
--best \
|
||||||
--setopt=tsflags=nodocs \
|
--setopt=tsflags=nodocs \
|
||||||
${INSTALL_PKGS} && \
|
${INSTALL_PKGS} && \
|
||||||
|
microdnf -y update \
|
||||||
|
--disableplugin=subscription-manager \
|
||||||
|
--disablerepo "*" \
|
||||||
|
--enablerepo "ubi-9-baseos-rpms" \
|
||||||
|
--setopt=install_weak_deps=0 \
|
||||||
|
--best \
|
||||||
|
--setopt=tsflags=nodocs \
|
||||||
|
tzdata && \
|
||||||
microdnf -y reinstall \
|
microdnf -y reinstall \
|
||||||
|
--disableplugin=subscription-manager \
|
||||||
|
--disablerepo "*" \
|
||||||
--enablerepo "ubi-9-baseos-rpms" \
|
--enablerepo "ubi-9-baseos-rpms" \
|
||||||
--setopt=install_weak_deps=0 \
|
--setopt=install_weak_deps=0 \
|
||||||
--best \
|
--best \
|
||||||
|
@ -53,6 +53,7 @@ COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/src/zabbix_sender/zabbix_sender
|
|||||||
COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/conf/zabbix_proxy.conf", "/etc/zabbix/zabbix_proxy.conf"]
|
COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/conf/zabbix_proxy.conf", "/etc/zabbix/zabbix_proxy.conf"]
|
||||||
|
|
||||||
RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
|
RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
|
||||||
|
--mount=type=bind,target=/run/secrets/,src=secrets/ \
|
||||||
set -eux && \
|
set -eux && \
|
||||||
INSTALL_PKGS="bash \
|
INSTALL_PKGS="bash \
|
||||||
tini \
|
tini \
|
||||||
@ -87,7 +88,17 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
|
|||||||
--best \
|
--best \
|
||||||
--setopt=tsflags=nodocs \
|
--setopt=tsflags=nodocs \
|
||||||
${INSTALL_PKGS} && \
|
${INSTALL_PKGS} && \
|
||||||
|
microdnf -y update \
|
||||||
|
--disableplugin=subscription-manager \
|
||||||
|
--disablerepo "*" \
|
||||||
|
--enablerepo "ubi-9-baseos-rpms" \
|
||||||
|
--setopt=install_weak_deps=0 \
|
||||||
|
--best \
|
||||||
|
--setopt=tsflags=nodocs \
|
||||||
|
tzdata && \
|
||||||
microdnf -y reinstall \
|
microdnf -y reinstall \
|
||||||
|
--disableplugin=subscription-manager \
|
||||||
|
--disablerepo "*" \
|
||||||
--enablerepo "ubi-9-baseos-rpms" \
|
--enablerepo "ubi-9-baseos-rpms" \
|
||||||
--setopt=install_weak_deps=0 \
|
--setopt=install_weak_deps=0 \
|
||||||
--setopt=keepcache=0 \
|
--setopt=keepcache=0 \
|
||||||
|
@ -54,6 +54,7 @@ COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/conf/zabbix_server.conf", "/etc
|
|||||||
COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/database/mysql/create_server.sql.gz", "/usr/share/doc/zabbix-server-mysql/create.sql.gz"]
|
COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/database/mysql/create_server.sql.gz", "/usr/share/doc/zabbix-server-mysql/create.sql.gz"]
|
||||||
|
|
||||||
RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
|
RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
|
||||||
|
--mount=type=bind,target=/run/secrets/,src=secrets/ \
|
||||||
set -eux && \
|
set -eux && \
|
||||||
INSTALL_PKGS="bash \
|
INSTALL_PKGS="bash \
|
||||||
tini \
|
tini \
|
||||||
@ -61,7 +62,6 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
|
|||||||
nmap \
|
nmap \
|
||||||
fping \
|
fping \
|
||||||
shadow-utils \
|
shadow-utils \
|
||||||
tzdata \
|
|
||||||
iputils \
|
iputils \
|
||||||
hostname \
|
hostname \
|
||||||
libssh \
|
libssh \
|
||||||
@ -95,7 +95,17 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
|
|||||||
--best \
|
--best \
|
||||||
--setopt=tsflags=nodocs \
|
--setopt=tsflags=nodocs \
|
||||||
${INSTALL_PKGS} && \
|
${INSTALL_PKGS} && \
|
||||||
|
microdnf -y update \
|
||||||
|
--disableplugin=subscription-manager \
|
||||||
|
--disablerepo "*" \
|
||||||
|
--enablerepo "ubi-9-baseos-rpms" \
|
||||||
|
--setopt=install_weak_deps=0 \
|
||||||
|
--best \
|
||||||
|
--setopt=tsflags=nodocs \
|
||||||
|
tzdata && \
|
||||||
microdnf -y reinstall \
|
microdnf -y reinstall \
|
||||||
|
--disableplugin=subscription-manager \
|
||||||
|
--disablerepo "*" \
|
||||||
--enablerepo "ubi-9-baseos-rpms" \
|
--enablerepo "ubi-9-baseos-rpms" \
|
||||||
--setopt=install_weak_deps=0 \
|
--setopt=install_weak_deps=0 \
|
||||||
--setopt=keepcache=0 \
|
--setopt=keepcache=0 \
|
||||||
|
@ -46,9 +46,9 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
|
|||||||
set -eux && \
|
set -eux && \
|
||||||
INSTALL_PKGS="bash \
|
INSTALL_PKGS="bash \
|
||||||
shadow-utils \
|
shadow-utils \
|
||||||
tzdata \
|
|
||||||
net-snmp" && \
|
net-snmp" && \
|
||||||
microdnf -y install \
|
microdnf -y install \
|
||||||
|
--disableplugin=subscription-manager \
|
||||||
--disablerepo="*" \
|
--disablerepo="*" \
|
||||||
--enablerepo "ubi-9-baseos-rpms" \
|
--enablerepo "ubi-9-baseos-rpms" \
|
||||||
--enablerepo "ubi-9-appstream-rpms" \
|
--enablerepo "ubi-9-appstream-rpms" \
|
||||||
@ -57,6 +57,23 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
|
|||||||
--best \
|
--best \
|
||||||
--setopt=tsflags=nodocs \
|
--setopt=tsflags=nodocs \
|
||||||
${INSTALL_PKGS} && \
|
${INSTALL_PKGS} && \
|
||||||
|
microdnf -y update \
|
||||||
|
--disableplugin=subscription-manager \
|
||||||
|
--disablerepo "*" \
|
||||||
|
--enablerepo "ubi-9-baseos-rpms" \
|
||||||
|
--setopt=install_weak_deps=0 \
|
||||||
|
--best \
|
||||||
|
--setopt=tsflags=nodocs \
|
||||||
|
tzdata && \
|
||||||
|
microdnf -y reinstall \
|
||||||
|
--disableplugin=subscription-manager \
|
||||||
|
--disablerepo "*" \
|
||||||
|
--enablerepo "ubi-9-baseos-rpms" \
|
||||||
|
--setopt=install_weak_deps=0 \
|
||||||
|
--setopt=keepcache=0 \
|
||||||
|
--best \
|
||||||
|
--setopt=tsflags=nodocs \
|
||||||
|
tzdata && \
|
||||||
groupadd \
|
groupadd \
|
||||||
--system \
|
--system \
|
||||||
--gid 1995 \
|
--gid 1995 \
|
||||||
|
@ -49,9 +49,9 @@ COPY ["conf/etc/", "/etc/"]
|
|||||||
COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/ui", "/usr/share/zabbix"]
|
COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/ui", "/usr/share/zabbix"]
|
||||||
|
|
||||||
RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
|
RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
|
||||||
|
--mount=type=bind,target=/run/secrets/,src=secrets/ \
|
||||||
set -eux && \
|
set -eux && \
|
||||||
INSTALL_PKGS="bash \
|
INSTALL_PKGS="bash \
|
||||||
tzdata \
|
|
||||||
curl-minimal \
|
curl-minimal \
|
||||||
supervisor \
|
supervisor \
|
||||||
shadow-utils \
|
shadow-utils \
|
||||||
@ -83,12 +83,22 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
|
|||||||
--best \
|
--best \
|
||||||
--setopt=tsflags=nodocs \
|
--setopt=tsflags=nodocs \
|
||||||
${INSTALL_PKGS} && \
|
${INSTALL_PKGS} && \
|
||||||
microdnf -y reinstall \
|
microdnf -y update \
|
||||||
|
--disableplugin=subscription-manager \
|
||||||
|
--disablerepo "*" \
|
||||||
--enablerepo "ubi-9-baseos-rpms" \
|
--enablerepo "ubi-9-baseos-rpms" \
|
||||||
--setopt=install_weak_deps=0 \
|
--setopt=install_weak_deps=0 \
|
||||||
--best \
|
--best \
|
||||||
--setopt=tsflags=nodocs \
|
--setopt=tsflags=nodocs \
|
||||||
|
tzdata && \
|
||||||
|
microdnf -y reinstall \
|
||||||
|
--disableplugin=subscription-manager \
|
||||||
|
--disablerepo "*" \
|
||||||
|
--enablerepo "ubi-9-baseos-rpms" \
|
||||||
|
--setopt=install_weak_deps=0 \
|
||||||
--setopt=keepcache=0 \
|
--setopt=keepcache=0 \
|
||||||
|
--best \
|
||||||
|
--setopt=tsflags=nodocs \
|
||||||
tzdata && \
|
tzdata && \
|
||||||
groupadd \
|
groupadd \
|
||||||
--system \
|
--system \
|
||||||
|
@ -50,6 +50,7 @@ COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/src/go/bin/zabbix_web_service",
|
|||||||
COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/src/go/conf/zabbix_web_service.conf", "/etc/zabbix/zabbix_web_service.conf"]
|
COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/src/go/conf/zabbix_web_service.conf", "/etc/zabbix/zabbix_web_service.conf"]
|
||||||
|
|
||||||
RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
|
RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
|
||||||
|
--mount=type=bind,target=/run/secrets/,src=secrets/ \
|
||||||
set -eux && \
|
set -eux && \
|
||||||
INSTALL_PKGS="bash \
|
INSTALL_PKGS="bash \
|
||||||
shadow-utils \
|
shadow-utils \
|
||||||
@ -62,7 +63,6 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
|
|||||||
--disablerepo "*" \
|
--disablerepo "*" \
|
||||||
--enablerepo "ubi-9-baseos-rpms" \
|
--enablerepo "ubi-9-baseos-rpms" \
|
||||||
--enablerepo "ubi-9-appstream-rpms" \
|
--enablerepo "ubi-9-appstream-rpms" \
|
||||||
--enablerepo "rhel-9-for-$ARCH_SUFFIX-baseos-rpms" \
|
|
||||||
--enablerepo "rhel-9-for-$ARCH_SUFFIX-appstream-rpms" \
|
--enablerepo "rhel-9-for-$ARCH_SUFFIX-appstream-rpms" \
|
||||||
--enablerepo "epel" \
|
--enablerepo "epel" \
|
||||||
--setopt=install_weak_deps=0 \
|
--setopt=install_weak_deps=0 \
|
||||||
@ -71,6 +71,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
|
|||||||
--setopt=tsflags=nodocs \
|
--setopt=tsflags=nodocs \
|
||||||
${INSTALL_PKGS} && \
|
${INSTALL_PKGS} && \
|
||||||
microdnf -y install \
|
microdnf -y install \
|
||||||
|
--disableplugin=subscription-manager \
|
||||||
--disablerepo "*" \
|
--disablerepo "*" \
|
||||||
--enablerepo "ubi-9-baseos-rpms" \
|
--enablerepo "ubi-9-baseos-rpms" \
|
||||||
--enablerepo "ubi-9-appstream-rpms" \
|
--enablerepo "ubi-9-appstream-rpms" \
|
||||||
|
Loading…
Reference in New Issue
Block a user