mirror of
https://github.com/zabbix/zabbix-docker.git
synced 2024-12-22 14:31:36 +01:00
Prepare for Zabbix 7.2 release
This commit is contained in:
parent
d5ef98f9f1
commit
d1040ff8f6
12
.env
12
.env
@ -1,10 +1,10 @@
|
||||
# Zabbix images
|
||||
ZABBIX_ALPINE_IMAGE_TAG=alpine
|
||||
ZABBIX_CENTOS_IMAGE_TAG=centos
|
||||
ZABBIX_OL_IMAGE_TAG=ol
|
||||
ZABBIX_UBUNTU_IMAGE_TAG=ubuntu
|
||||
ZABBIX_RHEL_IMAGE_TAG=rhel
|
||||
ZABBIX_IMAGE_TAG_POSTFIX=-trunk
|
||||
ZABBIX_ALPINE_IMAGE_TAG=alpine-7.2
|
||||
ZABBIX_CENTOS_IMAGE_TAG=centos-7.2
|
||||
ZABBIX_OL_IMAGE_TAG=ol-7.2
|
||||
ZABBIX_UBUNTU_IMAGE_TAG=ubuntu-7.2
|
||||
ZABBIX_RHEL_IMAGE_TAG=rhel-7.2
|
||||
ZABBIX_IMAGE_TAG_POSTFIX=-latest
|
||||
ZABBIX_LOCAL_IMAGE_TAG_POSTFIX=-local
|
||||
|
||||
ZABBIX_SERVER_MYSQL_IMAGE=zabbix/zabbix-server-mysql
|
||||
|
@ -8,7 +8,7 @@ FROM ${BUILD_BASE_IMAGE} AS builder
|
||||
ARG MAJOR_VERSION
|
||||
ARG ZBX_VERSION
|
||||
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
|
||||
ARG GIT_BRANCH=master
|
||||
ARG GIT_BRANCH
|
||||
|
||||
ARG ZBX_PLUGINS_VERSION=${GIT_BRANCH:-$ZBX_VERSION}
|
||||
ARG CFLAGS
|
||||
|
@ -8,7 +8,7 @@ FROM ${BUILD_BASE_IMAGE} AS builder
|
||||
ARG MAJOR_VERSION
|
||||
ARG ZBX_VERSION
|
||||
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
|
||||
ARG GIT_BRANCH=master
|
||||
ARG GIT_BRANCH
|
||||
|
||||
ARG ZBX_PLUGINS_VERSION=${GIT_BRANCH:-$ZBX_VERSION}
|
||||
ARG CFLAGS
|
||||
|
@ -8,7 +8,7 @@ FROM ${BUILD_BASE_IMAGE} AS builder
|
||||
ARG MAJOR_VERSION
|
||||
ARG ZBX_VERSION
|
||||
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
|
||||
ARG GIT_BRANCH=master
|
||||
ARG GIT_BRANCH
|
||||
|
||||
ARG ZBX_PLUGINS_VERSION=${GIT_BRANCH:-$ZBX_VERSION}
|
||||
ARG CFLAGS
|
||||
|
@ -10,7 +10,7 @@ ARG MAJOR_VERSION
|
||||
ARG RELEASE
|
||||
ARG ZBX_VERSION
|
||||
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
|
||||
ARG GIT_BRANCH=master
|
||||
ARG GIT_BRANCH
|
||||
|
||||
ARG ZBX_PLUGINS_VERSION=${GIT_BRANCH:-$ZBX_VERSION}
|
||||
ARG CFLAGS
|
||||
|
@ -8,7 +8,7 @@ FROM ${BUILD_BASE_IMAGE} AS builder
|
||||
ARG MAJOR_VERSION
|
||||
ARG ZBX_VERSION
|
||||
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
|
||||
ARG GIT_BRANCH=master
|
||||
ARG GIT_BRANCH
|
||||
|
||||
ARG ZBX_PLUGINS_VERSION=${GIT_BRANCH:-$ZBX_VERSION}
|
||||
ARG CFLAGS
|
||||
|
@ -8,7 +8,7 @@ FROM ${BUILD_BASE_IMAGE} AS builder
|
||||
ARG MAJOR_VERSION
|
||||
ARG ZBX_VERSION
|
||||
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
|
||||
ARG GIT_BRANCH=master
|
||||
ARG GIT_BRANCH
|
||||
|
||||
ARG ZBX_PLUGINS_VERSION=${GIT_BRANCH:-$ZBX_VERSION}
|
||||
ARG CFLAGS
|
||||
|
@ -8,7 +8,7 @@ FROM ${BUILD_BASE_IMAGE} AS builder
|
||||
ARG MAJOR_VERSION
|
||||
ARG ZBX_VERSION
|
||||
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
|
||||
ARG GIT_BRANCH=master
|
||||
ARG GIT_BRANCH
|
||||
|
||||
ARG ZBX_PLUGINS_VERSION=${GIT_BRANCH:-$ZBX_VERSION}
|
||||
ARG CFLAGS
|
||||
|
@ -8,7 +8,7 @@ FROM ${BUILD_BASE_IMAGE} AS builder
|
||||
ARG MAJOR_VERSION
|
||||
ARG ZBX_VERSION
|
||||
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
|
||||
ARG GIT_BRANCH=master
|
||||
ARG GIT_BRANCH
|
||||
|
||||
ARG ZBX_PLUGINS_VERSION=${GIT_BRANCH:-$ZBX_VERSION}
|
||||
ARG CFLAGS
|
||||
|
@ -10,7 +10,7 @@ ARG MAJOR_VERSION
|
||||
ARG RELEASE
|
||||
ARG ZBX_VERSION
|
||||
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
|
||||
ARG GIT_BRANCH=master
|
||||
ARG GIT_BRANCH
|
||||
|
||||
ARG ZBX_PLUGINS_VERSION=${GIT_BRANCH:-$ZBX_VERSION}
|
||||
ARG CFLAGS
|
||||
|
@ -8,7 +8,7 @@ FROM ${BUILD_BASE_IMAGE} AS builder
|
||||
ARG MAJOR_VERSION
|
||||
ARG ZBX_VERSION
|
||||
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
|
||||
ARG GIT_BRANCH=master
|
||||
ARG GIT_BRANCH
|
||||
|
||||
ARG ZBX_PLUGINS_VERSION=${GIT_BRANCH:-$ZBX_VERSION}
|
||||
ARG CFLAGS
|
||||
|
@ -8,7 +8,7 @@ FROM ${BUILD_BASE_IMAGE} AS builder
|
||||
ARG MAJOR_VERSION
|
||||
ARG ZBX_VERSION
|
||||
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
|
||||
ARG GIT_BRANCH=master
|
||||
ARG GIT_BRANCH
|
||||
|
||||
ARG ZBX_PLUGINS_VERSION=${GIT_BRANCH:-$ZBX_VERSION}
|
||||
ARG CFLAGS
|
||||
|
@ -8,7 +8,7 @@ FROM ${BUILD_BASE_IMAGE} AS builder
|
||||
ARG MAJOR_VERSION
|
||||
ARG ZBX_VERSION
|
||||
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
|
||||
ARG GIT_BRANCH=master
|
||||
ARG GIT_BRANCH
|
||||
|
||||
ARG ZBX_PLUGINS_VERSION=${GIT_BRANCH:-$ZBX_VERSION}
|
||||
ARG CFLAGS
|
||||
|
@ -8,7 +8,7 @@ FROM ${BUILD_BASE_IMAGE} AS builder
|
||||
ARG MAJOR_VERSION
|
||||
ARG ZBX_VERSION
|
||||
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
|
||||
ARG GIT_BRANCH=master
|
||||
ARG GIT_BRANCH
|
||||
|
||||
ARG ZBX_PLUGINS_VERSION=${GIT_BRANCH:-$ZBX_VERSION}
|
||||
ARG CFLAGS
|
||||
|
@ -10,7 +10,7 @@ ARG MAJOR_VERSION
|
||||
ARG RELEASE
|
||||
ARG ZBX_VERSION
|
||||
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
|
||||
ARG GIT_BRANCH=master
|
||||
ARG GIT_BRANCH
|
||||
|
||||
ARG ZBX_PLUGINS_VERSION=${GIT_BRANCH:-$ZBX_VERSION}
|
||||
ARG CFLAGS
|
||||
|
@ -8,7 +8,7 @@ FROM ${BUILD_BASE_IMAGE} AS builder
|
||||
ARG MAJOR_VERSION
|
||||
ARG ZBX_VERSION
|
||||
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
|
||||
ARG GIT_BRANCH=master
|
||||
ARG GIT_BRANCH
|
||||
|
||||
ARG ZBX_PLUGINS_VERSION=${GIT_BRANCH:-$ZBX_VERSION}
|
||||
ARG CFLAGS
|
||||
|
@ -5,8 +5,8 @@
|
||||
<a href="https://bestpractices.coreinfrastructure.org/projects/8395" style="display: inline;"><img src="https://bestpractices.coreinfrastructure.org/projects/8395/badge" style="display: inline;"></a>
|
||||
[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=zabbix_zabbix-docker&metric=alert_status)](https://sonarcloud.io/summary/new_code?id=zabbix_zabbix-docker)
|
||||
|
||||
[![Build images (DockerHub)](https://github.com/zabbix/zabbix-docker/actions/workflows/images_build.yml/badge.svg?branch=trunk&event=push)](https://github.com/zabbix/zabbix-docker/actions/workflows/images_build.yml)
|
||||
[![Build images (DockerHub, Windows)](https://github.com/zabbix/zabbix-docker/actions/workflows/images_build_windows.yml/badge.svg?branch=trunk&event=push)](https://github.com/zabbix/zabbix-docker/actions/workflows/images_build_windows.yml)
|
||||
[![Build images (DockerHub)](https://github.com/zabbix/zabbix-docker/actions/workflows/images_build.yml/badge.svg?branch=7.2&event=push)](https://github.com/zabbix/zabbix-docker/actions/workflows/images_build.yml)
|
||||
[![Build images (DockerHub, Windows)](https://github.com/zabbix/zabbix-docker/actions/workflows/images_build_windows.yml/badge.svg?branch=7.2&event=push)](https://github.com/zabbix/zabbix-docker/actions/workflows/images_build_windows.yml)
|
||||
|
||||
# What is Zabbix?
|
||||
|
||||
|
@ -205,7 +205,7 @@ spec:
|
||||
secretName: zabbix-mysql-client-tls-certs
|
||||
containers:
|
||||
- name: zabbix-web
|
||||
image: zabbix/zabbix-web-nginx-mysql:alpine-trunk
|
||||
image: zabbix/zabbix-web-nginx-mysql:alpine-7.2-latest
|
||||
imagePullPolicy: IfNotPresent
|
||||
ports:
|
||||
- containerPort: 8080
|
||||
@ -423,7 +423,7 @@ spec:
|
||||
secretName: zabbix-mysql-client-tls-certs
|
||||
containers:
|
||||
- name: zabbix-server
|
||||
image: zabbix/zabbix-server-mysql:alpine-trunk
|
||||
image: zabbix/zabbix-server-mysql:alpine-7.2-latest
|
||||
imagePullPolicy: IfNotPresent
|
||||
ports:
|
||||
- containerPort: 10051
|
||||
@ -607,7 +607,7 @@ spec:
|
||||
capabilities: {}
|
||||
privileged: false
|
||||
- name: zabbix-snmptraps
|
||||
image: zabbix/zabbix-snmptraps:alpine-trunk
|
||||
image: zabbix/zabbix-snmptraps:alpine-7.2-latest
|
||||
imagePullPolicy: IfNotPresent
|
||||
ports:
|
||||
- containerPort: 1162
|
||||
@ -648,7 +648,7 @@ spec:
|
||||
emptyDir: {}
|
||||
containers:
|
||||
- name: zabbix-proxy-sqlite3
|
||||
image: zabbix/zabbix-proxy-sqlite3:alpine-trunk
|
||||
image: zabbix/zabbix-proxy-sqlite3:alpine-7.2-latest
|
||||
imagePullPolicy: IfNotPresent
|
||||
ports:
|
||||
- containerPort: 10051
|
||||
@ -812,7 +812,7 @@ spec:
|
||||
secretName: zabbix-mysql-client-tls-certs
|
||||
containers:
|
||||
- name: zabbix-proxy-mysql
|
||||
image: zabbix/zabbix-proxy-mysql:alpine-trunk
|
||||
image: zabbix/zabbix-proxy-mysql:alpine-7.2-latest
|
||||
imagePullPolicy: IfNotPresent
|
||||
ports:
|
||||
- containerPort: 10051
|
||||
@ -1001,7 +1001,7 @@ spec:
|
||||
spec:
|
||||
containers:
|
||||
- name: zabbix-java-gateway
|
||||
image: zabbix/zabbix-java-gateway:alpine-trunk
|
||||
image: zabbix/zabbix-java-gateway:alpine-7.2-latest
|
||||
imagePullPolicy: IfNotPresent
|
||||
ports:
|
||||
- containerPort: 10052
|
||||
@ -1049,7 +1049,7 @@ spec:
|
||||
spec:
|
||||
containers:
|
||||
- name: zabbix-web-service
|
||||
image: zabbix/zabbix-web-service:alpine-trunk
|
||||
image: zabbix/zabbix-web-service:alpine-7.2-latest
|
||||
imagePullPolicy: IfNotPresent
|
||||
resources:
|
||||
limits:
|
||||
@ -1122,7 +1122,7 @@ spec:
|
||||
beta.kubernetes.io/os: linux
|
||||
containers:
|
||||
- name: zabbix-agent
|
||||
image: zabbix/zabbix-agent:alpine-trunk
|
||||
image: zabbix/zabbix-agent:alpine-7.2-latest
|
||||
imagePullPolicy: IfNotPresent
|
||||
resources:
|
||||
limits:
|
||||
|
Loading…
Reference in New Issue
Block a user