diff --git a/Dockerfiles/agent/centos/Dockerfile b/Dockerfiles/agent/centos/Dockerfile index 92377d2b4..ace7ebe01 100644 --- a/Dockerfiles/agent/centos/Dockerfile +++ b/Dockerfiles/agent/centos/Dockerfile @@ -5,7 +5,7 @@ ARG BUILD_BASE_IMAGE=zabbix-build-mysql:centos-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} as builder -FROM centos:centos8 +FROM quay.io/centos/centos:stream8 ARG MAJOR_VERSION ARG ZBX_VERSION @@ -38,7 +38,7 @@ RUN set -eux && \ tzdata \ iputils \ pcre2 \ - libcurl-minimal \ + libcurl \ openssl-libs \ zlib" && \ dnf -y install epel-release && \ diff --git a/Dockerfiles/agent2/centos/Dockerfile b/Dockerfiles/agent2/centos/Dockerfile index a421cdd19..10b9d3b8d 100644 --- a/Dockerfiles/agent2/centos/Dockerfile +++ b/Dockerfiles/agent2/centos/Dockerfile @@ -5,7 +5,7 @@ ARG BUILD_BASE_IMAGE=zabbix-build-mysql:centos-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} as builder -FROM centos:centos8 +FROM quay.io/centos/centos:stream8 ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/build-base/centos/Dockerfile b/Dockerfiles/build-base/centos/Dockerfile index a05ef53c7..111d38980 100644 --- a/Dockerfiles/build-base/centos/Dockerfile +++ b/Dockerfiles/build-base/centos/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:1 -FROM centos:centos8 +FROM quay.io/centos/centos:stream8 ARG MAJOR_VERSION=6.2 ARG ZBX_VERSION=${MAJOR_VERSION} diff --git a/Dockerfiles/java-gateway/centos/Dockerfile b/Dockerfiles/java-gateway/centos/Dockerfile index c61f445a5..a528baa95 100644 --- a/Dockerfiles/java-gateway/centos/Dockerfile +++ b/Dockerfiles/java-gateway/centos/Dockerfile @@ -5,7 +5,7 @@ ARG BUILD_BASE_IMAGE=zabbix-build-mysql:centos-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} as builder -FROM centos:centos8 +FROM quay.io/centos/centos:stream8 ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/proxy-mysql/centos/Dockerfile b/Dockerfiles/proxy-mysql/centos/Dockerfile index 0e7510259..6c7cdf166 100644 --- a/Dockerfiles/proxy-mysql/centos/Dockerfile +++ b/Dockerfiles/proxy-mysql/centos/Dockerfile @@ -5,7 +5,7 @@ ARG BUILD_BASE_IMAGE=zabbix-build-mysql:centos-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} as builder -FROM centos:centos8 +FROM quay.io/centos/centos:stream8 ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/proxy-sqlite3/centos/Dockerfile b/Dockerfiles/proxy-sqlite3/centos/Dockerfile index 67b3083e5..46c8d4a19 100644 --- a/Dockerfiles/proxy-sqlite3/centos/Dockerfile +++ b/Dockerfiles/proxy-sqlite3/centos/Dockerfile @@ -5,7 +5,7 @@ ARG BUILD_BASE_IMAGE=zabbix-build-sqlite3:centos-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} as builder -FROM centos:centos8 +FROM quay.io/centos/centos:stream8 ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/server-mysql/centos/Dockerfile b/Dockerfiles/server-mysql/centos/Dockerfile index 6c88a953d..270cc60ee 100644 --- a/Dockerfiles/server-mysql/centos/Dockerfile +++ b/Dockerfiles/server-mysql/centos/Dockerfile @@ -5,7 +5,7 @@ ARG BUILD_BASE_IMAGE=zabbix-build-mysql:centos-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} as builder -FROM centos:centos8 +FROM quay.io/centos/centos:stream8 ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/server-pgsql/centos/Dockerfile b/Dockerfiles/server-pgsql/centos/Dockerfile index 852c76947..86b0a7a87 100644 --- a/Dockerfiles/server-pgsql/centos/Dockerfile +++ b/Dockerfiles/server-pgsql/centos/Dockerfile @@ -5,7 +5,7 @@ ARG BUILD_BASE_IMAGE=zabbix-build-pgsql:centos-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} as builder -FROM centos:centos8 +FROM quay.io/centos/centos:stream8 ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/snmptraps/centos/Dockerfile b/Dockerfiles/snmptraps/centos/Dockerfile index e6a72f559..6c036bca6 100644 --- a/Dockerfiles/snmptraps/centos/Dockerfile +++ b/Dockerfiles/snmptraps/centos/Dockerfile @@ -1,4 +1,4 @@ -FROM centos:centos8 +FROM quay.io/centos/centos:stream8 ARG MAJOR_VERSION=6.2 ARG ZBX_VERSION=${MAJOR_VERSION} diff --git a/Dockerfiles/web-apache-mysql/centos/Dockerfile b/Dockerfiles/web-apache-mysql/centos/Dockerfile index 9b4c567c1..a899fc605 100644 --- a/Dockerfiles/web-apache-mysql/centos/Dockerfile +++ b/Dockerfiles/web-apache-mysql/centos/Dockerfile @@ -5,7 +5,7 @@ ARG BUILD_BASE_IMAGE=zabbix-build-mysql:centos-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} as builder -FROM centos:centos8 +FROM quay.io/centos/centos:stream8 ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/web-apache-pgsql/centos/Dockerfile b/Dockerfiles/web-apache-pgsql/centos/Dockerfile index 0c80126cb..17d0d85ed 100644 --- a/Dockerfiles/web-apache-pgsql/centos/Dockerfile +++ b/Dockerfiles/web-apache-pgsql/centos/Dockerfile @@ -5,7 +5,7 @@ ARG BUILD_BASE_IMAGE=zabbix-build-mysql:centos-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} as builder -FROM centos:centos8 +FROM quay.io/centos/centos:stream8 ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/web-nginx-mysql/centos/Dockerfile b/Dockerfiles/web-nginx-mysql/centos/Dockerfile index 33a3f89b7..25b2282cf 100644 --- a/Dockerfiles/web-nginx-mysql/centos/Dockerfile +++ b/Dockerfiles/web-nginx-mysql/centos/Dockerfile @@ -5,7 +5,7 @@ ARG BUILD_BASE_IMAGE=zabbix-build-mysql:centos-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} as builder -FROM centos:centos8 +FROM quay.io/centos/centos:stream8 ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/web-nginx-pgsql/centos/Dockerfile b/Dockerfiles/web-nginx-pgsql/centos/Dockerfile index e9fe4ebec..6a122918a 100644 --- a/Dockerfiles/web-nginx-pgsql/centos/Dockerfile +++ b/Dockerfiles/web-nginx-pgsql/centos/Dockerfile @@ -5,7 +5,7 @@ ARG BUILD_BASE_IMAGE=zabbix-build-pgsql:centos-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} as builder -FROM centos:centos8 +FROM quay.io/centos/centos:stream8 ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/web-service/centos/Dockerfile b/Dockerfiles/web-service/centos/Dockerfile index 5badd1c23..15685a97c 100644 --- a/Dockerfiles/web-service/centos/Dockerfile +++ b/Dockerfiles/web-service/centos/Dockerfile @@ -5,7 +5,7 @@ ARG BUILD_BASE_IMAGE=zabbix-build-mysql:centos-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} as builder -FROM centos:centos8 +FROM quay.io/centos/centos:stream8 ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/build.json b/build.json index ea8ce3f6b..560faa8a9 100644 --- a/build.json +++ b/build.json @@ -17,6 +17,11 @@ "linux/arm/v7", "linux/arm64", "linux/s390x" + ], + "centos": [ + "linux/amd64", + "linux/arm64", + "linux/ppc64le" ] }, "os-windows": { diff --git a/docker-compose_v3_centos_mysql_local.yaml b/docker-compose_v3_centos_mysql_local.yaml index a9f063cc4..245e75ff3 100644 --- a/docker-compose_v3_centos_mysql_local.yaml +++ b/docker-compose_v3_centos_mysql_local.yaml @@ -4,14 +4,14 @@ services: build: context: ./Dockerfiles/build-base/centos cache_from: - - centos:centos8 + - quay.io/centos/centos:stream8 image: zabbix-build-base:centos-local zabbix-build-mysql: build: context: ./Dockerfiles/build-mysql/centos cache_from: - - centos:centos8 + - quay.io/centos/centos:stream8 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: - - centos:centos8 + - quay.io/centos/centos:stream8 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: - - centos:centos8 + - quay.io/centos/centos:stream8 args: BUILD_BASE_IMAGE: zabbix-build-mysql:centos-local image: zabbix-server-mysql:centos-local @@ -106,7 +106,7 @@ services: build: context: ./Dockerfiles/proxy-sqlite3/centos cache_from: - - centos:centos8 + - quay.io/centos/centos:stream8 args: BUILD_BASE_IMAGE: zabbix-build-sqlite3:centos-local image: zabbix-proxy-sqlite3:centos-local @@ -162,7 +162,7 @@ services: build: context: ./Dockerfiles/proxy-mysql/centos cache_from: - - centos:centos8 + - quay.io/centos/centos:stream8 args: BUILD_BASE_IMAGE: zabbix-build-mysql:centos-local image: zabbix-proxy-mysql:centos-local @@ -228,7 +228,7 @@ services: build: context: ./Dockerfiles/web-apache-mysql/centos cache_from: - - centos:centos8 + - quay.io/centos/centos:stream8 args: BUILD_BASE_IMAGE: zabbix-build-mysql:centos-local image: zabbix-web-apache-mysql:centos-local @@ -291,7 +291,7 @@ services: build: context: ./Dockerfiles/web-nginx-mysql/centos cache_from: - - centos:centos8 + - quay.io/centos/centos:stream8 args: BUILD_BASE_IMAGE: zabbix-build-mysql:centos-local image: zabbix-web-nginx-mysql:centos-local @@ -352,7 +352,7 @@ services: build: context: ./Dockerfiles/agent/centos cache_from: - - centos:centos8 + - quay.io/centos/centos:stream8 args: BUILD_BASE_IMAGE: zabbix-build-mysql:centos-local image: zabbix-agent:centos-local @@ -400,7 +400,7 @@ services: build: context: ./Dockerfiles/java-gateway/centos cache_from: - - centos:centos8 + - quay.io/centos/centos:stream8 args: BUILD_BASE_IMAGE: zabbix-build-mysql:centos-local image: zabbix-java-gateway:centos-local @@ -437,7 +437,7 @@ services: build: context: ./Dockerfiles/snmptraps/centos cache_from: - - centos:centos8 + - quay.io/centos/centos:stream8 image: zabbix-snmptraps:centos-local profiles: - full @@ -470,7 +470,7 @@ services: build: context: ./Dockerfiles/web-service/centos cache_from: - - centos:centos8 + - quay.io/centos/centos:stream8 args: BUILD_BASE_IMAGE: zabbix-build-mysql:centos-local image: zabbix-web-service:centos-local diff --git a/docker-compose_v3_centos_pgsql_local.yaml b/docker-compose_v3_centos_pgsql_local.yaml index db78d8b7e..1d9c69b6a 100644 --- a/docker-compose_v3_centos_pgsql_local.yaml +++ b/docker-compose_v3_centos_pgsql_local.yaml @@ -4,14 +4,14 @@ services: build: context: ./Dockerfiles/build-base/centos cache_from: - - centos:centos8 + - quay.io/centos/centos:stream8 image: zabbix-build-base:centos-local zabbix-build-pgsql: build: context: ./Dockerfiles/build-pgsql/centos cache_from: - - centos:centos8 + - quay.io/centos/centos:stream8 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: - - centos:centos8 + - quay.io/centos/centos:stream8 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: - - centos:centos8 + - quay.io/centos/centos:stream8 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: - - centos:centos8 + - quay.io/centos/centos:stream8 args: BUILD_BASE_IMAGE: zabbix-build-pgsql:centos-local image: zabbix-server-pgsql:centos-local @@ -117,7 +117,7 @@ services: build: context: ./Dockerfiles/proxy-sqlite3/centos cache_from: - - centos:centos8 + - quay.io/centos/centos:stream8 args: BUILD_BASE_IMAGE: zabbix-build-pgsql:centos-local image: zabbix-proxy-sqlite3:centos-local @@ -173,7 +173,7 @@ services: build: context: ./Dockerfiles/proxy-mysql/centos cache_from: - - centos:centos8 + - quay.io/centos/centos:stream8 args: BUILD_BASE_IMAGE: zabbix-build-mysql:centos-local image: zabbix-proxy-mysql:centos-local @@ -236,7 +236,7 @@ services: build: context: ./Dockerfiles/web-apache-pgsql/centos cache_from: - - centos:centos8 + - quay.io/centos/centos:stream8 args: BUILD_BASE_IMAGE: zabbix-build-pgsql:centos-local image: zabbix-web-apache-pgsql:centos-local @@ -299,7 +299,7 @@ services: build: context: ./Dockerfiles/web-nginx-pgsql/centos cache_from: - - centos:centos8 + - quay.io/centos/centos:stream8 args: BUILD_BASE_IMAGE: zabbix-build-pgsql:centos-local image: zabbix-web-nginx-pgsql:centos-local @@ -360,7 +360,7 @@ services: build: context: ./Dockerfiles/agent/centos cache_from: - - centos:centos8 + - quay.io/centos/centos:stream8 args: BUILD_BASE_IMAGE: zabbix-build-pgsql:centos-local image: zabbix-agent:centos-local @@ -408,7 +408,7 @@ services: build: context: ./Dockerfiles/java-gateway/centos cache_from: - - centos:centos8 + - quay.io/centos/centos:stream8 args: BUILD_BASE_IMAGE: zabbix-build-pgsql:centos-local image: zabbix-java-gateway:centos-local @@ -445,7 +445,7 @@ services: build: context: ./Dockerfiles/snmptraps/centos cache_from: - - centos:centos8 + - quay.io/centos/centos:stream8 image: zabbix-snmptraps:centos-local profiles: - full @@ -478,7 +478,7 @@ services: build: context: ./Dockerfiles/web-service/centos cache_from: - - centos:centos8 + - quay.io/centos/centos:stream8 args: BUILD_BASE_IMAGE: zabbix-build-pgsql:centos-local image: zabbix-web-service:centos-local