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.
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.
If you have any problems with or questions about this image, please contact us through a GitHub issue.
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.
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.
If you have any problems with or questions about this image, please contact us through a GitHub issue.
The volume allows include additional JAR files to extend allowed protocols for Zabbix Java Gateway.
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.
If you have any problems with or questions about this image, please contact us through a GitHub issue.
The volume allows to add new MIB files. It does not support subdirectories, all MIBs must be placed to /var/lib/zabbix/mibs.
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.
If you have any problems with or questions about this image, please contact us through a GitHub issue.
The volume allows to add new MIB files. It does not support subdirectories, all MIBs must be placed to /var/lib/zabbix/mibs.
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.
If you have any problems with or questions about this image, please contact us through a GitHub issue.
zabbix-server-mysqlStart 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 @@
[](https://sonarcloud.io/summary/new_code?id=zabbix_zabbix-docker)
-[](https://github.com/zabbix/zabbix-docker/actions/workflows/images_build.yml)
-[](https://github.com/zabbix/zabbix-docker/actions/workflows/images_build_windows.yml)
+[](https://github.com/zabbix/zabbix-docker/actions/workflows/images_build.yml)
+[](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: