From db93643235f65f4f81e4fb6bc45de9bce2787d14 Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Tue, 4 Jun 2024 14:59:24 +0900 Subject: [PATCH] Prepare for Zabbix 7.0 release --- .env | 12 ++++----- .github/workflows/scorecard.yml | 2 +- .github/workflows/sonarcloud.yml | 4 +-- Dockerfiles/agent/README.md | 2 +- Dockerfiles/agent/rhel/Dockerfile | 6 ++--- Dockerfiles/agent/rhel/README.html | 2 +- Dockerfiles/agent2/README.md | 2 +- Dockerfiles/agent2/rhel/Dockerfile | 6 ++--- Dockerfiles/agent2/rhel/README.html | 2 +- Dockerfiles/build-base/README.md | 4 +-- Dockerfiles/build-base/rhel/Dockerfile | 2 +- Dockerfiles/build-mysql/README.md | 4 +-- Dockerfiles/build-mysql/alpine/Dockerfile | 2 +- Dockerfiles/build-mysql/centos/Dockerfile | 2 +- Dockerfiles/build-mysql/ol/Dockerfile | 2 +- Dockerfiles/build-mysql/rhel/Dockerfile | 4 +-- Dockerfiles/build-mysql/ubuntu/Dockerfile | 2 +- .../build-mysql/windows/Dockerfile.agent | 2 +- .../build-mysql/windows/Dockerfile.agent2 | 2 +- .../windows/Dockerfile_llvm_clang.agent2 | 2 +- .../windows/Dockerfile_vcpkg.agent2 | 2 +- Dockerfiles/build-pgsql/README.md | 4 +-- Dockerfiles/build-pgsql/alpine/Dockerfile | 2 +- Dockerfiles/build-pgsql/centos/Dockerfile | 2 +- Dockerfiles/build-pgsql/ol/Dockerfile | 2 +- Dockerfiles/build-pgsql/rhel/Dockerfile | 4 +-- Dockerfiles/build-pgsql/ubuntu/Dockerfile | 2 +- Dockerfiles/build-sqlite3/README.md | 4 +-- Dockerfiles/build-sqlite3/alpine/Dockerfile | 2 +- Dockerfiles/build-sqlite3/centos/Dockerfile | 2 +- Dockerfiles/build-sqlite3/ol/Dockerfile | 2 +- Dockerfiles/build-sqlite3/rhel/Dockerfile | 4 +-- Dockerfiles/build-sqlite3/ubuntu/Dockerfile | 2 +- Dockerfiles/java-gateway/README.md | 2 +- Dockerfiles/java-gateway/rhel/Dockerfile | 6 ++--- Dockerfiles/java-gateway/rhel/README.html | 2 +- Dockerfiles/proxy-mysql/README.md | 2 +- Dockerfiles/proxy-mysql/rhel/Dockerfile | 6 ++--- Dockerfiles/proxy-mysql/rhel/README.html | 2 +- Dockerfiles/proxy-sqlite3/README.md | 2 +- Dockerfiles/proxy-sqlite3/rhel/Dockerfile | 6 ++--- Dockerfiles/proxy-sqlite3/rhel/README.html | 2 +- Dockerfiles/server-mysql/README.md | 2 +- Dockerfiles/server-mysql/rhel/Dockerfile | 6 ++--- Dockerfiles/server-mysql/rhel/README.html | 4 +-- Dockerfiles/server-pgsql/README.md | 2 +- Dockerfiles/server-pgsql/rhel/Dockerfile | 6 ++--- Dockerfiles/server-pgsql/rhel/README.html | 2 +- Dockerfiles/snmptraps/README.md | 2 +- Dockerfiles/snmptraps/rhel/Dockerfile | 6 ++--- Dockerfiles/snmptraps/rhel/README.html | 2 +- Dockerfiles/web-apache-mysql/README.md | 2 +- Dockerfiles/web-apache-pgsql/README.md | 2 +- Dockerfiles/web-nginx-mysql/README.md | 2 +- Dockerfiles/web-nginx-mysql/rhel/Dockerfile | 4 +-- Dockerfiles/web-nginx-mysql/rhel/README.html | 2 +- Dockerfiles/web-nginx-pgsql/README.md | 2 +- Dockerfiles/web-nginx-pgsql/rhel/Dockerfile | 4 +-- Dockerfiles/web-service/README.md | 2 +- Dockerfiles/web-service/rhel/Dockerfile | 6 ++--- Dockerfiles/web-service/rhel/README.html | 2 +- README.md | 13 +++------- build.json | 26 +++++++++---------- kubernetes.yaml | 16 ++++++------ 64 files changed, 120 insertions(+), 125 deletions(-) diff --git a/.env b/.env index c36ef45a6..5db1eae96 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.0 +ZABBIX_CENTOS_IMAGE_TAG=centos-7.0 +ZABBIX_OL_IMAGE_TAG=ol-7.0 +ZABBIX_UBUNTU_IMAGE_TAG=ubuntu-7.0 +ZABBIX_RHEL_IMAGE_TAG=rhel-7.0 +ZABBIX_IMAGE_TAG_POSTFIX=-latest ZABBIX_LOCAL_IMAGE_TAG_POSTFIX=-local ZABBIX_SERVER_MYSQL_IMAGE=zabbix/zabbix-server-mysql diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml index 273d6afeb..80825e840 100644 --- a/.github/workflows/scorecard.yml +++ b/.github/workflows/scorecard.yml @@ -13,7 +13,7 @@ on: - cron: '39 3 * * 2' push: branches: - - '6.4' + - '7.0' # Declare default permissions as read only. permissions: read-all diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml index 2fa6f8be5..94894733c 100644 --- a/.github/workflows/sonarcloud.yml +++ b/.github/workflows/sonarcloud.yml @@ -30,9 +30,9 @@ name: SonarCloud analysis on: push: - branches: [ "6.4" ] + branches: [ "7.0" ] pull_request: - branches: [ "6.4" ] + branches: [ "7.0" ] workflow_dispatch: permissions: diff --git a/Dockerfiles/agent/README.md b/Dockerfiles/agent/README.md index 1de445aa9..c812bf91d 100644 --- a/Dockerfiles/agent/README.md +++ b/Dockerfiles/agent/README.md @@ -218,7 +218,7 @@ Please see [the Docker installation documentation](https://docs.docker.com/insta ## Documentation -Documentation for this image is stored in the [`agent/` directory](https://github.com/zabbix/zabbix-docker/tree/trunk/Dockerfiles/agent) of the [`zabbix/zabbix-docker` GitHub repo](https://github.com/zabbix/zabbix-docker/). Be sure to familiarize yourself with the [repository's `README.md` file](https://github.com/zabbix/zabbix-docker/blob/trunk/README.md) before attempting a pull request. +Documentation for this image is stored in the [`agent/` directory](https://github.com/zabbix/zabbix-docker/tree/7.0/Dockerfiles/agent) of the [`zabbix/zabbix-docker` GitHub repo](https://github.com/zabbix/zabbix-docker/). Be sure to familiarize yourself with the [repository's `README.md` file](https://github.com/zabbix/zabbix-docker/blob/7.0/README.md) before attempting a pull request. ## Issues diff --git a/Dockerfiles/agent/rhel/Dockerfile b/Dockerfiles/agent/rhel/Dockerfile index 46e55ca98..86f3e6ade 100644 --- a/Dockerfiles/agent/rhel/Dockerfile +++ b/Dockerfiles/agent/rhel/Dockerfile @@ -18,9 +18,9 @@ ENV TERM=xterm \ LABEL description="Zabbix agent is deployed on a monitoring target to actively monitor local resources and applications" \ maintainer="alexey.pustovalov@zabbix.com" \ - name="zabbix/zabbix-agent-trunk" \ + name="zabbix/zabbix-agent-70" \ release="${RELEASE}" \ - run="podman run --name zabbix-agent -p 10050:10050 -d registry.connect.redhat.com/zabbix/zabbix-agent-trunk:${ZBX_VERSION}" \ + run="podman run --name zabbix-agent -p 10050:10050 -d registry.connect.redhat.com/zabbix/zabbix-agent-70:${ZBX_VERSION}" \ summary="Zabbix agent" \ url="https://www.zabbix.com/" \ vendor="Zabbix SIA" \ @@ -31,7 +31,7 @@ LABEL description="Zabbix agent is deployed on a monitoring target to actively m io.openshift.tags="zabbix,zabbix-agent" \ org.label-schema.build-date="${BUILD_DATE}" \ org.label-schema.description="Zabbix agent is deployed on a monitoring target to actively monitor local resources and applications" \ - org.label-schema.docker.cmd="podman run --name zabbix-agent -p 10050:10050 -d registry.connect.redhat.com/zabbix/zabbix-agent-trunk:${ZBX_VERSION}" \ + org.label-schema.docker.cmd="podman run --name zabbix-agent -p 10050:10050 -d registry.connect.redhat.com/zabbix/zabbix-agent-70:${ZBX_VERSION}" \ org.label-schema.license="AGPL v3.0" \ org.label-schema.name="zabbix-agent-rhel" \ org.label-schema.schema-version="1.0" \ diff --git a/Dockerfiles/agent/rhel/README.html b/Dockerfiles/agent/rhel/README.html index 3de90838f..ccaa336a5 100644 --- a/Dockerfiles/agent/rhel/README.html +++ b/Dockerfiles/agent/rhel/README.html @@ -111,7 +111,7 @@

The volume is used to store TLS related files. These file names are specified using ZBX_TLSCAFILE, ZBX_TLSCRLFILE, ZBX_TLSKEY_FILE and ZBX_TLSPSKFILE variables.

User Feedback

Documentation

-

Documentation for this image is stored in the agent/ directory of the zabbix/zabbix-docker GitHub repo. Be sure to familiarize yourself with the repository's README.md file before attempting a pull request.

+

Documentation for this image is stored in the agent/ directory of the zabbix/zabbix-docker GitHub repo. Be sure to familiarize yourself with the repository's README.md file before attempting a pull request.

Issues

If you have any problems with or questions about this image, please contact us through a GitHub issue.

Known issues

