Sync repo with 6.4

This commit is contained in:
Alexey Pustovalov
2024-05-30 18:13:32 +09:00
parent 11b77e5a4e
commit 15ad4769fc
81 changed files with 318 additions and 209 deletions

View File

@ -3,7 +3,7 @@ ARG MAJOR_VERSION=6.0
ARG ZBX_VERSION=${MAJOR_VERSION}.30
ARG BUILD_BASE_IMAGE=zabbix-build-mysql:alpine-${ZBX_VERSION}
FROM ${BUILD_BASE_IMAGE} as builder
FROM ${BUILD_BASE_IMAGE} AS builder
FROM alpine:3.19
@ -79,7 +79,7 @@ RUN set -eux && \
mkdir -p /etc/zabbix && \
mkdir -p /var/lib/zabbix && \
mkdir -p /usr/lib/zabbix/alertscripts && \
mkdir -p /usr/lib/zabbix/dbscripts && \
mkdir -p /var/lib/zabbix/dbscripts && \
mkdir -p /var/lib/zabbix/enc && \
mkdir -p /var/lib/zabbix/export && \
mkdir -p /usr/lib/zabbix/externalscripts && \

View File

@ -3,7 +3,7 @@ ARG MAJOR_VERSION=6.0
ARG ZBX_VERSION=${MAJOR_VERSION}.30
ARG BUILD_BASE_IMAGE=zabbix-build-mysql:centos-${ZBX_VERSION}
FROM ${BUILD_BASE_IMAGE} as builder
FROM ${BUILD_BASE_IMAGE} AS builder
FROM quay.io/centos/centos:stream8
@ -57,22 +57,34 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
zlib \
gzip \
unixODBC" && \
dnf -y module enable mysql && \
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 module enable \
--disablerepo "*" \
--enablerepo "appstream" \
--setopt=tsflags=nodocs \
--setopt=install_weak_deps=False \
--setopt=keepcache=False \
mysql && \
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 \
@ -91,7 +103,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
mkdir -p /etc/zabbix && \
mkdir -p /var/lib/zabbix && \
mkdir -p /usr/lib/zabbix/alertscripts && \
mkdir -p /usr/lib/zabbix/dbscripts && \
mkdir -p /var/lib/zabbix/dbscripts && \
mkdir -p /var/lib/zabbix/enc && \
mkdir -p /var/lib/zabbix/export && \
mkdir -p /usr/lib/zabbix/externalscripts && \

View File

@ -3,7 +3,7 @@ ARG MAJOR_VERSION=6.0
ARG ZBX_VERSION=${MAJOR_VERSION}.30
ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ol-${ZBX_VERSION}
FROM ${BUILD_BASE_IMAGE} as builder
FROM ${BUILD_BASE_IMAGE} AS builder
FROM oraclelinux:8-slim
@ -58,7 +58,13 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
pcre2 \
zlib \
unixODBC" && \
microdnf -y module enable mysql && \
microdnf -y module enable \
--disablerepo "*" \
--enablerepo "ol8_appstream" \
--setopt=install_weak_deps=0 \
--setopt=keepcache=0 \
--best \
--nodocs mysql && \
microdnf -y install \
--disablerepo="*" \
--enablerepo="ol8_baseos_latest" \

View File

@ -4,7 +4,7 @@ ARG RELEASE=30
ARG ZBX_VERSION=${MAJOR_VERSION}.30
ARG BUILD_BASE_IMAGE=zabbix-build-mysql: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
@ -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"]
RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
--mount=type=bind,target=/run/secrets/,src=secrets/ \
set -eux && \
INSTALL_PKGS="bash \
tini \
@ -127,7 +128,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
mkdir -p /etc/zabbix && \
mkdir -p /var/lib/zabbix && \
mkdir -p /usr/lib/zabbix/alertscripts && \
mkdir -p /usr/lib/zabbix/dbscripts && \
mkdir -p /var/lib/zabbix/dbscripts && \
mkdir -p /var/lib/zabbix/enc && \
mkdir -p /var/lib/zabbix/export && \
mkdir -p /usr/lib/zabbix/externalscripts && \

View File

@ -3,7 +3,7 @@ ARG MAJOR_VERSION=6.0
ARG ZBX_VERSION=${MAJOR_VERSION}.30
ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION}
FROM ${BUILD_BASE_IMAGE} as builder
FROM ${BUILD_BASE_IMAGE} AS builder
FROM ubuntu:jammy
@ -82,7 +82,7 @@ RUN --mount=type=cache,target=/var/lib/apt/,sharing=locked \
mkdir -p /etc/zabbix && \
mkdir -p /var/lib/zabbix && \
mkdir -p /usr/lib/zabbix/alertscripts && \
mkdir -p /usr/lib/zabbix/dbscripts && \
mkdir -p /var/lib/zabbix/dbscripts && \
mkdir -p /var/lib/zabbix/enc && \
mkdir -p /var/lib/zabbix/export && \
mkdir -p /usr/lib/zabbix/externalscripts && \