From d1040ff8f6d7f4049b86f88cb06132e8cbfdbb5d Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Wed, 11 Dec 2024 00:55:54 +0900 Subject: [PATCH] Prepare for Zabbix 7.2 release --- .env | 12 ++++++------ Dockerfiles/build-mysql/alpine/Dockerfile | 2 +- Dockerfiles/build-mysql/centos/Dockerfile | 2 +- Dockerfiles/build-mysql/ol/Dockerfile | 2 +- Dockerfiles/build-mysql/rhel/Dockerfile | 2 +- Dockerfiles/build-mysql/ubuntu/Dockerfile | 2 +- Dockerfiles/build-pgsql/alpine/Dockerfile | 2 +- Dockerfiles/build-pgsql/centos/Dockerfile | 2 +- Dockerfiles/build-pgsql/ol/Dockerfile | 2 +- Dockerfiles/build-pgsql/rhel/Dockerfile | 2 +- Dockerfiles/build-pgsql/ubuntu/Dockerfile | 2 +- Dockerfiles/build-sqlite3/alpine/Dockerfile | 2 +- Dockerfiles/build-sqlite3/centos/Dockerfile | 2 +- Dockerfiles/build-sqlite3/ol/Dockerfile | 2 +- Dockerfiles/build-sqlite3/rhel/Dockerfile | 2 +- Dockerfiles/build-sqlite3/ubuntu/Dockerfile | 2 +- README.md | 4 ++-- kubernetes.yaml | 16 ++++++++-------- 18 files changed, 31 insertions(+), 31 deletions(-) diff --git a/.env b/.env index a8193f4b8..f8f29aad5 100644 --- a/.env +++ b/.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 diff --git a/Dockerfiles/build-mysql/alpine/Dockerfile b/Dockerfiles/build-mysql/alpine/Dockerfile index ad7933c81..ed69c2f48 100644 --- a/Dockerfiles/build-mysql/alpine/Dockerfile +++ b/Dockerfiles/build-mysql/alpine/Dockerfile @@ -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 diff --git a/Dockerfiles/build-mysql/centos/Dockerfile b/Dockerfiles/build-mysql/centos/Dockerfile index 6b16b5597..18ad9dcf4 100644 --- a/Dockerfiles/build-mysql/centos/Dockerfile +++ b/Dockerfiles/build-mysql/centos/Dockerfile @@ -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 diff --git a/Dockerfiles/build-mysql/ol/Dockerfile b/Dockerfiles/build-mysql/ol/Dockerfile index 62cf5d7b5..cf83708f9 100644 --- a/Dockerfiles/build-mysql/ol/Dockerfile +++ b/Dockerfiles/build-mysql/ol/Dockerfile @@ -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 diff --git a/Dockerfiles/build-mysql/rhel/Dockerfile b/Dockerfiles/build-mysql/rhel/Dockerfile index 7a5e6f40a..07c5bea45 100644 --- a/Dockerfiles/build-mysql/rhel/Dockerfile +++ b/Dockerfiles/build-mysql/rhel/Dockerfile @@ -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 diff --git a/Dockerfiles/build-mysql/ubuntu/Dockerfile b/Dockerfiles/build-mysql/ubuntu/Dockerfile index 13dec04c8..abde091a1 100644 --- a/Dockerfiles/build-mysql/ubuntu/Dockerfile +++ b/Dockerfiles/build-mysql/ubuntu/Dockerfile @@ -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 diff --git a/Dockerfiles/build-pgsql/alpine/Dockerfile b/Dockerfiles/build-pgsql/alpine/Dockerfile index b7c554ed1..7f3784323 100644 --- a/Dockerfiles/build-pgsql/alpine/Dockerfile +++ b/Dockerfiles/build-pgsql/alpine/Dockerfile @@ -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 diff --git a/Dockerfiles/build-pgsql/centos/Dockerfile b/Dockerfiles/build-pgsql/centos/Dockerfile index cb0f4548d..e237d1c1a 100644 --- a/Dockerfiles/build-pgsql/centos/Dockerfile +++ b/Dockerfiles/build-pgsql/centos/Dockerfile @@ -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 diff --git a/Dockerfiles/build-pgsql/ol/Dockerfile b/Dockerfiles/build-pgsql/ol/Dockerfile index 7cda1122f..7f14b0461 100644 --- a/Dockerfiles/build-pgsql/ol/Dockerfile +++ b/Dockerfiles/build-pgsql/ol/Dockerfile @@ -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 diff --git a/Dockerfiles/build-pgsql/rhel/Dockerfile b/Dockerfiles/build-pgsql/rhel/Dockerfile index fa017f423..790cca867 100644 --- a/Dockerfiles/build-pgsql/rhel/Dockerfile +++ b/Dockerfiles/build-pgsql/rhel/Dockerfile @@ -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 diff --git a/Dockerfiles/build-pgsql/ubuntu/Dockerfile b/Dockerfiles/build-pgsql/ubuntu/Dockerfile index 0067fbd00..a7808d333 100644 --- a/Dockerfiles/build-pgsql/ubuntu/Dockerfile +++ b/Dockerfiles/build-pgsql/ubuntu/Dockerfile @@ -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 diff --git a/Dockerfiles/build-sqlite3/alpine/Dockerfile b/Dockerfiles/build-sqlite3/alpine/Dockerfile index c2cca84bd..f0cb5bddb 100644 --- a/Dockerfiles/build-sqlite3/alpine/Dockerfile +++ b/Dockerfiles/build-sqlite3/alpine/Dockerfile @@ -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 diff --git a/Dockerfiles/build-sqlite3/centos/Dockerfile b/Dockerfiles/build-sqlite3/centos/Dockerfile index 72c7133a3..ba9e38a79 100644 --- a/Dockerfiles/build-sqlite3/centos/Dockerfile +++ b/Dockerfiles/build-sqlite3/centos/Dockerfile @@ -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 diff --git a/Dockerfiles/build-sqlite3/ol/Dockerfile b/Dockerfiles/build-sqlite3/ol/Dockerfile index e8e5fe962..e40cfba27 100644 --- a/Dockerfiles/build-sqlite3/ol/Dockerfile +++ b/Dockerfiles/build-sqlite3/ol/Dockerfile @@ -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 diff --git a/Dockerfiles/build-sqlite3/rhel/Dockerfile b/Dockerfiles/build-sqlite3/rhel/Dockerfile index 2fef152c4..23ed3bb3e 100644 --- a/Dockerfiles/build-sqlite3/rhel/Dockerfile +++ b/Dockerfiles/build-sqlite3/rhel/Dockerfile @@ -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 diff --git a/Dockerfiles/build-sqlite3/ubuntu/Dockerfile b/Dockerfiles/build-sqlite3/ubuntu/Dockerfile index 522fb8d7d..36e194690 100644 --- a/Dockerfiles/build-sqlite3/ubuntu/Dockerfile +++ b/Dockerfiles/build-sqlite3/ubuntu/Dockerfile @@ -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 diff --git a/README.md b/README.md index 0371c6ae8..760c1f1b3 100644 --- a/README.md +++ b/README.md @@ -5,8 +5,8 @@ [![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? diff --git a/kubernetes.yaml b/kubernetes.yaml index da5a08daf..018c65a7d 100644 --- a/kubernetes.yaml +++ b/kubernetes.yaml @@ -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: