mirror of
https://github.com/zabbix/zabbix-docker.git
synced 2025-08-09 08:35:05 +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-mysql: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-mysql:centos-${ZBX_VERSION}
|
||||
|
||||
FROM ${BUILD_BASE_IMAGE} as builder
|
||||
FROM ${BUILD_BASE_IMAGE} AS builder
|
||||
|
||||
FROM quay.io/centos/centos:stream8
|
||||
|
||||
@ -49,23 +49,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 && \
|
||||
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 && \
|
||||
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-mysql:ol-${ZBX_VERSION}
|
||||
|
||||
FROM ${BUILD_BASE_IMAGE} as builder
|
||||
FROM ${BUILD_BASE_IMAGE} AS builder
|
||||
|
||||
FROM oraclelinux:8-slim
|
||||
|
||||
@ -49,8 +49,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.0 && \
|
||||
microdnf -y module enable \
|
||||
--disablerepo "*" \
|
||||
--enablerepo "ol8_appstream" \
|
||||
--setopt=install_weak_deps=0 \
|
||||
--setopt=keepcache=0 \
|
||||
--best \
|
||||
--nodocs mysql php:8.2 && \
|
||||
microdnf -y install \
|
||||
--disablerepo="*" \
|
||||
--enablerepo="ol8_baseos_latest" \
|
||||
|
@ -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
|
||||
|
||||
|
Reference in New Issue
Block a user