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

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
@ -47,16 +47,34 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
findutils \
glibc-locale-source \
supervisor" && \
dnf -y install epel-release && \
dnf -y module enable mysql && \
dnf -y module enable php:8.2 nginx:1.24 && \
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 php:8.2 nginx:1.24 && \
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 \
--setopt=keepcache=False \
--best tzdata && \
groupadd \
--system \
--gid 1995 \

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
@ -47,8 +47,13 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
findutils \
glibc-locale-source \
supervisor" && \
microdnf -y module enable mysql && \
microdnf -y module enable php:8.2 nginx:1.24 && \
microdnf -y module enable \
--disablerepo "*" \
--enablerepo "ol8_appstream" \
--setopt=install_weak_deps=0 \
--setopt=keepcache=0 \
--best \
--nodocs mysql php:8.2 nginx:1.24 && \
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

View File

@ -1,6 +1,6 @@
[nginx-stable]
name=nginx stable repo
baseurl=http://nginx.org/packages/rhel/$releasever/$basearch/
baseurl=https://nginx.org/packages/rhel/$releasever/$basearch/
gpgcheck=1
enabled=0
gpgkey=https://nginx.org/keys/nginx_signing.key

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