extern/zabbix-docker
1
0
Fork 0
mirror of https://github.com/zabbix/zabbix-docker.git synced 2024-11-28 10:43:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Recovered CentOS 8 build using stream image

Browse Source
This commit is contained in:
Alexey Pustovalov 2022-05-10 17:30:21 +03:00
parent 84b0471178
commit e2fc55b7a9
16 changed files with 42 additions and 37 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 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 && \

2
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 centos:centos8
FROM quay.io/centos/centos:stream8
ARG MAJOR_VERSION
ARG ZBX_VERSION

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

@ -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

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 centos:centos8
FROM quay.io/centos/centos:stream8
ARG MAJOR_VERSION
ARG ZBX_VERSION

2
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 centos:centos8
FROM quay.io/centos/centos:stream8
ARG MAJOR_VERSION
ARG ZBX_VERSION

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 centos:centos8
FROM quay.io/centos/centos:stream8
ARG MAJOR_VERSION
ARG ZBX_VERSION

2
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 centos:centos8
FROM quay.io/centos/centos:stream8
ARG MAJOR_VERSION
ARG ZBX_VERSION

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 centos:centos8
FROM quay.io/centos/centos:stream8
ARG MAJOR_VERSION
ARG ZBX_VERSION

2
Dockerfiles/snmptraps/centos/Dockerfile
View File

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

2
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 centos:centos8
FROM quay.io/centos/centos:stream8
ARG MAJOR_VERSION
ARG ZBX_VERSION

2
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 centos:centos8
FROM quay.io/centos/centos:stream8
ARG MAJOR_VERSION
ARG ZBX_VERSION

2
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 centos:centos8
FROM quay.io/centos/centos:stream8
ARG MAJOR_VERSION
ARG ZBX_VERSION

2
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 centos:centos8
FROM quay.io/centos/centos:stream8
ARG MAJOR_VERSION
ARG ZBX_VERSION

5
build.json
View File

@ -16,6 +16,11 @@
"linux/arm/v7",
"linux/arm64",
"linux/s390x"
],
"centos": [
"linux/amd64",
"linux/arm64",
"linux/ppc64le"
]
},
"os-windows": {

22
docker-compose_v3_centos_mysql_local.yaml
View File

@ -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

24
docker-compose_v3_centos_pgsql_local.yaml
View File

@ -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