diff --git a/Dockerfiles/agent2/README.md b/Dockerfiles/agent2/README.md index bd091e370..1323b7eb8 100644 --- a/Dockerfiles/agent2/README.md +++ b/Dockerfiles/agent2/README.md @@ -208,7 +208,7 @@ Please see [the Docker installation documentation](https://docs.docker.com/insta ## Documentation -Documentation for this image is stored in the [`agent2/` directory](https://github.com/zabbix/zabbix-docker/tree/trunk/Dockerfiles/agent2) of the [`zabbix/zabbix-docker` GitHub repo](https://github.com/zabbix/zabbix-docker/). Be sure to familiarize yourself with the [repository's `README.md` file](https://github.com/zabbix/zabbix-docker/blob/trunk/README.md) before attempting a pull request. +Documentation for this image is stored in the [`agent2/` directory](https://github.com/zabbix/zabbix-docker/tree/7.0/Dockerfiles/agent2) of the [`zabbix/zabbix-docker` GitHub repo](https://github.com/zabbix/zabbix-docker/). Be sure to familiarize yourself with the [repository's `README.md` file](https://github.com/zabbix/zabbix-docker/blob/7.0/README.md) before attempting a pull request. ## Issues diff --git a/Dockerfiles/agent2/rhel/Dockerfile b/Dockerfiles/agent2/rhel/Dockerfile index 33ef81fe8..e5258a6ca 100644 --- a/Dockerfiles/agent2/rhel/Dockerfile +++ b/Dockerfiles/agent2/rhel/Dockerfile @@ -18,9 +18,9 @@ ENV TERM=xterm \ LABEL description="Zabbix agent 2 is deployed on a monitoring target to actively monitor local resources and applications" \ maintainer="alexey.pustovalov@zabbix.com" \ - name="zabbix/zabbix-agent2-trunk" \ + name="zabbix/zabbix-agent2-70" \ release="${RELEASE}" \ - run="docker run --name zabbix-agent2 --link zabbix-server:zabbix-server -p 10050:10050 -d registry.connect.redhat.com/zabbix/zabbix-agent2-trunk:${ZBX_VERSION}" \ + run="docker run --name zabbix-agent2 --link zabbix-server:zabbix-server -p 10050:10050 -d registry.connect.redhat.com/zabbix/zabbix-agent2-70:${ZBX_VERSION}" \ summary="Zabbix agent" \ url="https://www.zabbix.com/" \ vendor="Zabbix SIA" \ @@ -31,7 +31,7 @@ LABEL description="Zabbix agent 2 is deployed on a monitoring target to actively io.openshift.tags="zabbix,zabbix-agent" \ org.label-schema.build-date="${BUILD_DATE}" \ org.label-schema.description="Zabbix agent 2 is deployed on a monitoring target to actively monitor local resources and applications" \ - org.label-schema.docker.cmd="docker run --name zabbix-agent2 --link zabbix-server:zabbix-server -p 10050:10050 -d registry.connect.redhat.com/zabbix/zabbix-agent2-trunk:${ZBX_VERSION}" \ + org.label-schema.docker.cmd="docker run --name zabbix-agent2 --link zabbix-server:zabbix-server -p 10050:10050 -d registry.connect.redhat.com/zabbix/zabbix-agent2-70:${ZBX_VERSION}" \ org.label-schema.license="AGPL v3.0" \ org.label-schema.name="zabbix-agent2-rhel" \ org.label-schema.schema-version="1.0" \ diff --git a/Dockerfiles/agent2/rhel/README.html b/Dockerfiles/agent2/rhel/README.html index a41f15006..5a7539a44 100644 --- a/Dockerfiles/agent2/rhel/README.html +++ b/Dockerfiles/agent2/rhel/README.html @@ -103,7 +103,7 @@

The volume is used to store the file, where Zabbix Agent2 should keep SQLite database. To enable the feature specify ZBX_ENABLEPERSISTENTBUFFER=true. Available since 5.0.0.

User Feedback

Documentation

-

Documentation for this image is stored in the agent2/ directory of the zabbix/zabbix-docker GitHub repo. Be sure to familiarize yourself with the repository's README.md file before attempting a pull request.

+

Documentation for this image is stored in the agent2/ directory of the zabbix/zabbix-docker GitHub repo. Be sure to familiarize yourself with the repository's README.md file before attempting a pull request.

Issues

If you have any problems with or questions about this image, please contact us through a GitHub issue.

Known issues

diff --git a/Dockerfiles/build-base/README.md b/Dockerfiles/build-base/README.md index c2e418516..fb030d359 100644 --- a/Dockerfiles/build-base/README.md +++ b/Dockerfiles/build-base/README.md @@ -28,7 +28,7 @@ Images are updated when new releases are published. The image with ``latest`` ta # How to use this image -The image is required to build Zabbix components. It is base image for [MySQL](https://github.com/zabbix/zabbix-docker/tree/trunk/Dockerfiles/build-mysql), [PostgreSQL](https://github.com/zabbix/zabbix-docker/tree/trunk/Dockerfiles/build-pgsql) and [SQLite3](https://github.com/zabbix/zabbix-docker/tree/trunk/Dockerfiles/build-sqlite3) base images. While the image contains only required packages, MySQL, PostgreSQL and SQLite3 base images compile Zabbix component and prepare them for usage. +The image is required to build Zabbix components. It is base image for [MySQL](https://github.com/zabbix/zabbix-docker/tree/7.0/Dockerfiles/build-mysql), [PostgreSQL](https://github.com/zabbix/zabbix-docker/tree/7.0/Dockerfiles/build-pgsql) and [SQLite3](https://github.com/zabbix/zabbix-docker/tree/7.0/Dockerfiles/build-sqlite3) base images. While the image contains only required packages, MySQL, PostgreSQL and SQLite3 base images compile Zabbix component and prepare them for usage. # The image variants @@ -62,7 +62,7 @@ Please see [the Docker installation documentation](https://docs.docker.com/insta ## Documentation -Documentation for this image is stored in the [`build-base/` directory](https://github.com/zabbix/zabbix-docker/tree/trunk/Dockerfiles/build-base) of the [`zabbix/zabbix-docker` GitHub repo](https://github.com/zabbix/zabbix-docker/). Be sure to familiarize yourself with the [repository's `README.md` file](https://github.com/zabbix/zabbix-docker/blob/master/README.md) before attempting a pull request. +Documentation for this image is stored in the [`build-base/` directory](https://github.com/zabbix/zabbix-docker/tree/7.0/Dockerfiles/build-base) of the [`zabbix/zabbix-docker` GitHub repo](https://github.com/zabbix/zabbix-docker/). Be sure to familiarize yourself with the [repository's `README.md` file](https://github.com/zabbix/zabbix-docker/blob/7.0/README.md) before attempting a pull request. ## Issues diff --git a/Dockerfiles/build-base/rhel/Dockerfile b/Dockerfiles/build-base/rhel/Dockerfile index a21b737a0..3d365eeb5 100644 --- a/Dockerfiles/build-base/rhel/Dockerfile +++ b/Dockerfiles/build-base/rhel/Dockerfile @@ -11,7 +11,7 @@ ENV TERM=xterm \ LABEL description="Prepared environment to build Zabbix components" \ maintainer="alexey.pustovalov@zabbix.com" \ - name="zabbix/zabbix-build-base-trunk" \ + name="zabbix/zabbix-build-base-70" \ release="${RELEASE}" \ summary="Zabbix build base" \ url="https://www.zabbix.com/" \ diff --git a/Dockerfiles/build-mysql/README.md b/Dockerfiles/build-mysql/README.md index 7c8b16b61..35b5097ce 100644 --- a/Dockerfiles/build-mysql/README.md +++ b/Dockerfiles/build-mysql/README.md @@ -30,7 +30,7 @@ Images are updated when new releases are published. The image with ``latest`` ta The image is used to build / compile Zabbix components. Components are prepared for usage in any other images. -The image uses [Zabbix build base](https://github.com/zabbix/zabbix-docker/tree/trunk/Dockerfiles/build-base) image with prepared build environment as base image and build / compile Zabbix components only. +The image uses [Zabbix build base](https://github.com/zabbix/zabbix-docker/tree/7.0/Dockerfiles/build-base) image with prepared build environment as base image and build / compile Zabbix components only. # The image variants @@ -64,7 +64,7 @@ Please see [the Docker installation documentation](https://docs.docker.com/insta ## Documentation -Documentation for this image is stored in the [`build-base/` directory](https://github.com/zabbix/zabbix-docker/tree/trunk/Dockerfiles/build-base) of the [`zabbix/zabbix-docker` GitHub repo](https://github.com/zabbix/zabbix-docker/). Be sure to familiarize yourself with the [repository's `README.md` file](https://github.com/zabbix/zabbix-docker/blob/master/README.md) before attempting a pull request. +Documentation for this image is stored in the [`build-base/` directory](https://github.com/zabbix/zabbix-docker/tree/7.0/Dockerfiles/build-base) of the [`zabbix/zabbix-docker` GitHub repo](https://github.com/zabbix/zabbix-docker/). Be sure to familiarize yourself with the [repository's `README.md` file](https://github.com/zabbix/zabbix-docker/blob/7.0/README.md) before attempting a pull request. ## Issues diff --git a/Dockerfiles/build-mysql/alpine/Dockerfile b/Dockerfiles/build-mysql/alpine/Dockerfile index e22fd8e25..5ffd6ee68 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 LABEL org.opencontainers.image.authors="Alexey Pustovalov " \ org.opencontainers.image.description="Zabbix build base for MySQL based images" \ diff --git a/Dockerfiles/build-mysql/centos/Dockerfile b/Dockerfiles/build-mysql/centos/Dockerfile index 08187dec7..84c21921c 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 LABEL org.opencontainers.image.authors="Alexey Pustovalov " \ org.opencontainers.image.description="Zabbix build base for MySQL based images" \ diff --git a/Dockerfiles/build-mysql/ol/Dockerfile b/Dockerfiles/build-mysql/ol/Dockerfile index be0f435b9..9da9794bd 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 LABEL org.opencontainers.image.authors="Alexey Pustovalov " \ org.opencontainers.image.description="Zabbix build base for MySQL based images" \ diff --git a/Dockerfiles/build-mysql/rhel/Dockerfile b/Dockerfiles/build-mysql/rhel/Dockerfile index ea044270c..1c85f1724 100644 --- a/Dockerfiles/build-mysql/rhel/Dockerfile +++ b/Dockerfiles/build-mysql/rhel/Dockerfile @@ -10,11 +10,11 @@ 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 LABEL description="Zabbix build base for MySQL based images" \ maintainer="alexey.pustovalov@zabbix.com" \ - name="zabbix/zabbix-build-mysql-trunk" \ + name="zabbix/zabbix-build-mysql-70" \ release="${RELEASE}" \ summary="Zabbix build base (MySQL)" \ url="https://www.zabbix.com/" \ diff --git a/Dockerfiles/build-mysql/ubuntu/Dockerfile b/Dockerfiles/build-mysql/ubuntu/Dockerfile index 12b076e2e..1f195c954 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 LABEL org.opencontainers.image.authors="Alexey Pustovalov " \ org.opencontainers.image.description="Zabbix build base for MySQL based images" \ diff --git a/Dockerfiles/build-mysql/windows/Dockerfile.agent b/Dockerfiles/build-mysql/windows/Dockerfile.agent index 7c879a12a..9e42ae181 100644 --- a/Dockerfiles/build-mysql/windows/Dockerfile.agent +++ b/Dockerfiles/build-mysql/windows/Dockerfile.agent @@ -11,7 +11,7 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref 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 ZABBIX_VERSION_RC_NUM=2400 ENV ZBX_SOURCES=$ZBX_SOURCES MAJOR_VERSION=$MAJOR_VERSION ZBX_VERSION=$ZBX_VERSION GIT_BRANCH=${GIT_BRANCH:-$ZBX_VERSION} ` diff --git a/Dockerfiles/build-mysql/windows/Dockerfile.agent2 b/Dockerfiles/build-mysql/windows/Dockerfile.agent2 index 4f6b64cb9..d6ce9511d 100644 --- a/Dockerfiles/build-mysql/windows/Dockerfile.agent2 +++ b/Dockerfiles/build-mysql/windows/Dockerfile.agent2 @@ -16,7 +16,7 @@ ARG MONGODB_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/mongodb.git ARG POSTGRESQL_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/postgresql.git ARG MSSQL_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/mssql.git ARG EMBER_PLUS_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/ember-plus.git -ARG GIT_BRANCH=master +ARG GIT_BRANCH ENV ZBX_SOURCES=$ZBX_SOURCES MAJOR_VERSION=$MAJOR_VERSION ZBX_VERSION=$ZBX_VERSION GIT_BRANCH=${GIT_BRANCH:-$ZBX_VERSION} ` MONGODB_PLUGIN_SOURCES=$MONGODB_PLUGIN_SOURCES MONGODB_PLUGIN_VERSION=${GIT_BRANCH:-$ZBX_VERSION} ` diff --git a/Dockerfiles/build-mysql/windows/Dockerfile_llvm_clang.agent2 b/Dockerfiles/build-mysql/windows/Dockerfile_llvm_clang.agent2 index f03aaaef3..fc0a3ebcc 100644 --- a/Dockerfiles/build-mysql/windows/Dockerfile_llvm_clang.agent2 +++ b/Dockerfiles/build-mysql/windows/Dockerfile_llvm_clang.agent2 @@ -16,7 +16,7 @@ ARG MONGODB_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/mongodb.git ARG POSTGRESQL_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/postgresql.git ARG MSSQL_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/mssql.git ARG EMBER_PLUS_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/ember-plus.git -ARG GIT_BRANCH=master +ARG GIT_BRANCH ENV ZBX_SOURCES=$ZBX_SOURCES MAJOR_VERSION=$MAJOR_VERSION ZBX_VERSION=$ZBX_VERSION GIT_BRANCH=${GIT_BRANCH:-$ZBX_VERSION} ` MONGODB_PLUGIN_SOURCES=$MONGODB_PLUGIN_SOURCES MONGODB_PLUGIN_VERSION=${GIT_BRANCH:-$ZBX_VERSION} ` diff --git a/Dockerfiles/build-mysql/windows/Dockerfile_vcpkg.agent2 b/Dockerfiles/build-mysql/windows/Dockerfile_vcpkg.agent2 index 69e3bfa67..2cbbd592b 100644 --- a/Dockerfiles/build-mysql/windows/Dockerfile_vcpkg.agent2 +++ b/Dockerfiles/build-mysql/windows/Dockerfile_vcpkg.agent2 @@ -16,7 +16,7 @@ ARG MONGODB_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/mongodb.git ARG POSTGRESQL_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/postgresql.git ARG MSSQL_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/mssql.git ARG EMBER_PLUS_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/ember-plus.git -ARG GIT_BRANCH=master +ARG GIT_BRANCH ENV ZBX_SOURCES=$ZBX_SOURCES MAJOR_VERSION=$MAJOR_VERSION ZBX_VERSION=$ZBX_VERSION GIT_BRANCH=${GIT_BRANCH:-$ZBX_VERSION} ` MONGODB_PLUGIN_SOURCES=$MONGODB_PLUGIN_SOURCES MONGODB_PLUGIN_VERSION=${GIT_BRANCH:-$ZBX_VERSION} ` diff --git a/Dockerfiles/build-pgsql/README.md b/Dockerfiles/build-pgsql/README.md index 3a3c9eb55..1d16e22c4 100644 --- a/Dockerfiles/build-pgsql/README.md +++ b/Dockerfiles/build-pgsql/README.md @@ -30,7 +30,7 @@ Images are updated when new releases are published. The image with ``latest`` ta The image is used to build / compile Zabbix components. Components are prepared for usage in any other images. -The image uses [Zabbix build base](https://github.com/zabbix/zabbix-docker/tree/trunk/Dockerfiles/build-base) image with prepared build environment as base image and build / compile Zabbix components only. +The image uses [Zabbix build base](https://github.com/zabbix/zabbix-docker/tree/7.0/Dockerfiles/build-base) image with prepared build environment as base image and build / compile Zabbix components only. # The image variants @@ -64,7 +64,7 @@ Please see [the Docker installation documentation](https://docs.docker.com/insta ## Documentation -Documentation for this image is stored in the [`build-base/` directory](https://github.com/zabbix/zabbix-docker/tree/trunk/Dockerfiles/build-base) of the [`zabbix/zabbix-docker` GitHub repo](https://github.com/zabbix/zabbix-docker/). Be sure to familiarize yourself with the [repository's `README.md` file](https://github.com/zabbix/zabbix-docker/blob/master/README.md) before attempting a pull request. +Documentation for this image is stored in the [`build-base/` directory](https://github.com/zabbix/zabbix-docker/tree/7.0/Dockerfiles/build-base) of the [`zabbix/zabbix-docker` GitHub repo](https://github.com/zabbix/zabbix-docker/). Be sure to familiarize yourself with the [repository's `README.md` file](https://github.com/zabbix/zabbix-docker/blob/7.0/README.md) before attempting a pull request. ## Issues diff --git a/Dockerfiles/build-pgsql/alpine/Dockerfile b/Dockerfiles/build-pgsql/alpine/Dockerfile index b575f22fc..30189a0d0 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 LABEL org.opencontainers.image.authors="Alexey Pustovalov " \ org.opencontainers.image.description="Zabbix build base for PostgreSQL based images" \ diff --git a/Dockerfiles/build-pgsql/centos/Dockerfile b/Dockerfiles/build-pgsql/centos/Dockerfile index f9b811e58..cf7cbc0ce 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 LABEL org.opencontainers.image.authors="Alexey Pustovalov " \ org.opencontainers.image.description="Zabbix build base for PostgreSQL based images" \ diff --git a/Dockerfiles/build-pgsql/ol/Dockerfile b/Dockerfiles/build-pgsql/ol/Dockerfile index 9cecb5f89..0893322dd 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 LABEL org.opencontainers.image.authors="Alexey Pustovalov " \ org.opencontainers.image.description="Zabbix build base for PostgreSQL based images" \ diff --git a/Dockerfiles/build-pgsql/rhel/Dockerfile b/Dockerfiles/build-pgsql/rhel/Dockerfile index a28d64d41..442daa53b 100644 --- a/Dockerfiles/build-pgsql/rhel/Dockerfile +++ b/Dockerfiles/build-pgsql/rhel/Dockerfile @@ -10,11 +10,11 @@ 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 LABEL description="Zabbix build base for PostgreSQL based images" \ maintainer="alexey.pustovalov@zabbix.com" \ - name="zabbix/zabbix-build-pgsql-trunk" \ + name="zabbix/zabbix-build-pgsql-70" \ release="${RELEASE}" \ summary="Zabbix build base (PostgreSQL)" \ url="https://www.zabbix.com/" \ diff --git a/Dockerfiles/build-pgsql/ubuntu/Dockerfile b/Dockerfiles/build-pgsql/ubuntu/Dockerfile index 39b6e5423..9df643e7e 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 LABEL org.opencontainers.image.authors="Alexey Pustovalov " \ org.opencontainers.image.description="Zabbix build base for PostgreSQL based images" \ diff --git a/Dockerfiles/build-sqlite3/README.md b/Dockerfiles/build-sqlite3/README.md index f4e254012..1c4c22a38 100644 --- a/Dockerfiles/build-sqlite3/README.md +++ b/Dockerfiles/build-sqlite3/README.md @@ -30,7 +30,7 @@ Images are updated when new releases are published. The image with ``latest`` ta The image is used to build / compile Zabbix components. Components are prepared for usage in any other images. -The image uses [Zabbix build base](https://github.com/zabbix/zabbix-docker/tree/trunk/Dockerfiles/build-base) image with prepared build environment as base image and build / compile Zabbix components only. +The image uses [Zabbix build base](https://github.com/zabbix/zabbix-docker/tree/7.0/Dockerfiles/build-base) image with prepared build environment as base image and build / compile Zabbix components only. It contains limited prepared Zabbix components while MySQL and PostgreSQL build base images contain all possible components: * zabbix-agent @@ -70,7 +70,7 @@ Please see [the Docker installation documentation](https://docs.docker.com/insta ## Documentation -Documentation for this image is stored in the [`build-base/` directory](https://github.com/zabbix/zabbix-docker/tree/trunk/Dockerfiles/build-base) of the [`zabbix/zabbix-docker` GitHub repo](https://github.com/zabbix/zabbix-docker/). Be sure to familiarize yourself with the [repository's `README.md` file](https://github.com/zabbix/zabbix-docker/blob/master/README.md) before attempting a pull request. +Documentation for this image is stored in the [`build-base/` directory](https://github.com/zabbix/zabbix-docker/tree/7.0/Dockerfiles/build-base) of the [`zabbix/zabbix-docker` GitHub repo](https://github.com/zabbix/zabbix-docker/). Be sure to familiarize yourself with the [repository's `README.md` file](https://github.com/zabbix/zabbix-docker/blob/7.0/README.md) before attempting a pull request. ## Issues diff --git a/Dockerfiles/build-sqlite3/alpine/Dockerfile b/Dockerfiles/build-sqlite3/alpine/Dockerfile index 6e9d8e8a1..6326a6b80 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 LABEL org.opencontainers.image.authors="Alexey Pustovalov " \ org.opencontainers.image.description="Zabbix build base for SQLite3 based images" \ diff --git a/Dockerfiles/build-sqlite3/centos/Dockerfile b/Dockerfiles/build-sqlite3/centos/Dockerfile index 8644291cd..5bbbc350f 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 LABEL org.opencontainers.image.authors="Alexey Pustovalov " \ org.opencontainers.image.description="Zabbix build base for SQLite3 based images" \ diff --git a/Dockerfiles/build-sqlite3/ol/Dockerfile b/Dockerfiles/build-sqlite3/ol/Dockerfile index 4354ac72e..3a4b5a586 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 LABEL org.opencontainers.image.authors="Alexey Pustovalov " \ org.opencontainers.image.description="Zabbix build base for SQLite3 based images" \ diff --git a/Dockerfiles/build-sqlite3/rhel/Dockerfile b/Dockerfiles/build-sqlite3/rhel/Dockerfile index 3fe6a7b02..901f4d652 100644 --- a/Dockerfiles/build-sqlite3/rhel/Dockerfile +++ b/Dockerfiles/build-sqlite3/rhel/Dockerfile @@ -10,11 +10,11 @@ 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 LABEL description="Zabbix build base for SQLite3 based images" \ maintainer="alexey.pustovalov@zabbix.com" \ - name="zabbix/zabbix-build-sqlite3-trunk" \ + name="zabbix/zabbix-build-sqlite3-70" \ release="${RELEASE}" \ summary="Zabbix build base (SQLite3)" \ url="https://www.zabbix.com/" \ diff --git a/Dockerfiles/build-sqlite3/ubuntu/Dockerfile b/Dockerfiles/build-sqlite3/ubuntu/Dockerfile index c904743e1..57ac06a47 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 LABEL org.opencontainers.image.authors="Alexey Pustovalov " \ org.opencontainers.image.description="Zabbix build base for SQLite3 based images" \ diff --git a/Dockerfiles/java-gateway/README.md b/Dockerfiles/java-gateway/README.md index a1192d489..47fa0912b 100644 --- a/Dockerfiles/java-gateway/README.md +++ b/Dockerfiles/java-gateway/README.md @@ -116,7 +116,7 @@ Please see [the Docker installation documentation](https://docs.docker.com/insta ## Documentation -Documentation for this image is stored in the [`java-gateway/` directory](https://github.com/zabbix/zabbix-docker/tree/trunk/Dockerfiles/java-gateway) of the [`zabbix/zabbix-docker` GitHub repo](https://github.com/zabbix/zabbix-docker/). Be sure to familiarize yourself with the [repository's `README.md` file](https://github.com/zabbix/zabbix-docker/blob/trunk/README.md) before attempting a pull request. +Documentation for this image is stored in the [`java-gateway/` directory](https://github.com/zabbix/zabbix-docker/tree/7.0/Dockerfiles/java-gateway) of the [`zabbix/zabbix-docker` GitHub repo](https://github.com/zabbix/zabbix-docker/). Be sure to familiarize yourself with the [repository's `README.md` file](https://github.com/zabbix/zabbix-docker/blob/7.0/README.md) before attempting a pull request. ## Issues diff --git a/Dockerfiles/java-gateway/rhel/Dockerfile b/Dockerfiles/java-gateway/rhel/Dockerfile index 1658b3ae1..fa5fa764d 100644 --- a/Dockerfiles/java-gateway/rhel/Dockerfile +++ b/Dockerfiles/java-gateway/rhel/Dockerfile @@ -18,9 +18,9 @@ ENV TERM=xterm \ LABEL description="Zabbix Java Gateway performs native support for monitoring JMX applications" \ maintainer="alexey.pustovalov@zabbix.com" \ - name="zabbix/zabbix-java-gateway-trunk" \ + name="zabbix/zabbix-java-gateway-70" \ release="${RELEASE}" \ - run="docker run --name zabbix-java-gateway -p 10052:10052 -d registry.connect.redhat.com/zabbix/zabbix-java-gateway-trunk:${ZBX_VERSION}" \ + run="docker run --name zabbix-java-gateway -p 10052:10052 -d registry.connect.redhat.com/zabbix/zabbix-java-gateway-70:${ZBX_VERSION}" \ summary="Zabbix Java Gateway" \ url="https://www.zabbix.com/" \ vendor="Zabbix SIA" \ @@ -31,7 +31,7 @@ LABEL description="Zabbix Java Gateway performs native support for monitoring JM io.openshift.tags="gateway,zabbix-java,java" \ org.label-schema.build-date="${BUILD_DATE}" \ org.label-schema.description="Zabbix Java Gateway performs native support for monitoring JMX applications" \ - org.label-schema.docker.cmd="docker run --name zabbix-java-gateway -p 10052:10052 -d registry.connect.redhat.com/zabbix/zabbix-java-gateway-trunk:${ZBX_VERSION}" \ + org.label-schema.docker.cmd="docker run --name zabbix-java-gateway -p 10052:10052 -d registry.connect.redhat.com/zabbix/zabbix-java-gateway-70:${ZBX_VERSION}" \ org.label-schema.license="AGPL v3.0" \ org.label-schema.name="zabbix-java-gateway-rhel" \ org.label-schema.schema-version="1.0" \ diff --git a/Dockerfiles/java-gateway/rhel/README.html b/Dockerfiles/java-gateway/rhel/README.html index 359fe4949..fd4159576 100644 --- a/Dockerfiles/java-gateway/rhel/README.html +++ b/Dockerfiles/java-gateway/rhel/README.html @@ -38,7 +38,7 @@

The volume allows include additional JAR files to extend allowed protocols for Zabbix Java Gateway.

User Feedback

Documentation

-

Documentation for this image is stored in the java-gateway/ directory of the zabbix/zabbix-docker GitHub repo. Be sure to familiarize yourself with the repository's README.md file before attempting a pull request.

+

Documentation for this image is stored in the java-gateway/ directory of the zabbix/zabbix-docker GitHub repo. Be sure to familiarize yourself with the repository's README.md file before attempting a pull request.

Issues

If you have any problems with or questions about this image, please contact us through a GitHub issue.

Known issues

diff --git a/Dockerfiles/proxy-mysql/README.md b/Dockerfiles/proxy-mysql/README.md index 71ebd5648..c9532782b 100644 --- a/Dockerfiles/proxy-mysql/README.md +++ b/Dockerfiles/proxy-mysql/README.md @@ -315,7 +315,7 @@ Please see [the Docker installation documentation](https://docs.docker.com/insta ## Documentation -Documentation for this image is stored in the [`proxy-mysql/` directory](https://github.com/zabbix/zabbix-docker/tree/trunk/Dockerfiles/proxy-mysql) of the [`zabbix/zabbix-docker` GitHub repo](https://github.com/zabbix/zabbix-docker/). Be sure to familiarize yourself with the [repository's `README.md` file](https://github.com/zabbix/zabbix-docker/blob/trunk/README.md) before attempting a pull request. +Documentation for this image is stored in the [`proxy-mysql/` directory](https://github.com/zabbix/zabbix-docker/tree/7.0/Dockerfiles/proxy-mysql) of the [`zabbix/zabbix-docker` GitHub repo](https://github.com/zabbix/zabbix-docker/). Be sure to familiarize yourself with the [repository's `README.md` file](https://github.com/zabbix/zabbix-docker/blob/7.0/README.md) before attempting a pull request. ## Issues diff --git a/Dockerfiles/proxy-mysql/rhel/Dockerfile b/Dockerfiles/proxy-mysql/rhel/Dockerfile index 82d3ffa73..6b061b34a 100644 --- a/Dockerfiles/proxy-mysql/rhel/Dockerfile +++ b/Dockerfiles/proxy-mysql/rhel/Dockerfile @@ -20,9 +20,9 @@ ENV TERM=xterm \ LABEL description="Zabbix proxy with MySQL database support" \ maintainer="alexey.pustovalov@zabbix.com" \ - name="zabbix/zabbix-proxy-mysql-trunk" \ + name="zabbix/zabbix-proxy-mysql-70" \ release="${RELEASE}" \ - run="docker run --name zabbix-proxy --link mysql-server:mysql-server -p 10051:10051 -d registry.connect.redhat.com/zabbix/zabbix-proxy-mysql-trunk:${ZBX_VERSION}" \ + run="docker run --name zabbix-proxy --link mysql-server:mysql-server -p 10051:10051 -d registry.connect.redhat.com/zabbix/zabbix-proxy-mysql-70:${ZBX_VERSION}" \ summary="Zabbix proxy (MySQL)" \ url="https://www.zabbix.com/" \ vendor="Zabbix SIA" \ @@ -33,7 +33,7 @@ LABEL description="Zabbix proxy with MySQL database support" \ io.openshift.tags="zabbix,zabbix-proxy,mysql" \ org.label-schema.build-date="${BUILD_DATE}" \ org.label-schema.description="Zabbix proxy with MySQL database support" \ - org.label-schema.docker.cmd="docker run --name zabbix-proxy --link mysql-server:mysql-server -p 10051:10051 -d registry.connect.redhat.com/zabbix/zabbix-proxy-mysql-trunk:${ZBX_VERSION}" \ + org.label-schema.docker.cmd="docker run --name zabbix-proxy --link mysql-server:mysql-server -p 10051:10051 -d registry.connect.redhat.com/zabbix/zabbix-proxy-mysql-70:${ZBX_VERSION}" \ org.label-schema.license="AGPL v3.0" \ org.label-schema.name="zabbix-proxy-mysql-rhel" \ org.label-schema.schema-version="1.0" \ diff --git a/Dockerfiles/proxy-mysql/rhel/README.html b/Dockerfiles/proxy-mysql/rhel/README.html index bae407d81..bc88ef9b0 100644 --- a/Dockerfiles/proxy-mysql/rhel/README.html +++ b/Dockerfiles/proxy-mysql/rhel/README.html @@ -188,7 +188,7 @@ SNMP traps processing feature could be enabled using shared volume and switched

The volume allows to add new MIB files. It does not support subdirectories, all MIBs must be placed to /var/lib/zabbix/mibs.

User Feedback

Documentation

-

Documentation for this image is stored in the proxy-mysql/ directory of the zabbix/zabbix-docker GitHub repo. Be sure to familiarize yourself with the repository's README.md file before attempting a pull request.

+

Documentation for this image is stored in the proxy-mysql/ directory of the zabbix/zabbix-docker GitHub repo. Be sure to familiarize yourself with the repository's README.md file before attempting a pull request.

Issues

If you have any problems with or questions about this image, please contact us through a GitHub issue.

Known issues

diff --git a/Dockerfiles/proxy-sqlite3/README.md b/Dockerfiles/proxy-sqlite3/README.md index d5c50e275..3039e3ab5 100644 --- a/Dockerfiles/proxy-sqlite3/README.md +++ b/Dockerfiles/proxy-sqlite3/README.md @@ -272,7 +272,7 @@ Please see [the Docker installation documentation](https://docs.docker.com/insta ## Documentation -Documentation for this image is stored in the [`proxy-sqlite3/` directory](https://github.com/zabbix/zabbix-docker/tree/trunk/Dockerfiles/proxy-sqlite3) of the [`zabbix/zabbix-docker` GitHub repo](https://github.com/zabbix/zabbix-docker/). Be sure to familiarize yourself with the [repository's `README.md` file](https://github.com/zabbix/zabbix-docker/blob/trunk/README.md) before attempting a pull request. +Documentation for this image is stored in the [`proxy-sqlite3/` directory](https://github.com/zabbix/zabbix-docker/tree/7.0/Dockerfiles/proxy-sqlite3) of the [`zabbix/zabbix-docker` GitHub repo](https://github.com/zabbix/zabbix-docker/). Be sure to familiarize yourself with the [repository's `README.md` file](https://github.com/zabbix/zabbix-docker/blob/7.0/README.md) before attempting a pull request. ## Issues diff --git a/Dockerfiles/proxy-sqlite3/rhel/Dockerfile b/Dockerfiles/proxy-sqlite3/rhel/Dockerfile index 24653989f..490615d0e 100644 --- a/Dockerfiles/proxy-sqlite3/rhel/Dockerfile +++ b/Dockerfiles/proxy-sqlite3/rhel/Dockerfile @@ -20,9 +20,9 @@ ENV TERM=xterm \ LABEL description="Zabbix proxy with SQLite3 database support" \ maintainer="alexey.pustovalov@zabbix.com" \ - name="zabbix/zabbix-proxy-sqlite-trunk" \ + name="zabbix/zabbix-proxy-sqlite-70" \ release="${RELEASE}" \ - run="docker run --name zabbix-proxy -p 10051:10051 -d registry.connect.redhat.com/zabbix/zabbix-proxy-sqlite-trunk:${ZBX_VERSION}" \ + run="docker run --name zabbix-proxy -p 10051:10051 -d registry.connect.redhat.com/zabbix/zabbix-proxy-sqlite-70:${ZBX_VERSION}" \ summary="Zabbix proxy (SQLite3)" \ url="https://www.zabbix.com/" \ vendor="Zabbix SIA" \ @@ -33,7 +33,7 @@ LABEL description="Zabbix proxy with SQLite3 database support" \ io.openshift.tags="zabbix,zabbix-proxy,sqlite" \ org.label-schema.build-date="${BUILD_DATE}" \ org.label-schema.description="Zabbix proxy with SQLite3 database support" \ - org.label-schema.docker.cmd="docker run --name zabbix-proxy -p 10051:10051 -d registry.connect.redhat.com/zabbix/zabbix-proxy-sqlite3-trunk:${ZBX_VERSION}" \ + org.label-schema.docker.cmd="docker run --name zabbix-proxy -p 10051:10051 -d registry.connect.redhat.com/zabbix/zabbix-proxy-sqlite3-70:${ZBX_VERSION}" \ org.label-schema.license="AGPL v3.0" \ org.label-schema.name="zabbix-proxy-sqlite-rhel" \ org.label-schema.schema-version="1.0" \ diff --git a/Dockerfiles/proxy-sqlite3/rhel/README.html b/Dockerfiles/proxy-sqlite3/rhel/README.html index 016559c03..e7c870dc5 100644 --- a/Dockerfiles/proxy-sqlite3/rhel/README.html +++ b/Dockerfiles/proxy-sqlite3/rhel/README.html @@ -156,7 +156,7 @@ SNMP traps processing feature could be enabled using shared volume and switched

The volume allows to add new MIB files. It does not support subdirectories, all MIBs must be placed to /var/lib/zabbix/mibs.

User Feedback

Documentation

-

Documentation for this image is stored in the proxy-sqlite3/ directory of the zabbix/zabbix-docker GitHub repo. Be sure to familiarize yourself with the repository's README.md file before attempting a pull request.

+

Documentation for this image is stored in the proxy-sqlite3/ directory of the zabbix/zabbix-docker GitHub repo. Be sure to familiarize yourself with the repository's README.md file before attempting a pull request.

Issues

If you have any problems with or questions about this image, please contact us through a GitHub issue.

Known issues

diff --git a/Dockerfiles/server-mysql/README.md b/Dockerfiles/server-mysql/README.md index 10168e229..1482e226a 100644 --- a/Dockerfiles/server-mysql/README.md +++ b/Dockerfiles/server-mysql/README.md @@ -306,7 +306,7 @@ Please see [the Docker installation documentation](https://docs.docker.com/insta ## Documentation -Documentation for this image is stored in the [`server-mysql/` directory](https://github.com/zabbix/zabbix-docker/tree/trunk/Dockerfiles/server-mysql) of the [`zabbix/zabbix-docker` GitHub repo](https://github.com/zabbix/zabbix-docker/). Be sure to familiarize yourself with the [repository's `README.md` file](https://github.com/zabbix/zabbix-docker/blob/trunk/README.md) before attempting a pull request. +Documentation for this image is stored in the [`server-mysql/` directory](https://github.com/zabbix/zabbix-docker/tree/7.0/Dockerfiles/server-mysql) of the [`zabbix/zabbix-docker` GitHub repo](https://github.com/zabbix/zabbix-docker/). Be sure to familiarize yourself with the [repository's `README.md` file](https://github.com/zabbix/zabbix-docker/blob/7.0/README.md) before attempting a pull request. ## Issues diff --git a/Dockerfiles/server-mysql/rhel/Dockerfile b/Dockerfiles/server-mysql/rhel/Dockerfile index fd4d5c66a..611ec648e 100644 --- a/Dockerfiles/server-mysql/rhel/Dockerfile +++ b/Dockerfiles/server-mysql/rhel/Dockerfile @@ -20,9 +20,9 @@ ENV TERM=xterm \ LABEL description="Zabbix server with MySQL database support" \ maintainer="alexey.pustovalov@zabbix.com" \ - name="zabbix/zabbix-server-mysql-trunk" \ + name="zabbix/zabbix-server-mysql-70" \ release="${RELEASE}" \ - run="docker run --name zabbix-server --link mysql-server:mysql-server -p 10051:10051 -d registry.connect.redhat.com/zabbix/zabbix-server-mysql-trunk:${ZBX_VERSION}" \ + run="docker run --name zabbix-server --link mysql-server:mysql-server -p 10051:10051 -d registry.connect.redhat.com/zabbix/zabbix-server-mysql-70:${ZBX_VERSION}" \ summary="Zabbix server (MySQL)" \ url="https://www.zabbix.com/" \ vendor="Zabbix SIA" \ @@ -33,7 +33,7 @@ LABEL description="Zabbix server with MySQL database support" \ io.openshift.tags="zabbix,zabbix-server,mysql" \ org.label-schema.build-date="${BUILD_DATE}" \ org.label-schema.description="Zabbix server with MySQL database support" \ - org.label-schema.docker.cmd="docker run --name zabbix-server --link mysql-server:mysql-server -p 10051:10051 -d registry.connect.redhat.com/zabbix/zabbix-server-mysql-trunk:${ZBX_VERSION}" \ + org.label-schema.docker.cmd="docker run --name zabbix-server --link mysql-server:mysql-server -p 10051:10051 -d registry.connect.redhat.com/zabbix/zabbix-server-mysql-70:${ZBX_VERSION}" \ org.label-schema.license="AGPL v3.0" \ org.label-schema.name="zabbix-server-mysql-rhel" \ org.label-schema.schema-version="1.0" \ diff --git a/Dockerfiles/server-mysql/rhel/README.html b/Dockerfiles/server-mysql/rhel/README.html index 5e013c711..19c58e4cc 100644 --- a/Dockerfiles/server-mysql/rhel/README.html +++ b/Dockerfiles/server-mysql/rhel/README.html @@ -18,7 +18,7 @@

How to use this image

Start zabbix-server-mysql

Start a Zabbix server container as follows:

-
podman run --name some-zabbix-server-mysql -e DB_SERVER_HOST="some-mysql-server" -e MYSQL_USER="some-user" -e MYSQL_PASSWORD="some-password" --init -d zabbix/zabbix-server-mysql-trunk:tag
+
podman run --name some-zabbix-server-mysql -e DB_SERVER_HOST="some-mysql-server" -e MYSQL_USER="some-user" -e MYSQL_PASSWORD="some-password" --init -d zabbix/zabbix-server-mysql-70:tag
 
Where some-zabbix-server-mysql is the name you want to assign to your container, some-mysql-server is IP or DNS name of MySQL server, some-user is user to connect to Zabbix database on MySQL server, some-password is the password to connect to MySQL server and tag is the tag specifying the version you want.

 

 
[!NOTE]
@@ -192,7 +192,7 @@ SNMP traps processing feature could be enabled using shared volume and switched
 
Directory for real-time export of events, history and trends in newline-delimited JSON format. Could be enabled using ZBX_EXPORTFILESIZE environment variable.

 
User Feedback

 
Documentation

-
Documentation for this image is stored in the server-mysql/ directory of the zabbix/zabbix-docker GitHub repo. Be sure to familiarize yourself with the repository's README.md file before attempting a pull request.

+
Documentation for this image is stored in the server-mysql/ directory of the zabbix/zabbix-docker GitHub repo. Be sure to familiarize yourself with the repository's README.md file before attempting a pull request.

 
Issues

 
If you have any problems with or questions about this image, please contact us through a GitHub issue.

 
Known issues

diff --git a/Dockerfiles/server-pgsql/README.md b/Dockerfiles/server-pgsql/README.md
index 4a5e13118..6bc9b33a0 100644
--- a/Dockerfiles/server-pgsql/README.md
+++ b/Dockerfiles/server-pgsql/README.md
@@ -306,7 +306,7 @@ Please see [the Docker installation documentation](https://docs.docker.com/insta
 
 ## Documentation
 
-Documentation for this image is stored in the [`server-pgsql/` directory](https://github.com/zabbix/zabbix-docker/tree/trunk/Dockerfiles/server-pgsql) of the [`zabbix/zabbix-docker` GitHub repo](https://github.com/zabbix/zabbix-docker/). Be sure to familiarize yourself with the [repository's `README.md` file](https://github.com/zabbix/zabbix-docker/blob/trunk/README.md) before attempting a pull request.
+Documentation for this image is stored in the [`server-pgsql/` directory](https://github.com/zabbix/zabbix-docker/tree/7.0/Dockerfiles/server-pgsql) of the [`zabbix/zabbix-docker` GitHub repo](https://github.com/zabbix/zabbix-docker/). Be sure to familiarize yourself with the [repository's `README.md` file](https://github.com/zabbix/zabbix-docker/blob/7.0/README.md) before attempting a pull request.
 
 ## Issues
 
diff --git a/Dockerfiles/server-pgsql/rhel/Dockerfile b/Dockerfiles/server-pgsql/rhel/Dockerfile
index ed66b2b53..f9d224624 100644
--- a/Dockerfiles/server-pgsql/rhel/Dockerfile
+++ b/Dockerfiles/server-pgsql/rhel/Dockerfile
@@ -20,9 +20,9 @@ ENV TERM=xterm \
 
 LABEL description="Zabbix server with PostgreSQL database support" \
       maintainer="alexey.pustovalov@zabbix.com" \
-      name="zabbix/zabbix-server-pgsql-trunk" \
+      name="zabbix/zabbix-server-pgsql-70" \
       release="${RELEASE}" \
-      run="docker run --name zabbix-server --link postgresql:pgsql-server -p 10051:10051 -d registry.connect.redhat.com/zabbix/zabbix-server-pgsql-trunk:${ZBX_VERSION}" \
+      run="docker run --name zabbix-server --link postgresql:pgsql-server -p 10051:10051 -d registry.connect.redhat.com/zabbix/zabbix-server-pgsql-70:${ZBX_VERSION}" \
       summary="Zabbix server (PostgreSQL)" \
       url="https://www.zabbix.com/" \
       vendor="Zabbix SIA" \
@@ -33,7 +33,7 @@ LABEL description="Zabbix server with PostgreSQL database support" \
       io.openshift.tags="zabbix,zabbix-server,pgsql" \
       org.label-schema.build-date="${BUILD_DATE}" \
       org.label-schema.description="Zabbix server with PostgreSQL database support" \
-      org.label-schema.docker.cmd="docker run --name zabbix-server --link postgresql:pgsql-server -p 10051:10051 -d registry.connect.redhat.com/zabbix/zabbix-server-pgsql-trunk:${ZBX_VERSION}" \
+      org.label-schema.docker.cmd="docker run --name zabbix-server --link postgresql:pgsql-server -p 10051:10051 -d registry.connect.redhat.com/zabbix/zabbix-server-pgsql-70:${ZBX_VERSION}" \
       org.label-schema.license="AGPL v3.0" \
       org.label-schema.name="zabbix-server-pgsql-rhel" \
       org.label-schema.schema-version="1.0" \
diff --git a/Dockerfiles/server-pgsql/rhel/README.html b/Dockerfiles/server-pgsql/rhel/README.html
index 02c331245..f83964b59 100644
--- a/Dockerfiles/server-pgsql/rhel/README.html
+++ b/Dockerfiles/server-pgsql/rhel/README.html
@@ -192,7 +192,7 @@ SNMP traps processing feature could be enabled using shared volume and switched
 
Directory for real-time export of events, history and trends in newline-delimited JSON format. Could be enabled using ZBX_EXPORTFILESIZE environment variable.

 
User Feedback

 
Documentation

-
Documentation for this image is stored in the server-pgsql/ directory of the zabbix/zabbix-docker GitHub repo. Be sure to familiarize yourself with the repository's README.md file before attempting a pull request.

+
Documentation for this image is stored in the server-pgsql/ directory of the zabbix/zabbix-docker GitHub repo. Be sure to familiarize yourself with the repository's README.md file before attempting a pull request.

 
Issues

 
If you have any problems with or questions about this image, please contact us through a GitHub issue.

 
Known issues

diff --git a/Dockerfiles/snmptraps/README.md b/Dockerfiles/snmptraps/README.md
index 9983b7f23..411919137 100644
--- a/Dockerfiles/snmptraps/README.md
+++ b/Dockerfiles/snmptraps/README.md
@@ -113,7 +113,7 @@ Please see [the Docker installation documentation](https://docs.docker.com/insta
 
 ## Documentation
 
-Documentation for this image is stored in the [`snmptraps/` directory](https://github.com/zabbix/zabbix-docker/tree/trunk/Dockerfiles/snmptraps) of the [`zabbix/zabbix-docker` GitHub repo](https://github.com/zabbix/zabbix-docker/). Be sure to familiarize yourself with the [repository's `README.md` file](https://github.com/zabbix/zabbix-docker/blob/trunk/README.md) before attempting a pull request.
+Documentation for this image is stored in the [`snmptraps/` directory](https://github.com/zabbix/zabbix-docker/tree/7.0/Dockerfiles/snmptraps) of the [`zabbix/zabbix-docker` GitHub repo](https://github.com/zabbix/zabbix-docker/). Be sure to familiarize yourself with the [repository's `README.md` file](https://github.com/zabbix/zabbix-docker/blob/7.0/README.md) before attempting a pull request.
 
 ## Issues
 
diff --git a/Dockerfiles/snmptraps/rhel/Dockerfile b/Dockerfiles/snmptraps/rhel/Dockerfile
index 35bd17321..6f2f9a1f3 100644
--- a/Dockerfiles/snmptraps/rhel/Dockerfile
+++ b/Dockerfiles/snmptraps/rhel/Dockerfile
@@ -14,9 +14,9 @@ ENV TERM=xterm \
 
 LABEL description="Zabbix SNMP traps receiver" \
       maintainer="alexey.pustovalov@zabbix.com" \
-      name="zabbix/zabbix-snmptraps-trunk" \
+      name="zabbix/zabbix-snmptraps-70" \
       release="${RELEASE}" \
-      run="docker run --name zabbix-snmptraps --link zabbix-server:zabbix-server -p 162:1162/udp -d registry.connect.redhat.com/zabbix/zabbix-snmptraps-trunk:${ZBX_VERSION}" \
+      run="docker run --name zabbix-snmptraps --link zabbix-server:zabbix-server -p 162:1162/udp -d registry.connect.redhat.com/zabbix/zabbix-snmptraps-70:${ZBX_VERSION}" \
       summary="Zabbix SNMP traps receiver" \
       url="https://www.zabbix.com/" \
       vendor="Zabbix SIA" \
@@ -27,7 +27,7 @@ LABEL description="Zabbix SNMP traps receiver" \
       io.openshift.tags="zabbix,zabbix-snmp,snmp-traps" \
       org.label-schema.build-date="${BUILD_DATE}" \
       org.label-schema.description="Zabbix SNMP traps receiver" \
-      org.label-schema.docker.cmd="docker run --name zabbix-snmptraps --link zabbix-server:zabbix-server -p 162:1162/udp -d registry.connect.redhat.com/zabbix/zabbix-snmptraps-trunk:${ZBX_VERSION}" \
+      org.label-schema.docker.cmd="docker run --name zabbix-snmptraps --link zabbix-server:zabbix-server -p 162:1162/udp -d registry.connect.redhat.com/zabbix/zabbix-snmptraps-70:${ZBX_VERSION}" \
       org.label-schema.license="AGPL v3.0" \
       org.label-schema.name="zabbix-snmptraps-rhel" \
       org.label-schema.schema-version="1.0" \
diff --git a/Dockerfiles/snmptraps/rhel/README.html b/Dockerfiles/snmptraps/rhel/README.html
index 3b56bf88a..151da5597 100644
--- a/Dockerfiles/snmptraps/rhel/README.html
+++ b/Dockerfiles/snmptraps/rhel/README.html
@@ -36,7 +36,7 @@
 
The volume allows to add new MIB files. It does not support subdirectories, all MIBs must be placed to /var/lib/zabbix/mibs.

 
User Feedback

 
Documentation

-
Documentation for this image is stored in the snmptraps/ directory of the zabbix/zabbix-docker GitHub repo. Be sure to familiarize yourself with the repository's README.md file before attempting a pull request.

+
Documentation for this image is stored in the snmptraps/ directory of the zabbix/zabbix-docker GitHub repo. Be sure to familiarize yourself with the repository's README.md file before attempting a pull request.

 
Issues

 
If you have any problems with or questions about this image, please contact us through a GitHub issue.

 
Known issues

diff --git a/Dockerfiles/web-apache-mysql/README.md b/Dockerfiles/web-apache-mysql/README.md
index 86c3dbc11..6e96ac305 100644
--- a/Dockerfiles/web-apache-mysql/README.md
+++ b/Dockerfiles/web-apache-mysql/README.md
@@ -292,7 +292,7 @@ Please see [the Docker installation documentation](https://docs.docker.com/insta
 
 ## Documentation
 
-Documentation for this image is stored in the [`web-apache-mysql/` directory](https://github.com/zabbix/zabbix-docker/tree/trunk/Dockerfiles/web-apache-mysql) of the [`zabbix/zabbix-docker` GitHub repo](https://github.com/zabbix/zabbix-docker/). Be sure to familiarize yourself with the [repository's `README.md` file](https://github.com/zabbix/zabbix-docker/blob/trunk/README.md) before attempting a pull request.
+Documentation for this image is stored in the [`web-apache-mysql/` directory](https://github.com/zabbix/zabbix-docker/tree/7.0/Dockerfiles/web-apache-mysql) of the [`zabbix/zabbix-docker` GitHub repo](https://github.com/zabbix/zabbix-docker/). Be sure to familiarize yourself with the [repository's `README.md` file](https://github.com/zabbix/zabbix-docker/blob/7.0/README.md) before attempting a pull request.
 
 ## Issues
 
diff --git a/Dockerfiles/web-apache-pgsql/README.md b/Dockerfiles/web-apache-pgsql/README.md
index 209388d7d..98afa0782 100644
--- a/Dockerfiles/web-apache-pgsql/README.md
+++ b/Dockerfiles/web-apache-pgsql/README.md
@@ -292,7 +292,7 @@ Please see [the Docker installation documentation](https://docs.docker.com/insta
 
 ## Documentation
 
-Documentation for this image is stored in the [`web-apache-pgsql/` directory](https://github.com/zabbix/zabbix-docker/tree/trunk/Dockerfiles/web-apache-pgsql) of the [`zabbix/zabbix-docker` GitHub repo](https://github.com/zabbix/zabbix-docker/). Be sure to familiarize yourself with the [repository's `README.md` file](https://github.com/zabbix/zabbix-docker/blob/trunk/README.md) before attempting a pull request.
+Documentation for this image is stored in the [`web-apache-pgsql/` directory](https://github.com/zabbix/zabbix-docker/tree/7.0/Dockerfiles/web-apache-pgsql) of the [`zabbix/zabbix-docker` GitHub repo](https://github.com/zabbix/zabbix-docker/). Be sure to familiarize yourself with the [repository's `README.md` file](https://github.com/zabbix/zabbix-docker/blob/7.0/README.md) before attempting a pull request.
 
 ## Issues
 
diff --git a/Dockerfiles/web-nginx-mysql/README.md b/Dockerfiles/web-nginx-mysql/README.md
index 2ab91cc47..d84ae7a02 100644
--- a/Dockerfiles/web-nginx-mysql/README.md
+++ b/Dockerfiles/web-nginx-mysql/README.md
@@ -293,7 +293,7 @@ Please see [the Docker installation documentation](https://docs.docker.com/insta
 
 ## Documentation
 
-Documentation for this image is stored in the [`web-nginx-mysql/` directory](https://github.com/zabbix/zabbix-docker/tree/trunk/Dockerfiles/web-nginx-mysql) of the [`zabbix/zabbix-docker` GitHub repo](https://github.com/zabbix/zabbix-docker/). Be sure to familiarize yourself with the [repository's `README.md` file](https://github.com/zabbix/zabbix-docker/blob/trunk/README.md) before attempting a pull request.
+Documentation for this image is stored in the [`web-nginx-mysql/` directory](https://github.com/zabbix/zabbix-docker/tree/7.0/Dockerfiles/web-nginx-mysql) of the [`zabbix/zabbix-docker` GitHub repo](https://github.com/zabbix/zabbix-docker/). Be sure to familiarize yourself with the [repository's `README.md` file](https://github.com/zabbix/zabbix-docker/blob/7.0/README.md) before attempting a pull request.
 
 ## Issues
 
diff --git a/Dockerfiles/web-nginx-mysql/rhel/Dockerfile b/Dockerfiles/web-nginx-mysql/rhel/Dockerfile
index e9eb052f6..c3afc7953 100644
--- a/Dockerfiles/web-nginx-mysql/rhel/Dockerfile
+++ b/Dockerfiles/web-nginx-mysql/rhel/Dockerfile
@@ -20,7 +20,7 @@ LABEL description="Zabbix web-interface based on Nginx web server with MySQL dat
       maintainer="alexey.pustovalov@zabbix.com" \
       name="zabbix/zabbix-web-mysql" \
       release="${RELEASE}" \
-      run="docker run --name zabbix-web-nginx --link mysql-server:mysql --link zabbix-server:zabbix-server -p 80:80 -d registry.connect.redhat.com/zabbix/zabbix-web-nginx-trunk:${ZBX_VERSION}" \
+      run="docker run --name zabbix-web-nginx --link mysql-server:mysql --link zabbix-server:zabbix-server -p 80:80 -d registry.connect.redhat.com/zabbix/zabbix-web-nginx-70:${ZBX_VERSION}" \
       summary="Zabbix web-interface based on Nginx web server with MySQL database support" \
       url="https://www.zabbix.com/" \
       vendor="Zabbix SIA" \
@@ -31,7 +31,7 @@ LABEL description="Zabbix web-interface based on Nginx web server with MySQL dat
       io.openshift.tags="zabbix,zabbix-web,mysql,nginx" \
       org.label-schema.build-date="${BUILD_DATE}" \
       org.label-schema.description="Zabbix web-interface based on Nginx web server with MySQL database support" \
-      org.label-schema.docker.cmd="docker run --name zabbix-web-nginx --link mysql-server:mysql --link zabbix-server:zabbix-server -p 80:80 -d registry.connect.redhat.com/zabbix/zabbix-web-nginx-trunk:${ZBX_VERSION}" \
+      org.label-schema.docker.cmd="docker run --name zabbix-web-nginx --link mysql-server:mysql --link zabbix-server:zabbix-server -p 80:80 -d registry.connect.redhat.com/zabbix/zabbix-web-nginx-70:${ZBX_VERSION}" \
       org.label-schema.license="AGPL v3.0" \
       org.label-schema.name="zabbix-web-mysql-rhel" \
       org.label-schema.schema-version="1.0" \
diff --git a/Dockerfiles/web-nginx-mysql/rhel/README.html b/Dockerfiles/web-nginx-mysql/rhel/README.html
index 08e64bf9a..b63d8a088 100644
--- a/Dockerfiles/web-nginx-mysql/rhel/README.html
+++ b/Dockerfiles/web-nginx-mysql/rhel/README.html
@@ -136,7 +136,7 @@ Allowed PHP-FPM configuration options:
 
The volume allows to use custom certificates for SAML authentification. The volume must contains three files sp.key, sp.crt and idp.crt. Available since 5.0.0.

 
User Feedback

 
Documentation

-
Documentation for this image is stored in the web-nginx-mysql/ directory of the zabbix/zabbix-docker GitHub repo. Be sure to familiarize yourself with the repository's README.md file before attempting a pull request.

+
Documentation for this image is stored in the web-nginx-mysql/ directory of the zabbix/zabbix-docker GitHub repo. Be sure to familiarize yourself with the repository's README.md file before attempting a pull request.

 
Issues

 
If you have any problems with or questions about this image, please contact us through a GitHub issue.

 
Known issues

diff --git a/Dockerfiles/web-nginx-pgsql/README.md b/Dockerfiles/web-nginx-pgsql/README.md
index e012452a5..7e3ef3280 100644
--- a/Dockerfiles/web-nginx-pgsql/README.md
+++ b/Dockerfiles/web-nginx-pgsql/README.md
@@ -292,7 +292,7 @@ Please see [the Docker installation documentation](https://docs.docker.com/insta
 
 ## Documentation
 
-Documentation for this image is stored in the [`web-nginx-pgsql/` directory](https://github.com/zabbix/zabbix-docker/tree/trunk/Dockerfiles/web-nginx-pgsql) of the [`zabbix/zabbix-docker` GitHub repo](https://github.com/zabbix/zabbix-docker/). Be sure to familiarize yourself with the [repository's `README.md` file](https://github.com/zabbix/zabbix-docker/blob/trunk/README.md) before attempting a pull request.
+Documentation for this image is stored in the [`web-nginx-pgsql/` directory](https://github.com/zabbix/zabbix-docker/tree/7.0/Dockerfiles/web-nginx-pgsql) of the [`zabbix/zabbix-docker` GitHub repo](https://github.com/zabbix/zabbix-docker/). Be sure to familiarize yourself with the [repository's `README.md` file](https://github.com/zabbix/zabbix-docker/blob/7.0/README.md) before attempting a pull request.
 
 ## Issues
 
diff --git a/Dockerfiles/web-nginx-pgsql/rhel/Dockerfile b/Dockerfiles/web-nginx-pgsql/rhel/Dockerfile
index a34d1a789..c9aaf8eb6 100644
--- a/Dockerfiles/web-nginx-pgsql/rhel/Dockerfile
+++ b/Dockerfiles/web-nginx-pgsql/rhel/Dockerfile
@@ -20,7 +20,7 @@ LABEL description="Zabbix web-interface based on Nginx web server with PostgreSQ
       maintainer="alexey.pustovalov@zabbix.com" \
       name="zabbix/zabbix-web-pgsql" \
       release="${RELEASE}" \
-      run="docker run --name zabbix-web-nginx --link postgresql:pgsql-server --link zabbix-server:zabbix-server -p 80:80 -d registry.connect.redhat.com/zabbix/zabbix-web-pgsql-trunk:${ZBX_VERSION}" \
+      run="docker run --name zabbix-web-nginx --link postgresql:pgsql-server --link zabbix-server:zabbix-server -p 80:80 -d registry.connect.redhat.com/zabbix/zabbix-web-pgsql-70:${ZBX_VERSION}" \
       summary="Zabbix web-interface based on Nginx web server with PostgreSQL database support" \
       url="https://www.zabbix.com/" \
       vendor="Zabbix SIA" \
@@ -31,7 +31,7 @@ LABEL description="Zabbix web-interface based on Nginx web server with PostgreSQ
       io.openshift.tags="zabbix,zabbix-web,pgsql,nginx" \
       org.label-schema.build-date="${BUILD_DATE}" \
       org.label-schema.description="Zabbix web-interface based on Nginx web server with PostgreSQL database support" \
-      org.label-schema.docker.cmd="docker run --name zabbix-web-nginx --link postgresql:pgsql-server --link zabbix-server:zabbix-server -p 80:80 -d registry.connect.redhat.com/zabbix/zabbix-web-pgsql-trunk:${ZBX_VERSION}" \
+      org.label-schema.docker.cmd="docker run --name zabbix-web-nginx --link postgresql:pgsql-server --link zabbix-server:zabbix-server -p 80:80 -d registry.connect.redhat.com/zabbix/zabbix-web-pgsql-70:${ZBX_VERSION}" \
       org.label-schema.license="AGPL v3.0" \
       org.label-schema.name="zabbix-web-pgsql-rhel" \
       org.label-schema.schema-version="1.0" \
diff --git a/Dockerfiles/web-service/README.md b/Dockerfiles/web-service/README.md
index 604373849..6f1acb777 100644
--- a/Dockerfiles/web-service/README.md
+++ b/Dockerfiles/web-service/README.md
@@ -136,7 +136,7 @@ Please see [the Docker installation documentation](https://docs.docker.com/insta
 
 ## Documentation
 
-Documentation for this image is stored in the [`web-service/` directory](https://github.com/zabbix/zabbix-docker/tree/trunk/Dockerfiles/web-service) of the [`zabbix/zabbix-docker` GitHub repo](https://github.com/zabbix/zabbix-docker/). Be sure to familiarize yourself with the [repository's `README.md` file](https://github.com/zabbix/zabbix-docker/blob/trunk/README.md) before attempting a pull request.
+Documentation for this image is stored in the [`web-service/` directory](https://github.com/zabbix/zabbix-docker/tree/7.0/Dockerfiles/web-service) of the [`zabbix/zabbix-docker` GitHub repo](https://github.com/zabbix/zabbix-docker/). Be sure to familiarize yourself with the [repository's `README.md` file](https://github.com/zabbix/zabbix-docker/blob/7.0/README.md) before attempting a pull request.
 
 ## Issues
 
diff --git a/Dockerfiles/web-service/rhel/Dockerfile b/Dockerfiles/web-service/rhel/Dockerfile
index dfd5b3648..312ed4f3d 100644
--- a/Dockerfiles/web-service/rhel/Dockerfile
+++ b/Dockerfiles/web-service/rhel/Dockerfile
@@ -19,9 +19,9 @@ ENV TERM=xterm \
 
 LABEL description="Zabbix web service for performing various tasks using headless web browser" \
       maintainer="alexey.pustovalov@zabbix.com" \
-      name="zabbix/zabbix-web-service-trunk" \
+      name="zabbix/zabbix-web-service-70" \
       release="${RELEASE}" \
-      run="docker run --name zabbix-web-service --link zabbix-server:zabbix-server -p 10053:10053 -d registry.connect.redhat.com/zabbix/zabbix-web-service-trunk:${ZBX_VERSION}" \
+      run="docker run --name zabbix-web-service --link zabbix-server:zabbix-server -p 10053:10053 -d registry.connect.redhat.com/zabbix/zabbix-web-service-70:${ZBX_VERSION}" \
       summary="Zabbix web service" \
       url="https://www.zabbix.com/" \
       vendor="Zabbix SIA" \
@@ -32,7 +32,7 @@ LABEL description="Zabbix web service for performing various tasks using headles
       io.openshift.tags="zabbix,zabbix-web-service" \
       org.label-schema.build-date="${BUILD_DATE}" \
       org.label-schema.description="Zabbix web service for performing various tasks using headless web browser" \
-      org.label-schema.docker.cmd="docker run --name zabbix-web-service --link zabbix-server:zabbix-server -p 10053:10053 -d registry.connect.redhat.com/zabbix/zabbix-web-service-trunk:${ZBX_VERSION}" \
+      org.label-schema.docker.cmd="docker run --name zabbix-web-service --link zabbix-server:zabbix-server -p 10053:10053 -d registry.connect.redhat.com/zabbix/zabbix-web-service-70:${ZBX_VERSION}" \
       org.label-schema.license="AGPL v3.0" \
       org.label-schema.name="zabbix-web-service-rhel" \
       org.label-schema.schema-version="1.0" \
diff --git a/Dockerfiles/web-service/rhel/README.html b/Dockerfiles/web-service/rhel/README.html
index 545031f97..14f1e241e 100644
--- a/Dockerfiles/web-service/rhel/README.html
+++ b/Dockerfiles/web-service/rhel/README.html
@@ -55,7 +55,7 @@
 
The volume is used to store TLS related files. These file names are specified using ZBX_TLSCAFILE, ZBX_TLSCERTFILE and ZBX_TLSKEY_FILE variables.

 
User Feedback

 
Documentation

-
Documentation for this image is stored in the web-service/ directory of the zabbix/zabbix-docker GitHub repo. Be sure to familiarize yourself with the repository's README.md file before attempting a pull request.

+
Documentation for this image is stored in the web-service/ directory of the zabbix/zabbix-docker GitHub repo. Be sure to familiarize yourself with the repository's README.md file before attempting a pull request.

 
Issues

 
If you have any problems with or questions about this image, please contact us through a GitHub issue.

 
Known issues

diff --git a/README.md b/README.md
index 8fe2aa5fe..dd1b1403f 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.0&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.0&event=push)](https://github.com/zabbix/zabbix-docker/actions/workflows/images_build_windows.yml)
 
 # What is Zabbix?
 
@@ -25,11 +25,9 @@ This repository contains **Dockerfile** of [Zabbix](https://zabbix.com/) for [Do
 
 * [alpine](https://hub.docker.com/_/alpine/)
 * [centos](https://quay.io/repository/centos/centos?tab=info)
-* [oracle linux](https://hub.docker.com/_/oraclelinux/) from Zabbix 5.0
+* [oracle linux](https://hub.docker.com/_/oraclelinux/)
 * [ubuntu](https://hub.docker.com/_/ubuntu/)
-
-> [!IMPORTANT]
-> All Zabbix images based on CentOS 8 image can not be updated anymore because CentOS 8 base image is outdated on Docker Hub (base image is not updated for half year). CentOS Stream 8 and CentOS Stream 9 from quay.io is used currently.**
+* [rhel](https://catalog.redhat.com/software/container-stacks/detail/663b05ecf9ba071d2ff93618)
 
 ### Usage
 
@@ -39,9 +37,6 @@ Please also follow usage instructions of each Zabbix component image:
 
 * [zabbix-appliance](https://hub.docker.com/r/zabbix/zabbix-appliance/) - Zabbix appliance with built-in MySQL server, Zabbix server, Zabbix Java Gateway and Zabbix frontend based on Nginx web-server
 
-> [!IMPORTANT]
-> Zabbix Docker Appliance has been decommissioned and will not be available for 3.0.31, 4.0.19, 4.4.7, 5.0.0 and newer releases. Please use a separate Docker images for each component instead of the all-in-one solution.**
-
 * [zabbix-agent](https://hub.docker.com/r/zabbix/zabbix-agent/) - Zabbix agent
 * [zabbix-agent2](https://hub.docker.com/r/zabbix/zabbix-agent2/) - Zabbix agent 2
 * [zabbix-server-mysql](https://hub.docker.com/r/zabbix/zabbix-server-mysql/) - Zabbix server with MySQL database support
diff --git a/build.json b/build.json
index 65c6295a7..c534e255b 100644
--- a/build.json
+++ b/build.json
@@ -31,18 +31,18 @@
     "windows-2022": "ltsc2022"
   },
   "components": {
-    "agent": { "base": "build-mysql", "rhel": true },
-    "agent2": { "base": "build-mysql", "rhel": true },
-    "java-gateway": { "base": "build-mysql", "rhel": true },
-    "proxy-mysql": { "base": "build-mysql", "rhel": true },
-    "proxy-sqlite3": { "base": "build-sqlite3", "rhel": true },
-    "server-mysql": { "base": "build-mysql", "rhel": true },
-    "server-pgsql": { "base": "build-pgsql", "rhel": true },
-    "snmptraps": { "base": "", "rhel": true },
-    "web-apache-mysql": { "base": "build-mysql", "rhel": false },
-    "web-apache-pgsql": { "base": "build-pgsql", "rhel": false },
-    "web-nginx-mysql": { "base": "build-mysql", "rhel": true },
-    "web-nginx-pgsql": { "base": "build-mysql", "rhel": true },
-    "web-service": { "base": "build-mysql", "rhel": true }
+    "agent": { "base": "build-mysql", "rhel": true, "rhel_project": "664254aaff927b6e9cd8af93" },
+    "agent2": { "base": "build-mysql", "rhel": true, "rhel_project": "66425489c3f1cbe661cf6135" },
+    "java-gateway": { "base": "build-mysql", "rhel": true, "rhel_project": "66425456fc1b23180a424e19" },
+    "proxy-mysql": { "base": "build-mysql", "rhel": true, "rhel_project": "6642544aa84deaf9b8e1e987" },
+    "proxy-sqlite3": { "base": "build-sqlite3", "rhel": true, "rhel_project": "6642544aff927b6e9cd8ac61" },
+    "server-mysql": { "base": "build-mysql", "rhel": true, "rhel_project": "66425419fc1b23180a424c56" },
+    "server-pgsql": { "base": "build-pgsql", "rhel": true, "rhel_project": "6642543965a1ed1a86f32682" },
+    "snmptraps": { "base": "", "rhel": true, "rhel_project": "664254bc08b6cb1b593897e4" },
+    "web-apache-mysql": { "base": "build-mysql", "rhel": false, "rhel_project": "" },
+    "web-apache-pgsql": { "base": "build-pgsql", "rhel": false, "rhel_project": "" },
+    "web-nginx-mysql": { "base": "build-mysql", "rhel": true, "rhel_project": "63f30e478857871bae486514" },
+    "web-nginx-pgsql": { "base": "build-mysql", "rhel": true, "rhel_project": "6642547fdda1f56ae53a02c0" },
+    "web-service": { "base": "build-mysql", "rhel": true, "rhel_project": "6642545cee5752ff64eaeea5" }
   }
 }
diff --git a/kubernetes.yaml b/kubernetes.yaml
index 6de2fdce5..0801af6d1 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.0
           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.0-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.0-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.0-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.0-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.0-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.0-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.0-latest
           imagePullPolicy: IfNotPresent
           resources:
            limits: