extern/zabbix-docker
1
0
Fork 0
mirror of https://github.com/zabbix/zabbix-docker.git synced 2025-02-23 05:10:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated CentOS from stream8 to stream9

Browse Source
This commit is contained in:
Alexey Pustovalov 2023-02-01 15:20:30 +09:00
parent b40f47f7f7
commit 9d1218115c
16 changed files with 47 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Dockerfiles/agent/centos/Dockerfile
View File

@ -5,7 +5,7 @@ ARG BUILD_BASE_IMAGE=zabbix-build-mysql:centos-${ZBX_VERSION}
FROM ${BUILD_BASE_IMAGE} as builder
FROM quay.io/centos/centos:stream8
FROM quay.io/centos/centos:stream9
ARG MAJOR_VERSION
ARG ZBX_VERSION
@ -38,7 +38,7 @@ RUN set -eux && \
tzdata \
iputils \
pcre2 \
libcurl \
libcurl-minimal \
openssl-libs \
zlib" && \
dnf -y install epel-release && \

4
Dockerfiles/agent2/centos/Dockerfile
View File

@ -5,7 +5,7 @@ ARG BUILD_BASE_IMAGE=zabbix-build-mysql:centos-${ZBX_VERSION}
FROM ${BUILD_BASE_IMAGE} as builder
FROM quay.io/centos/centos:stream8
FROM quay.io/centos/centos:stream9
ARG MAJOR_VERSION
ARG ZBX_VERSION
@ -43,7 +43,7 @@ RUN set -eux && \
tzdata \
iputils \
pcre2 \
libcurl \
libcurl-minimal \
smartmontools \
sudo \
openssl-libs" && \

5
Dockerfiles/build-base/centos/Dockerfile
View File

@ -1,5 +1,5 @@
# syntax=docker/dockerfile:1
FROM quay.io/centos/centos:stream8
FROM quay.io/centos/centos:stream9
ARG MAJOR_VERSION=6.4
ARG ZBX_VERSION=${MAJOR_VERSION}
@ -18,7 +18,7 @@ LABEL org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zab
org.opencontainers.image.version="${ZBX_VERSION}"
RUN set -eux && \
REPOLIST="baseos,appstream,powertools" && \
REPOLIST="baseos,appstream,crb" && \
INSTALL_PKGS="autoconf \
automake \
bash \
@ -43,7 +43,6 @@ RUN set -eux && \
gettext \
go-toolset \
unixODBC-devel" && \
dnf -y module enable mysql && \
dnf -y install \
--disablerepo "*" \
--enablerepo "${REPOLIST}" \

2
Dockerfiles/java-gateway/centos/Dockerfile
View File

@ -5,7 +5,7 @@ ARG BUILD_BASE_IMAGE=zabbix-build-mysql:centos-${ZBX_VERSION}
FROM ${BUILD_BASE_IMAGE} as builder
FROM quay.io/centos/centos:stream8
FROM quay.io/centos/centos:stream9
ARG MAJOR_VERSION
ARG ZBX_VERSION

5
Dockerfiles/proxy-mysql/centos/Dockerfile
View File

@ -5,7 +5,7 @@ ARG BUILD_BASE_IMAGE=zabbix-build-mysql:centos-${ZBX_VERSION}
FROM ${BUILD_BASE_IMAGE} as builder
FROM quay.io/centos/centos:stream8
FROM quay.io/centos/centos:stream9
ARG MAJOR_VERSION
ARG ZBX_VERSION
@ -34,7 +34,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"]
RUN set -eux && \
REPOLIST="baseos,appstream,epel" && \
REPOLIST="baseos,appstream,crb,epel" && \
INSTALL_PKGS="libevent \
tini \
sudo \
@ -54,7 +54,6 @@ RUN set -eux && \
pcre2 \
zlib \
unixODBC" && \
dnf -y module enable mysql && \
dnf -y install epel-release && \
dnf -y install \
--disablerepo "*" \

2
Dockerfiles/proxy-sqlite3/centos/Dockerfile
View File

@ -5,7 +5,7 @@ ARG BUILD_BASE_IMAGE=zabbix-build-sqlite3:centos-${ZBX_VERSION}
FROM ${BUILD_BASE_IMAGE} as builder
FROM quay.io/centos/centos:stream8
FROM quay.io/centos/centos:stream9
ARG MAJOR_VERSION
ARG ZBX_VERSION

5
Dockerfiles/server-mysql/centos/Dockerfile
View File

