mirror of
https://github.com/zabbix/zabbix-docker.git
synced 2025-08-09 00:24:58 +02:00
Sync repo with 6.4
This commit is contained in:
@ -3,7 +3,7 @@ ARG MAJOR_VERSION=6.0
|
||||
ARG ZBX_VERSION=${MAJOR_VERSION}.30
|
||||
ARG BUILD_BASE_IMAGE=zabbix-build-sqlite3:alpine-${ZBX_VERSION}
|
||||
|
||||
FROM ${BUILD_BASE_IMAGE} as builder
|
||||
FROM ${BUILD_BASE_IMAGE} AS builder
|
||||
|
||||
FROM alpine:3.19
|
||||
|
||||
|
@ -3,7 +3,7 @@ ARG MAJOR_VERSION=6.0
|
||||
ARG ZBX_VERSION=${MAJOR_VERSION}.30
|
||||
ARG BUILD_BASE_IMAGE=zabbix-build-sqlite3:centos-${ZBX_VERSION}
|
||||
|
||||
FROM ${BUILD_BASE_IMAGE} as builder
|
||||
FROM ${BUILD_BASE_IMAGE} AS builder
|
||||
|
||||
FROM quay.io/centos/centos:stream8
|
||||
|
||||
@ -52,21 +52,27 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
|
||||
pcre2 \
|
||||
zlib \
|
||||
unixODBC" && \
|
||||
dnf -y install epel-release && \
|
||||
dnf -y install \
|
||||
--disablerepo "*" \
|
||||
--enablerepo "${REPOLIST}" \
|
||||
--setopt=tsflags=nodocs \
|
||||
--setopt=install_weak_deps=False \
|
||||
--best \
|
||||
${INSTALL_PKGS} && \
|
||||
--disablerepo "*" \
|
||||
--enablerepo "extras" \
|
||||
--setopt=tsflags=nodocs \
|
||||
--setopt=install_weak_deps=False \
|
||||
--setopt=keepcache=False \
|
||||
--best epel-release && \
|
||||
dnf -y install \
|
||||
--disablerepo "*" \
|
||||
--enablerepo "${REPOLIST}" \
|
||||
--setopt=tsflags=nodocs \
|
||||
--setopt=install_weak_deps=False \
|
||||
--setopt=keepcache=False \
|
||||
--best ${INSTALL_PKGS} && \
|
||||
dnf -y reinstall \
|
||||
--disablerepo "*" \
|
||||
--enablerepo "baseos" \
|
||||
--setopt=tsflags=nodocs \
|
||||
--setopt=install_weak_deps=False \
|
||||
--best \
|
||||
tzdata && \
|
||||
--disablerepo "*" \
|
||||
--enablerepo "baseos" \
|
||||
--setopt=tsflags=nodocs \
|
||||
--setopt=install_weak_deps=False \
|
||||
--setopt=keepcache=False \
|
||||
--best tzdata && \
|
||||
groupadd \
|
||||
--system \
|
||||
--gid 1995 \
|
||||
|
@ -3,7 +3,7 @@ ARG MAJOR_VERSION=6.0
|
||||
ARG ZBX_VERSION=${MAJOR_VERSION}.30
|
||||
ARG BUILD_BASE_IMAGE=zabbix-build-sqlite3:ol-${ZBX_VERSION}
|
||||
|
||||
FROM ${BUILD_BASE_IMAGE} as builder
|
||||
FROM ${BUILD_BASE_IMAGE} AS builder
|
||||
|
||||
FROM oraclelinux:8-slim
|
||||
|
||||
|
@ -4,7 +4,7 @@ ARG RELEASE=30
|
||||
ARG ZBX_VERSION=${MAJOR_VERSION}.30
|
||||
ARG BUILD_BASE_IMAGE=zabbix-build-sqlite3:rhel-${ZBX_VERSION}
|
||||
|
||||
FROM ${BUILD_BASE_IMAGE} as builder
|
||||
FROM ${BUILD_BASE_IMAGE} AS builder
|
||||
|
||||
FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10
|
||||
|
||||
@ -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"]
|
||||
|
||||
RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
|
||||
--mount=type=bind,target=/run/secrets/,src=secrets/ \
|
||||
set -eux && \
|
||||
INSTALL_PKGS="bash \
|
||||
tini \
|
||||
@ -87,6 +88,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
|
||||
--setopt=tsflags=nodocs \
|
||||
${INSTALL_PKGS} && \
|
||||
microdnf -y reinstall \
|
||||
--disableplugin=subscription-manager \
|
||||
--enablerepo "ubi-8-baseos-rpms" \
|
||||
--setopt=install_weak_deps=0 \
|
||||
--setopt=keepcache=0 \
|
||||
|
@ -3,7 +3,7 @@ ARG MAJOR_VERSION=6.0
|
||||
ARG ZBX_VERSION=${MAJOR_VERSION}.30
|
||||
ARG BUILD_BASE_IMAGE=zabbix-build-sqlite3:ubuntu-${ZBX_VERSION}
|
||||
|
||||
FROM ${BUILD_BASE_IMAGE} as builder
|
||||
FROM ${BUILD_BASE_IMAGE} AS builder
|
||||
|
||||
FROM ubuntu:jammy
|
||||
|
||||
|
Reference in New Issue
Block a user