From e2fc55b7a9d7e271da54ca761b1f0c33684bf47b Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Tue, 10 May 2022 17:30:21 +0300 Subject: [PATCH] Recovered CentOS 8 build using stream image --- Dockerfiles/agent/centos/Dockerfile | 4 ++-- Dockerfiles/agent2/centos/Dockerfile | 2 +- Dockerfiles/build-base/centos/Dockerfile | 2 +- Dockerfiles/java-gateway/centos/Dockerfile | 2 +- Dockerfiles/proxy-mysql/centos/Dockerfile | 2 +- Dockerfiles/proxy-sqlite3/centos/Dockerfile | 2 +- Dockerfiles/server-mysql/centos/Dockerfile | 2 +- Dockerfiles/server-pgsql/centos/Dockerfile | 2 +- Dockerfiles/snmptraps/centos/Dockerfile | 2 +- .../web-apache-mysql/centos/Dockerfile | 2 +- .../web-apache-pgsql/centos/Dockerfile | 2 +- Dockerfiles/web-nginx-mysql/centos/Dockerfile | 2 +- Dockerfiles/web-nginx-pgsql/centos/Dockerfile | 2 +- build.json | 5 ++++ docker-compose_v3_centos_mysql_local.yaml | 22 ++++++++--------- docker-compose_v3_centos_pgsql_local.yaml | 24 +++++++++---------- 16 files changed, 42 insertions(+), 37 deletions(-) diff --git a/Dockerfiles/agent/centos/Dockerfile b/Dockerfiles/agent/centos/Dockerfile index 05fd37d8b..6d63ef69a 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 \ pcre \ - libcurl-minimal \ + libcurl \ openssl-libs \ zlib" && \ dnf -y install epel-release && \ diff --git a/Dockerfiles/agent2/centos/Dockerfile b/Dockerfiles/agent2/centos/Dockerfile index adc82aa68..bdd256f65 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 5f5ce574b..2bd95c1a1 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=5.0 ARG ZBX_VERSION=${MAJOR_VERSION}.23 diff --git a/Dockerfiles/java-gateway/centos/Dockerfile b/Dockerfiles/java-gateway/centos/Dockerfile index 5ddc66e3d..08c4ee9dc 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 cb5c8b660..43931ac86 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 b381c7547..b1ab6a54c 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 2c5abf79e..df6ead407 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 a5de5cc9f..b92e839b5 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 53565bda0..bddc34d82 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=5.0 ARG ZBX_VERSION=${MAJOR_VERSION}.23 diff --git a/Dockerfiles/web-apache-mysql/centos/Dockerfile b/Dockerfiles/web-apache-mysql/centos/Dockerfile index 3280616a4..24fc5d3b6 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 a2b8b8c31..37e61ecc7 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 37d5dc157..6e4cdb83d 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 d9f340dbd..378a53e55 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/build.json b/build.json index 3a860b7a3..3980f3ba8 100644 --- a/build.json +++ b/build.json @@ -16,6 +16,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 333bac8bb..a4a1919fb 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 diff --git a/docker-compose_v3_centos_pgsql_local.yaml b/docker-compose_v3_centos_pgsql_local.yaml index 7c46eddc0..729c14e4e 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