@ -5,7 +5,7 @@ ARG BUILD_BASE_IMAGE=zabbix-build-mysql:centos-${ZBX_VERSION}
FROM ${BUILD_BASE_IMAGE} as builder
FROM quay.io/centos/centos:stream8
FROM quay.io/centos/centos:stream9
ARG MAJOR_VERSION
ARG ZBX_VERSION
@ -34,7 +34,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 set -eux && \
REPOLIST="baseos,appstream,epel" && \
REPOLIST="baseos,appstream,crb,epel" && \
INSTALL_PKGS="fping \
tini \
sudo \
@ -56,7 +56,6 @@ RUN set -eux && \
pcre2 \
zlib \
unixODBC" && \
dnf -y module enable mysql && \
dnf -y install epel-release && \
dnf -y install \
--disablerepo "*" \

2
Dockerfiles/server-pgsql/centos/Dockerfile
View File

@ -5,7 +5,7 @@ ARG BUILD_BASE_IMAGE=zabbix-build-pgsql:centos-${ZBX_VERSION}
FROM ${BUILD_BASE_IMAGE} as builder
FROM quay.io/centos/centos:stream8
FROM quay.io/centos/centos:stream9
ARG MAJOR_VERSION
ARG ZBX_VERSION

2
Dockerfiles/snmptraps/centos/Dockerfile
View File

@ -1,4 +1,4 @@
FROM quay.io/centos/centos:stream8
FROM quay.io/centos/centos:stream9
ARG MAJOR_VERSION=6.4
ARG ZBX_VERSION=${MAJOR_VERSION}

6
Dockerfiles/web-apache-mysql/centos/Dockerfile
View File

@ -5,7 +5,7 @@ ARG BUILD_BASE_IMAGE=zabbix-build-mysql:centos-${ZBX_VERSION}
FROM ${BUILD_BASE_IMAGE} as builder
FROM quay.io/centos/centos:stream8
FROM quay.io/centos/centos:stream9
ARG MAJOR_VERSION
ARG ZBX_VERSION
@ -32,7 +32,7 @@ COPY ["conf/etc/", "/etc/"]
RUN set -eux && \
REPOLIST="baseos,appstream,epel" && \
INSTALL_PKGS="bash \
curl \
curl-minimal \
httpd \
mysql \
mod_ssl \
@ -49,8 +49,6 @@ RUN set -eux && \
glibc-locale-source \
supervisor" && \
dnf -y install epel-release && \
dnf -y module enable mysql && \
dnf -y module enable php:8.0 && \
dnf -y install \
--disablerepo "*" \
--enablerepo "${REPOLIST}" \

3
Dockerfiles/web-apache-pgsql/centos/Dockerfile
View File

@ -5,7 +5,7 @@ ARG BUILD_BASE_IMAGE=zabbix-build-mysql:centos-${ZBX_VERSION}
FROM ${BUILD_BASE_IMAGE} as builder
FROM quay.io/centos/centos:stream8
FROM quay.io/centos/centos:stream9
ARG MAJOR_VERSION
ARG ZBX_VERSION
@ -49,7 +49,6 @@ RUN set -eux && \
glibc-locale-source \
supervisor" && \
dnf -y install epel-release && \
dnf -y module enable php:8.0 && \
dnf -y install \
--disablerepo "*" \
--enablerepo "${REPOLIST}" \

6
Dockerfiles/web-nginx-mysql/centos/Dockerfile
View File

@ -5,7 +5,7 @@ ARG BUILD_BASE_IMAGE=zabbix-build-mysql:centos-${ZBX_VERSION}
FROM ${BUILD_BASE_IMAGE} as builder
FROM quay.io/centos/centos:stream8
FROM quay.io/centos/centos:stream9
ARG MAJOR_VERSION
ARG ZBX_VERSION
@ -32,7 +32,7 @@ COPY ["conf/etc/", "/etc/"]
RUN set -eux && \
REPOLIST="baseos,appstream,epel" && \
INSTALL_PKGS="bash \
curl \
curl-minimal \
mysql \
nginx \
php-bcmath \
@ -47,8 +47,6 @@ RUN set -eux && \
glibc-locale-source \
supervisor" && \
dnf -y install epel-release && \
dnf -y module enable mysql && \
dnf -y module enable php:8.0 nginx:1.20 && \
dnf -y install \
--disablerepo "*" \
--enablerepo "${REPOLIST}" \

5
Dockerfiles/web-nginx-pgsql/centos/Dockerfile
View File

@ -5,7 +5,7 @@ ARG BUILD_BASE_IMAGE=zabbix-build-pgsql:centos-${ZBX_VERSION}
FROM ${BUILD_BASE_IMAGE} as builder
FROM quay.io/centos/centos:stream8
FROM quay.io/centos/centos:stream9
ARG MAJOR_VERSION
ARG ZBX_VERSION
@ -32,7 +32,7 @@ COPY ["conf/etc/", "/etc/"]
RUN set -eux && \
REPOLIST="baseos,appstream,epel" && \
INSTALL_PKGS="bash \
curl \
curl-minimal \
findutils \
glibc-locale-source \
nginx \
@ -47,7 +47,6 @@ RUN set -eux && \
postgresql \
supervisor" && \
dnf -y install epel-release && \
dnf -y module enable php:8.0 nginx:1.20 && \
dnf -y install \
--disablerepo "*" \
--enablerepo "${REPOLIST}" \

2
Dockerfiles/web-service/centos/Dockerfile
View File

@ -5,7 +5,7 @@ ARG BUILD_BASE_IMAGE=zabbix-build-mysql:centos-${ZBX_VERSION}
FROM ${BUILD_BASE_IMAGE} as builder
FROM quay.io/centos/centos:stream8
FROM quay.io/centos/centos:stream9
ARG MAJOR_VERSION
ARG ZBX_VERSION

24
docker-compose_v3_centos_mysql_local.yaml
View File

@ -4,14 +4,14 @@ services:
build:
context: ./Dockerfiles/build-base/centos
cache_from:
- quay.io/centos/centos:stream8
- quay.io/centos/centos:stream9
image: zabbix-build-base:centos-local
zabbix-build-mysql:
build:
context: ./Dockerfiles/build-mysql/centos
cache_from:
- quay.io/centos/centos:stream8
- quay.io/centos/centos:stream9
args:
BUILD_BASE_IMAGE: zabbix-build-base:centos-local
image: zabbix-build-mysql:centos-local
@ -22,7 +22,7 @@ services:
build:
context: ./Dockerfiles/build-sqlite3/centos
cache_from:
- quay.io/centos/centos:stream8
- quay.io/centos/centos:stream9
args:
BUILD_BASE_IMAGE: zabbix-build-base:centos-local
image: zabbix-build-sqlite3:centos-local
@ -35,7 +35,7 @@ services:
build:
context: ./Dockerfiles/server-mysql/centos
cache_from:
- quay.io/centos/centos:stream8
- quay.io/centos/centos:stream9
args:
BUILD_BASE_IMAGE: zabbix-build-mysql:centos-local
image: zabbix-server-mysql:centos-local
@ -107,7 +107,7 @@ services:
build:
context: ./Dockerfiles/proxy-sqlite3/centos
cache_from:
- quay.io/centos/centos:stream8
- quay.io/centos/centos:stream9
args:
BUILD_BASE_IMAGE: zabbix-build-sqlite3:centos-local
image: zabbix-proxy-sqlite3:centos-local
@ -163,7 +163,7 @@ services:
build:
context: ./Dockerfiles/proxy-mysql/centos
cache_from:
- quay.io/centos/centos:stream8
- quay.io/centos/centos:stream9
args:
BUILD_BASE_IMAGE: zabbix-build-mysql:centos-local
image: zabbix-proxy-mysql:centos-local
@ -229,7 +229,7 @@ services:
build:
context: ./Dockerfiles/web-apache-mysql/centos
cache_from:
- quay.io/centos/centos:stream8
- quay.io/centos/centos:stream9
args:
BUILD_BASE_IMAGE: zabbix-build-mysql:centos-local
image: zabbix-web-apache-mysql:centos-local
@ -292,7 +292,7 @@ services:
build:
context: ./Dockerfiles/web-nginx-mysql/centos
cache_from:
- quay.io/centos/centos:stream8
- quay.io/centos/centos:stream9
args:
BUILD_BASE_IMAGE: zabbix-build-mysql:centos-local
image: zabbix-web-nginx-mysql:centos-local
@ -353,7 +353,7 @@ services:
build:
context: ./Dockerfiles/agent/centos
cache_from:
- quay.io/centos/centos:stream8
- quay.io/centos/centos:stream9
args:
BUILD_BASE_IMAGE: zabbix-build-mysql:centos-local
image: zabbix-agent:centos-local
@ -401,7 +401,7 @@ services:
build:
context: ./Dockerfiles/java-gateway/centos
cache_from:
- quay.io/centos/centos:stream8
- quay.io/centos/centos:stream9
args:
BUILD_BASE_IMAGE: zabbix-build-mysql:centos-local
image: zabbix-java-gateway:centos-local
@ -438,7 +438,7 @@ services:
build:
context: ./Dockerfiles/snmptraps/centos
cache_from:
- quay.io/centos/centos:stream8
- quay.io/centos/centos:stream9
image: zabbix-snmptraps:centos-local
profiles:
- full
@ -471,7 +471,7 @@ services:
build:
context: ./Dockerfiles/web-service/centos
cache_from:
- quay.io/centos/centos:stream8
- quay.io/centos/centos:stream9
args:
BUILD_BASE_IMAGE: zabbix-build-mysql:centos-local
image: zabbix-web-service:centos-local

26
docker-compose_v3_centos_pgsql_local.yaml
View File

@ -4,14 +4,14 @@ services:
build:
context: ./Dockerfiles/build-base/centos
cache_from:
- quay.io/centos/centos:stream8
- quay.io/centos/centos:stream9
image: zabbix-build-base:centos-local
zabbix-build-pgsql:
build:
context: ./Dockerfiles/build-pgsql/centos
cache_from:
- quay.io/centos/centos:stream8
- quay.io/centos/centos:stream9
args:
BUILD_BASE_IMAGE: zabbix-build-base:centos-local
image: zabbix-build-pgsql:centos-local
@ -22,7 +22,7 @@ services:
build:
context: ./Dockerfiles/build-mysql/centos
cache_from:
- quay.io/centos/centos:stream8
- quay.io/centos/centos:stream9
args:
BUILD_BASE_IMAGE: zabbix-build-base:centos-local
image: zabbix-build-mysql:centos-local
@ -35,7 +35,7 @@ services:
build:
context: ./Dockerfiles/build-sqlite3/centos
cache_from:
- quay.io/centos/centos:stream8
- quay.io/centos/centos:stream9
args:
BUILD_BASE_IMAGE: zabbix-build-base:centos-local
image: zabbix-build-sqlite3:centos-local
@ -48,7 +48,7 @@ services:
build:
context: ./Dockerfiles/server-pgsql/centos
cache_from:
- quay.io/centos/centos:stream8
- quay.io/centos/centos:stream9
args:
BUILD_BASE_IMAGE: zabbix-build-pgsql:centos-local
image: zabbix-server-pgsql:centos-local
@ -118,7 +118,7 @@ services:
build:
context: ./Dockerfiles/proxy-sqlite3/centos
cache_from:
- quay.io/centos/centos:stream8
- quay.io/centos/centos:stream9
args:
BUILD_BASE_IMAGE: zabbix-build-pgsql:centos-local
image: zabbix-proxy-sqlite3:centos-local
@ -174,7 +174,7 @@ services:
build:
context: ./Dockerfiles/proxy-mysql/centos
cache_from:
- quay.io/centos/centos:stream8
- quay.io/centos/centos:stream9
args:
BUILD_BASE_IMAGE: zabbix-build-mysql:centos-local
image: zabbix-proxy-mysql:centos-local
@ -237,7 +237,7 @@ services:
build:
context: ./Dockerfiles/web-apache-pgsql/centos
cache_from:
- quay.io/centos/centos:stream8
- quay.io/centos/centos:stream9
args:
BUILD_BASE_IMAGE: zabbix-build-pgsql:centos-local
image: zabbix-web-apache-pgsql:centos-local
@ -300,7 +300,7 @@ services:
build:
context: ./Dockerfiles/web-nginx-pgsql/centos
cache_from:
- quay.io/centos/centos:stream8
- quay.io/centos/centos:stream9
args:
BUILD_BASE_IMAGE: zabbix-build-pgsql:centos-local
image: zabbix-web-nginx-pgsql:centos-local
@ -361,7 +361,7 @@ services:
build:
context: ./Dockerfiles/agent/centos
cache_from:
- quay.io/centos/centos:stream8
- quay.io/centos/centos:stream9
args:
BUILD_BASE_IMAGE: zabbix-build-pgsql:centos-local
image: zabbix-agent:centos-local
@ -409,7 +409,7 @@ services:
build:
context: ./Dockerfiles/java-gateway/centos
cache_from:
- quay.io/centos/centos:stream8
- quay.io/centos/centos:stream9
args:
BUILD_BASE_IMAGE: zabbix-build-pgsql:centos-local
image: zabbix-java-gateway:centos-local
@ -446,7 +446,7 @@ services:
build:
context: ./Dockerfiles/snmptraps/centos
cache_from:
- quay.io/centos/centos:stream8
- quay.io/centos/centos:stream9
image: zabbix-snmptraps:centos-local
profiles:
- full
@ -479,7 +479,7 @@ services:
build:
context: ./Dockerfiles/web-service/centos
cache_from:
- quay.io/centos/centos:stream8
- quay.io/centos/centos:stream9
args:
BUILD_BASE_IMAGE: zabbix-build-pgsql:centos-local
image: zabbix-web-service:centos-local