From 9320f36347de851f59812ca95af3d9e81b8352e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sil=C3=A9n?= Date: Sat, 16 May 2026 20:21:36 +0300 Subject: [PATCH 1/4] Document MariaDB support in README *-mysql images default to MariaDB (DB_ENGINE=mariadb). Mention MariaDB alongside MySQL in image descriptions and Compose notes. --- README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 66eeb4d0..bfba4ca6 100644 --- a/README.md +++ b/README.md @@ -36,14 +36,14 @@ Please also follow usage instructions of each Zabbix component image: * [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 +* [zabbix-server-mysql](https://hub.docker.com/r/zabbix/zabbix-server-mysql/) - Zabbix server with MySQL or MariaDB database support * [zabbix-server-pgsql](https://hub.docker.com/r/zabbix/zabbix-server-pgsql/) - Zabbix server with PostgreSQL database support -* [zabbix-web-apache-mysql](https://hub.docker.com/r/zabbix/zabbix-web-apache-mysql/) - Zabbix web interface on Apache2 web server with MySQL database support +* [zabbix-web-apache-mysql](https://hub.docker.com/r/zabbix/zabbix-web-apache-mysql/) - Zabbix web interface on Apache2 web server with MySQL or MariaDB database support * [zabbix-web-apache-pgsql](https://hub.docker.com/r/zabbix/zabbix-web-apache-pgsql/) - Zabbix web interface on Apache2 web server with PostgreSQL database support -* [zabbix-web-nginx-mysql](https://hub.docker.com/r/zabbix/zabbix-web-nginx-mysql/) - Zabbix web interface on Nginx web server with MySQL database support +* [zabbix-web-nginx-mysql](https://hub.docker.com/r/zabbix/zabbix-web-nginx-mysql/) - Zabbix web interface on Nginx web server with MySQL or MariaDB database support * [zabbix-web-nginx-pgsql](https://hub.docker.com/r/zabbix/zabbix-web-nginx-pgsql/) - Zabbix web interface on Nginx web server with PostgreSQL database support * [zabbix-proxy-sqlite3](https://hub.docker.com/r/zabbix/zabbix-proxy-sqlite3/) - Zabbix proxy with SQLite3 database support -* [zabbix-proxy-mysql](https://hub.docker.com/r/zabbix/zabbix-proxy-mysql/) - Zabbix proxy with MySQL database support +* [zabbix-proxy-mysql](https://hub.docker.com/r/zabbix/zabbix-proxy-mysql/) - Zabbix proxy with MySQL or MariaDB database support * [zabbix-java-gateway](https://hub.docker.com/r/zabbix/zabbix-java-gateway/) - Zabbix Java Gateway * [zabbix-web-service](https://hub.docker.com/r/zabbix/zabbix-web-service/) - Zabbix web service for performing various tasks using headless web browser (for example, reporting) * [zabbix-snmptraps](https://hub.docker.com/r/zabbix/zabbix-snmptraps/) - Additional container image for Zabbix server and Zabbix proxy to support SNMP traps @@ -53,7 +53,7 @@ Please also follow usage instructions of each Zabbix component image: > [!NOTE] > The following requires `make` and `docker compose` version 2.24.0 or greater. -You can use the Docker Compose files for MySQL and PostgreSQL (**compose.yaml** and **compose_pgsql.yaml**, respectively) directly with the ``docker compose`` command. The required images and the Compose file behavior can be configured through environment variables and the .env file. By default, Alpine-based images and the latest version from the current branch are used. +You can use the Docker Compose files for MySQL/MariaDB and PostgreSQL (**compose.yaml** and **compose_pgsql.yaml**, respectively) directly with the ``docker compose`` command. The `*-mysql` images default to MariaDB (`DB_ENGINE=mariadb`). The required images and the Compose file behavior can be configured through environment variables and the .env file. By default, Alpine-based images and the latest version from the current branch are used. In addition, a Makefile is provided to configure and run the required Docker Compose files, supporting a variety of base operating system and database engine combinations, as well as to build Zabbix components locally. From 9e4fd3590196405b4844749669571a54fbb657e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sil=C3=A9n?= Date: Tue, 19 May 2026 12:35:44 +0300 Subject: [PATCH 2/4] Update README for Docker Compose instructions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Clarify Docker Compose usage for MySQL/MariaDB. Signed-off-by: Robert Silén --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index bfba4ca6..6baed549 100644 --- a/README.md +++ b/README.md @@ -53,7 +53,7 @@ Please also follow usage instructions of each Zabbix component image: > [!NOTE] > The following requires `make` and `docker compose` version 2.24.0 or greater. -You can use the Docker Compose files for MySQL/MariaDB and PostgreSQL (**compose.yaml** and **compose_pgsql.yaml**, respectively) directly with the ``docker compose`` command. The `*-mysql` images default to MariaDB (`DB_ENGINE=mariadb`). The required images and the Compose file behavior can be configured through environment variables and the .env file. By default, Alpine-based images and the latest version from the current branch are used. +You can use the Docker Compose files for MySQL or MariaDB, and PostgreSQL (**compose.yaml** and **compose_pgsql.yaml**, respectively) directly with the ``docker compose`` command. Images with `*-mysql` in the name support both MySQL and MariaDB as the database engine; set `DB_ENGINE` to `mysql` or `mariadb` in your environment or `.env` file. The required images and the Compose file behavior can be configured through environment variables and the .env file. By default, Alpine-based images and the latest version from the current branch are used. In addition, a Makefile is provided to configure and run the required Docker Compose files, supporting a variety of base operating system and database engine combinations, as well as to build Zabbix components locally. From b93e8ebf6dbc1464872949a554a91eda64dd41cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sil=C3=A9n?= Date: Tue, 26 May 2026 20:34:05 +0300 Subject: [PATCH 3/4] docs: remove DB_ENGINE from README per review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit DB_ENGINE is an internal build-time setting for mysql/mariadb CLI clients, not a user-facing database engine switch. Signed-off-by: Robert Silén Co-authored-by: Cursor --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6baed549..7d25bfd9 100644 --- a/README.md +++ b/README.md @@ -53,7 +53,7 @@ Please also follow usage instructions of each Zabbix component image: > [!NOTE] > The following requires `make` and `docker compose` version 2.24.0 or greater. -You can use the Docker Compose files for MySQL or MariaDB, and PostgreSQL (**compose.yaml** and **compose_pgsql.yaml**, respectively) directly with the ``docker compose`` command. Images with `*-mysql` in the name support both MySQL and MariaDB as the database engine; set `DB_ENGINE` to `mysql` or `mariadb` in your environment or `.env` file. The required images and the Compose file behavior can be configured through environment variables and the .env file. By default, Alpine-based images and the latest version from the current branch are used. +You can use the Docker Compose files for MySQL or MariaDB, and PostgreSQL (**compose.yaml** and **compose_pgsql.yaml**, respectively) directly with the ``docker compose`` command. Images with `*-mysql` in the name support both MySQL and MariaDB databases. The required images and the Compose file behavior can be configured through environment variables and the .env file. By default, Alpine-based images and the latest version from the current branch are used. In addition, a Makefile is provided to configure and run the required Docker Compose files, supporting a variety of base operating system and database engine combinations, as well as to build Zabbix components locally. From fce61db8b28495a10bf9b872ada32284c47bd26c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sil=C3=A9n?= Date: Tue, 26 May 2026 20:36:12 +0300 Subject: [PATCH 4/4] docs: drop *-mysql naming note from Compose section MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Per-image descriptions already note MySQL/MariaDB support; avoid explaining internal image naming in the Compose paragraph. Signed-off-by: Robert Silén Co-authored-by: Cursor --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 7d25bfd9..5ace126e 100644 --- a/README.md +++ b/README.md @@ -53,7 +53,7 @@ Please also follow usage instructions of each Zabbix component image: > [!NOTE] > The following requires `make` and `docker compose` version 2.24.0 or greater. -You can use the Docker Compose files for MySQL or MariaDB, and PostgreSQL (**compose.yaml** and **compose_pgsql.yaml**, respectively) directly with the ``docker compose`` command. Images with `*-mysql` in the name support both MySQL and MariaDB databases. The required images and the Compose file behavior can be configured through environment variables and the .env file. By default, Alpine-based images and the latest version from the current branch are used. +You can use the Docker Compose files for MySQL or MariaDB, and PostgreSQL (**compose.yaml** and **compose_pgsql.yaml**, respectively) directly with the ``docker compose`` command. The required images and the Compose file behavior can be configured through environment variables and the .env file. By default, Alpine-based images and the latest version from the current branch are used. In addition, a Makefile is provided to configure and run the required Docker Compose files, supporting a variety of base operating system and database engine combinations, as well as to build Zabbix components locally.