From 23c17a9c8bb5419a1614b51bc4b671b00b47b739 Mon Sep 17 00:00:00 2001 From: Snarp Date: Fri, 24 Jul 2026 19:33:32 +0200 Subject: [PATCH] Delete DOckerfiles --- Dockerfiles/agent/README.md | 243 ------- Dockerfiles/agent/alpine/.dockerignore | 1 - Dockerfiles/agent/alpine/Dockerfile | 102 --- Dockerfiles/agent/alpine/README.md | 1 - Dockerfiles/agent/alpine/build.sh | 1 - Dockerfiles/agent/centos/.dockerignore | 1 - Dockerfiles/agent/centos/Dockerfile | 116 --- Dockerfiles/agent/centos/README.md | 1 - Dockerfiles/agent/centos/build.sh | 1 - Dockerfiles/agent/ol/.dockerignore | 1 - Dockerfiles/agent/ol/Dockerfile | 114 --- Dockerfiles/agent/ol/README.md | 1 - Dockerfiles/agent/ol/build.sh | 1 - Dockerfiles/agent/rhel/.dockerignore | 1 - Dockerfiles/agent/rhel/Dockerfile | 131 ---- Dockerfiles/agent/rhel/README.html | 140 ---- Dockerfiles/agent/rhel/build.sh | 1 - Dockerfiles/agent/rhel/licenses/AGPL-v3.0.txt | 661 ------------------ Dockerfiles/agent/ubuntu/.dockerignore | 1 - Dockerfiles/agent/ubuntu/Dockerfile | 103 --- Dockerfiles/agent/ubuntu/README.md | 1 - Dockerfiles/agent/ubuntu/build.sh | 1 - Dockerfiles/agent/windows/Dockerfile | 87 --- .../agent/windows/Dockerfile.dockerignore | 17 - Dockerfiles/agent/windows/README.md | 1 - Dockerfiles/agent2/README.md | 243 ------- Dockerfiles/agent2/alpine/.dockerignore | 1 - Dockerfiles/agent2/alpine/Dockerfile | 101 --- Dockerfiles/agent2/alpine/README.md | 1 - Dockerfiles/agent2/alpine/build.sh | 1 - Dockerfiles/agent2/centos/.dockerignore | 1 - Dockerfiles/agent2/centos/Dockerfile | 117 ---- Dockerfiles/agent2/centos/README.md | 1 - Dockerfiles/agent2/centos/build.sh | 1 - Dockerfiles/agent2/ol/.dockerignore | 1 - Dockerfiles/agent2/ol/Dockerfile | 116 --- Dockerfiles/agent2/ol/README.md | 1 - Dockerfiles/agent2/ol/build.sh | 1 - Dockerfiles/agent2/rhel/.dockerignore | 1 - Dockerfiles/agent2/rhel/Dockerfile | 126 ---- Dockerfiles/agent2/rhel/Dockerfile.cuda | 144 ---- Dockerfiles/agent2/rhel/README.html | 142 ---- Dockerfiles/agent2/rhel/build.sh | 1 - .../agent2/rhel/licenses/AGPL-v3.0.txt | 661 ------------------ Dockerfiles/agent2/ubuntu/.dockerignore | 1 - Dockerfiles/agent2/ubuntu/Dockerfile | 104 --- Dockerfiles/agent2/ubuntu/README.md | 1 - Dockerfiles/agent2/ubuntu/build.sh | 1 - Dockerfiles/agent2/windows/Dockerfile | 90 --- .../agent2/windows/Dockerfile.dockerignore | 17 - Dockerfiles/agent2/windows/README.md | 1 - Dockerfiles/build-base/README.md | 80 --- Dockerfiles/build-base/alpine/.dockerignore | 1 - Dockerfiles/build-base/alpine/Dockerfile | 65 -- Dockerfiles/build-base/alpine/README.md | 1 - Dockerfiles/build-base/alpine/build.sh | 1 - Dockerfiles/build-base/centos/.dockerignore | 1 - Dockerfiles/build-base/centos/Dockerfile | 74 -- Dockerfiles/build-base/centos/README.md | 1 - Dockerfiles/build-base/centos/build.sh | 1 - Dockerfiles/build-base/ol/.dockerignore | 1 - Dockerfiles/build-base/ol/Dockerfile | 74 -- Dockerfiles/build-base/ol/README.md | 1 - Dockerfiles/build-base/ol/build.sh | 1 - Dockerfiles/build-base/rhel/.dockerignore | 1 - Dockerfiles/build-base/rhel/Dockerfile | 86 --- Dockerfiles/build-base/rhel/README.md | 1 - Dockerfiles/build-base/rhel/build.sh | 1 - .../build-base/rhel/licenses/AGPL-v3.0.txt | 661 ------------------ Dockerfiles/build-base/ubuntu/.dockerignore | 1 - Dockerfiles/build-base/ubuntu/Dockerfile | 63 -- Dockerfiles/build-base/ubuntu/README.md | 1 - Dockerfiles/build-base/ubuntu/build.sh | 1 - Dockerfiles/build-base/windows/CMakeLists.txt | 148 ---- .../build-base/windows/Dockerfile.agent | 346 --------- .../build-base/windows/Dockerfile.agent2 | 219 ------ .../windows/Dockerfile_llvm_clang.agent2 | 187 ----- .../windows/Dockerfile_msvcrt.agent2 | 205 ------ .../windows/Dockerfile_vcpkg.agent2 | 140 ---- Dockerfiles/build-base/windows/README.md | 1 - Dockerfiles/build-mysql/README.md | 82 --- Dockerfiles/build-mysql/alpine/.dockerignore | 1 - Dockerfiles/build-mysql/alpine/Dockerfile | 212 ------ Dockerfiles/build-mysql/alpine/README.md | 1 - Dockerfiles/build-mysql/alpine/build.sh | 1 - .../alpine/patches/chromedp_no_sandbox.patch | 17 - Dockerfiles/build-mysql/centos/.dockerignore | 1 - Dockerfiles/build-mysql/centos/Dockerfile | 212 ------ Dockerfiles/build-mysql/centos/README.md | 1 - Dockerfiles/build-mysql/centos/build.sh | 1 - .../centos/patches/chromedp_no_sandbox.patch | 17 - Dockerfiles/build-mysql/ol/.dockerignore | 1 - Dockerfiles/build-mysql/ol/Dockerfile | 212 ------ Dockerfiles/build-mysql/ol/README.md | 1 - Dockerfiles/build-mysql/ol/build.sh | 1 - .../ol/patches/chromedp_no_sandbox.patch | 17 - Dockerfiles/build-mysql/rhel/.dockerignore | 1 - Dockerfiles/build-mysql/rhel/Dockerfile | 222 ------ Dockerfiles/build-mysql/rhel/README.md | 1 - Dockerfiles/build-mysql/rhel/build.sh | 1 - .../rhel/patches/chromedp_no_sandbox.patch | 17 - Dockerfiles/build-mysql/ubuntu/.dockerignore | 1 - Dockerfiles/build-mysql/ubuntu/Dockerfile | 212 ------ Dockerfiles/build-mysql/ubuntu/README.md | 1 - Dockerfiles/build-mysql/ubuntu/build.sh | 1 - .../ubuntu/patches/chromedp_no_sandbox.patch | 17 - .../build-mysql/windows/Dockerfile.agent | 81 --- .../build-mysql/windows/Dockerfile.agent2 | 121 ---- .../windows/Dockerfile_llvm_clang.agent2 | 124 ---- .../windows/Dockerfile_vcpkg.agent2 | 125 ---- Dockerfiles/build-mysql/windows/README.md | 1 - Dockerfiles/build-pgsql/README.md | 82 --- Dockerfiles/build-pgsql/alpine/.dockerignore | 1 - Dockerfiles/build-pgsql/alpine/Dockerfile | 217 ------ Dockerfiles/build-pgsql/alpine/README.md | 1 - Dockerfiles/build-pgsql/alpine/build.sh | 1 - .../alpine/patches/chromedp_no_sandbox.patch | 17 - Dockerfiles/build-pgsql/centos/.dockerignore | 1 - Dockerfiles/build-pgsql/centos/Dockerfile | 217 ------ Dockerfiles/build-pgsql/centos/README.md | 1 - Dockerfiles/build-pgsql/centos/build.sh | 1 - .../centos/patches/chromedp_no_sandbox.patch | 17 - Dockerfiles/build-pgsql/ol/.dockerignore | 1 - Dockerfiles/build-pgsql/ol/Dockerfile | 217 ------ Dockerfiles/build-pgsql/ol/README.md | 1 - Dockerfiles/build-pgsql/ol/build.sh | 1 - .../ol/patches/chromedp_no_sandbox.patch | 17 - Dockerfiles/build-pgsql/rhel/.dockerignore | 1 - Dockerfiles/build-pgsql/rhel/Dockerfile | 228 ------ Dockerfiles/build-pgsql/rhel/README.md | 1 - Dockerfiles/build-pgsql/rhel/build.sh | 1 - .../rhel/patches/chromedp_no_sandbox.patch | 17 - Dockerfiles/build-pgsql/ubuntu/.dockerignore | 1 - Dockerfiles/build-pgsql/ubuntu/Dockerfile | 217 ------ Dockerfiles/build-pgsql/ubuntu/README.md | 1 - Dockerfiles/build-pgsql/ubuntu/build.sh | 1 - .../ubuntu/patches/chromedp_no_sandbox.patch | 17 - Dockerfiles/build-sqlite3/README.md | 88 --- .../build-sqlite3/alpine/.dockerignore | 1 - Dockerfiles/build-sqlite3/alpine/Dockerfile | 193 ----- Dockerfiles/build-sqlite3/alpine/README.md | 1 - Dockerfiles/build-sqlite3/alpine/build.sh | 1 - .../build-sqlite3/alpine/patches/.gitkeep | 0 .../build-sqlite3/centos/.dockerignore | 1 - Dockerfiles/build-sqlite3/centos/Dockerfile | 193 ----- Dockerfiles/build-sqlite3/centos/README.md | 1 - Dockerfiles/build-sqlite3/centos/build.sh | 1 - .../build-sqlite3/centos/patches/.gitkeep | 0 Dockerfiles/build-sqlite3/ol/.dockerignore | 1 - Dockerfiles/build-sqlite3/ol/Dockerfile | 193 ----- Dockerfiles/build-sqlite3/ol/README.md | 1 - Dockerfiles/build-sqlite3/ol/build.sh | 1 - Dockerfiles/build-sqlite3/ol/patches/.gitkeep | 0 Dockerfiles/build-sqlite3/rhel/.dockerignore | 1 - Dockerfiles/build-sqlite3/rhel/Dockerfile | 204 ------ Dockerfiles/build-sqlite3/rhel/README.md | 1 - Dockerfiles/build-sqlite3/rhel/build.sh | 1 - .../build-sqlite3/rhel/patches/.gitkeep | 0 .../build-sqlite3/ubuntu/.dockerignore | 1 - Dockerfiles/build-sqlite3/ubuntu/Dockerfile | 193 ----- Dockerfiles/build-sqlite3/ubuntu/README.md | 1 - Dockerfiles/build-sqlite3/ubuntu/build.sh | 1 - .../build-sqlite3/ubuntu/patches/.gitkeep | 0 Dockerfiles/java-gateway/README.md | 138 ---- Dockerfiles/java-gateway/alpine/.dockerignore | 1 - Dockerfiles/java-gateway/alpine/Dockerfile | 82 --- Dockerfiles/java-gateway/alpine/README.md | 1 - Dockerfiles/java-gateway/alpine/build.sh | 1 - Dockerfiles/java-gateway/centos/.dockerignore | 1 - Dockerfiles/java-gateway/centos/Dockerfile | 83 --- Dockerfiles/java-gateway/centos/README.md | 1 - Dockerfiles/java-gateway/centos/build.sh | 1 - Dockerfiles/java-gateway/ol/.dockerignore | 1 - Dockerfiles/java-gateway/ol/Dockerfile | 82 --- Dockerfiles/java-gateway/ol/README.md | 1 - Dockerfiles/java-gateway/ol/build.sh | 1 - Dockerfiles/java-gateway/rhel/.dockerignore | 1 - Dockerfiles/java-gateway/rhel/Dockerfile | 103 --- Dockerfiles/java-gateway/rhel/README.html | 46 -- Dockerfiles/java-gateway/rhel/build.sh | 1 - .../java-gateway/rhel/licenses/AGPL-v3.0.txt | 661 ------------------ Dockerfiles/java-gateway/ubuntu/.dockerignore | 1 - Dockerfiles/java-gateway/ubuntu/Dockerfile | 77 -- Dockerfiles/java-gateway/ubuntu/README.md | 1 - Dockerfiles/java-gateway/ubuntu/build.sh | 1 - Dockerfiles/proxy-mysql/README.md | 336 --------- Dockerfiles/proxy-mysql/alpine/.dockerignore | 1 - Dockerfiles/proxy-mysql/alpine/Dockerfile | 135 ---- Dockerfiles/proxy-mysql/alpine/README.md | 1 - Dockerfiles/proxy-mysql/alpine/build.sh | 1 - Dockerfiles/proxy-mysql/centos/.dockerignore | 1 - Dockerfiles/proxy-mysql/centos/Dockerfile | 149 ---- Dockerfiles/proxy-mysql/centos/README.md | 1 - Dockerfiles/proxy-mysql/centos/build.sh | 1 - Dockerfiles/proxy-mysql/ol/.dockerignore | 1 - Dockerfiles/proxy-mysql/ol/Dockerfile | 149 ---- Dockerfiles/proxy-mysql/ol/README.md | 1 - Dockerfiles/proxy-mysql/ol/build.sh | 1 - Dockerfiles/proxy-mysql/rhel/.dockerignore | 1 - Dockerfiles/proxy-mysql/rhel/Dockerfile | 165 ----- Dockerfiles/proxy-mysql/rhel/README.html | 232 ------ Dockerfiles/proxy-mysql/rhel/build.sh | 1 - .../proxy-mysql/rhel/licenses/AGPL-v3.0.txt | 661 ------------------ Dockerfiles/proxy-mysql/ubuntu/.dockerignore | 1 - Dockerfiles/proxy-mysql/ubuntu/Dockerfile | 148 ---- Dockerfiles/proxy-mysql/ubuntu/README.md | 1 - Dockerfiles/proxy-mysql/ubuntu/build.sh | 1 - Dockerfiles/proxy-sqlite3/README.md | 290 -------- .../proxy-sqlite3/alpine/.dockerignore | 1 - Dockerfiles/proxy-sqlite3/alpine/Dockerfile | 131 ---- Dockerfiles/proxy-sqlite3/alpine/README.md | 1 - Dockerfiles/proxy-sqlite3/alpine/build.sh | 1 - .../proxy-sqlite3/centos/.dockerignore | 1 - Dockerfiles/proxy-sqlite3/centos/Dockerfile | 146 ---- Dockerfiles/proxy-sqlite3/centos/README.md | 1 - Dockerfiles/proxy-sqlite3/centos/build.sh | 1 - Dockerfiles/proxy-sqlite3/ol/.dockerignore | 1 - Dockerfiles/proxy-sqlite3/ol/Dockerfile | 145 ---- Dockerfiles/proxy-sqlite3/ol/README.md | 1 - Dockerfiles/proxy-sqlite3/ol/build.sh | 1 - Dockerfiles/proxy-sqlite3/rhel/.dockerignore | 1 - Dockerfiles/proxy-sqlite3/rhel/Dockerfile | 163 ----- Dockerfiles/proxy-sqlite3/rhel/README.html | 176 ----- Dockerfiles/proxy-sqlite3/rhel/build.sh | 1 - .../proxy-sqlite3/rhel/licenses/AGPL-v3.0.txt | 661 ------------------ .../proxy-sqlite3/ubuntu/.dockerignore | 1 - Dockerfiles/proxy-sqlite3/ubuntu/Dockerfile | 145 ---- Dockerfiles/proxy-sqlite3/ubuntu/README.md | 1 - Dockerfiles/proxy-sqlite3/ubuntu/build.sh | 1 - Dockerfiles/server-mysql/README.md | 336 --------- Dockerfiles/server-mysql/alpine/.dockerignore | 1 - Dockerfiles/server-mysql/alpine/Dockerfile | 139 ---- Dockerfiles/server-mysql/alpine/README.md | 1 - Dockerfiles/server-mysql/alpine/build.sh | 1 - Dockerfiles/server-mysql/centos/.dockerignore | 1 - Dockerfiles/server-mysql/centos/Dockerfile | 157 ----- Dockerfiles/server-mysql/centos/README.md | 1 - Dockerfiles/server-mysql/centos/build.sh | 1 - Dockerfiles/server-mysql/ol/.dockerignore | 1 - Dockerfiles/server-mysql/ol/Dockerfile | 154 ---- Dockerfiles/server-mysql/ol/README.md | 1 - Dockerfiles/server-mysql/ol/build.sh | 1 - Dockerfiles/server-mysql/rhel/.dockerignore | 1 - Dockerfiles/server-mysql/rhel/Dockerfile | 173 ----- Dockerfiles/server-mysql/rhel/README.html | 227 ------ Dockerfiles/server-mysql/rhel/build.sh | 1 - .../server-mysql/rhel/licenses/AGPL-v3.0.txt | 661 ------------------ Dockerfiles/server-mysql/ubuntu/.dockerignore | 1 - Dockerfiles/server-mysql/ubuntu/Dockerfile | 152 ---- Dockerfiles/server-mysql/ubuntu/README.md | 1 - Dockerfiles/server-mysql/ubuntu/build.sh | 1 - Dockerfiles/server-pgsql/README.md | 339 --------- Dockerfiles/server-pgsql/alpine/.dockerignore | 1 - Dockerfiles/server-pgsql/alpine/Dockerfile | 136 ---- Dockerfiles/server-pgsql/alpine/README.md | 1 - Dockerfiles/server-pgsql/alpine/build.sh | 1 - Dockerfiles/server-pgsql/centos/.dockerignore | 1 - Dockerfiles/server-pgsql/centos/Dockerfile | 155 ---- Dockerfiles/server-pgsql/centos/README.md | 1 - Dockerfiles/server-pgsql/centos/build.sh | 1 - Dockerfiles/server-pgsql/ol/.dockerignore | 1 - Dockerfiles/server-pgsql/ol/Dockerfile | 151 ---- Dockerfiles/server-pgsql/ol/README.md | 1 - Dockerfiles/server-pgsql/ol/build.sh | 1 - Dockerfiles/server-pgsql/rhel/.dockerignore | 1 - Dockerfiles/server-pgsql/rhel/Dockerfile | 172 ----- Dockerfiles/server-pgsql/rhel/README.html | 227 ------ Dockerfiles/server-pgsql/rhel/build.sh | 1 - .../server-pgsql/rhel/licenses/AGPL-v3.0.txt | 661 ------------------ Dockerfiles/server-pgsql/ubuntu/.dockerignore | 1 - Dockerfiles/server-pgsql/ubuntu/Dockerfile | 151 ---- Dockerfiles/server-pgsql/ubuntu/README.md | 1 - Dockerfiles/server-pgsql/ubuntu/build.sh | 1 - Dockerfiles/snmptraps/README.md | 140 ---- Dockerfiles/snmptraps/alpine/.dockerignore | 1 - Dockerfiles/snmptraps/alpine/Dockerfile | 78 --- Dockerfiles/snmptraps/alpine/README.md | 1 - Dockerfiles/snmptraps/alpine/build.sh | 1 - Dockerfiles/snmptraps/centos/.dockerignore | 1 - Dockerfiles/snmptraps/centos/Dockerfile | 85 --- Dockerfiles/snmptraps/centos/README.md | 1 - Dockerfiles/snmptraps/centos/build.sh | 1 - Dockerfiles/snmptraps/ol/.dockerignore | 1 - Dockerfiles/snmptraps/ol/Dockerfile | 83 --- Dockerfiles/snmptraps/ol/README.md | 1 - Dockerfiles/snmptraps/ol/build.sh | 1 - Dockerfiles/snmptraps/rhel/.dockerignore | 1 - Dockerfiles/snmptraps/rhel/Dockerfile | 107 --- Dockerfiles/snmptraps/rhel/README.html | 49 -- Dockerfiles/snmptraps/rhel/build.sh | 1 - .../snmptraps/rhel/licenses/AGPL-v3.0.txt | 661 ------------------ Dockerfiles/snmptraps/ubuntu/.dockerignore | 1 - Dockerfiles/snmptraps/ubuntu/Dockerfile | 91 --- Dockerfiles/snmptraps/ubuntu/README.md | 1 - Dockerfiles/snmptraps/ubuntu/build.sh | 1 - Dockerfiles/web-apache-mysql/README.md | 333 --------- .../web-apache-mysql/alpine/.dockerignore | 1 - .../web-apache-mysql/alpine/Dockerfile | 151 ---- Dockerfiles/web-apache-mysql/alpine/README.md | 1 - Dockerfiles/web-apache-mysql/alpine/build.sh | 1 - .../alpine/conf/etc/apache2/conf.d/mime.conf | 8 - .../conf/etc/apache2/conf.d/server-common.inc | 59 -- .../alpine/conf/etc/apache2/httpd.conf | 82 --- .../alpine/conf/etc/apache2/includes.conf | 3 - .../alpine/conf/etc/apache2/modules.conf | 18 - .../alpine/conf/etc/php85/php-fpm.conf | 10 - .../conf/etc/php85/php-fpm.d/zabbix.conf | 39 -- .../alpine/conf/etc/zabbix/apache.conf | 5 - .../alpine/conf/etc/zabbix/apache_ssl.conf | 29 - .../web-apache-mysql/centos/.dockerignore | 1 - .../web-apache-mysql/centos/Dockerfile | 153 ---- Dockerfiles/web-apache-mysql/centos/README.md | 1 - Dockerfiles/web-apache-mysql/centos/build.sh | 1 - .../centos/conf/etc/httpd/conf.d/mime.conf | 9 - .../conf/etc/httpd/conf.d/server-common.inc | 59 -- .../centos/conf/etc/httpd/conf/httpd.conf | 82 --- .../centos/conf/etc/httpd/includes.conf | 3 - .../centos/conf/etc/httpd/modules.conf | 18 - .../centos/conf/etc/php-fpm.conf | 9 - .../centos/conf/etc/php-fpm.d/zabbix.conf | 39 -- .../centos/conf/etc/zabbix/apache.conf | 5 - .../centos/conf/etc/zabbix/apache_ssl.conf | 29 - Dockerfiles/web-apache-mysql/ol/.dockerignore | 1 - Dockerfiles/web-apache-mysql/ol/Dockerfile | 152 ---- Dockerfiles/web-apache-mysql/ol/README.md | 1 - Dockerfiles/web-apache-mysql/ol/build.sh | 1 - .../ol/conf/etc/httpd/conf.d/mime.conf | 9 - .../conf/etc/httpd/conf.d/server-common.inc | 59 -- .../ol/conf/etc/httpd/conf/httpd.conf | 82 --- .../ol/conf/etc/httpd/includes.conf | 3 - .../ol/conf/etc/httpd/modules.conf | 18 - .../web-apache-mysql/ol/conf/etc/php-fpm.conf | 9 - .../ol/conf/etc/php-fpm.d/zabbix.conf | 39 -- .../ol/conf/etc/zabbix/apache.conf | 5 - .../ol/conf/etc/zabbix/apache_ssl.conf | 29 - .../web-apache-mysql/ubuntu/.dockerignore | 1 - .../web-apache-mysql/ubuntu/Dockerfile | 147 ---- Dockerfiles/web-apache-mysql/ubuntu/README.md | 1 - Dockerfiles/web-apache-mysql/ubuntu/build.sh | 1 - .../ubuntu/conf/etc/apache2/apache2.conf | 82 --- .../ubuntu/conf/etc/apache2/includes.conf | 5 - .../ubuntu/conf/etc/apache2/modules.conf | 15 - .../apache2/sites-enabled/server-common.inc | 59 -- .../ubuntu/conf/etc/php/8.5/fpm/php-fpm.conf | 10 - .../conf/etc/php/8.5/fpm/pool.d/zabbix.conf | 39 -- .../ubuntu/conf/etc/zabbix/apache.conf | 5 - .../ubuntu/conf/etc/zabbix/apache_ssl.conf | 29 - Dockerfiles/web-apache-pgsql/README.md | 333 --------- .../web-apache-pgsql/alpine/.dockerignore | 1 - .../web-apache-pgsql/alpine/Dockerfile | 149 ---- Dockerfiles/web-apache-pgsql/alpine/README.md | 1 - Dockerfiles/web-apache-pgsql/alpine/build.sh | 1 - .../alpine/conf/etc/apache2/conf.d/mime.conf | 8 - .../conf/etc/apache2/conf.d/server-common.inc | 59 -- .../alpine/conf/etc/apache2/httpd.conf | 82 --- .../alpine/conf/etc/apache2/includes.conf | 3 - .../alpine/conf/etc/apache2/modules.conf | 18 - .../alpine/conf/etc/php85/php-fpm.conf | 10 - .../conf/etc/php85/php-fpm.d/zabbix.conf | 36 - .../alpine/conf/etc/zabbix/apache.conf | 5 - .../alpine/conf/etc/zabbix/apache_ssl.conf | 29 - .../web-apache-pgsql/centos/.dockerignore | 1 - .../web-apache-pgsql/centos/Dockerfile | 152 ---- Dockerfiles/web-apache-pgsql/centos/README.md | 1 - Dockerfiles/web-apache-pgsql/centos/build.sh | 1 - .../centos/conf/etc/httpd/conf.d/mime.conf | 9 - .../conf/etc/httpd/conf.d/server-common.inc | 59 -- .../centos/conf/etc/httpd/conf/httpd.conf | 82 --- .../centos/conf/etc/httpd/includes.conf | 3 - .../centos/conf/etc/httpd/modules.conf | 18 - .../centos/conf/etc/php-fpm.conf | 9 - .../centos/conf/etc/php-fpm.d/zabbix.conf | 36 - .../centos/conf/etc/zabbix/apache.conf | 5 - .../centos/conf/etc/zabbix/apache_ssl.conf | 29 - Dockerfiles/web-apache-pgsql/ol/.dockerignore | 1 - Dockerfiles/web-apache-pgsql/ol/Dockerfile | 151 ---- Dockerfiles/web-apache-pgsql/ol/README.md | 1 - Dockerfiles/web-apache-pgsql/ol/build.sh | 1 - .../ol/conf/etc/httpd/conf.d/mime.conf | 9 - .../conf/etc/httpd/conf.d/server-common.inc | 59 -- .../ol/conf/etc/httpd/conf/httpd.conf | 82 --- .../ol/conf/etc/httpd/includes.conf | 3 - .../ol/conf/etc/httpd/modules.conf | 18 - .../web-apache-pgsql/ol/conf/etc/php-fpm.conf | 9 - .../ol/conf/etc/php-fpm.d/zabbix.conf | 36 - .../ol/conf/etc/zabbix/apache.conf | 5 - .../ol/conf/etc/zabbix/apache_ssl.conf | 29 - .../web-apache-pgsql/ubuntu/.dockerignore | 1 - .../web-apache-pgsql/ubuntu/Dockerfile | 146 ---- Dockerfiles/web-apache-pgsql/ubuntu/README.md | 1 - Dockerfiles/web-apache-pgsql/ubuntu/build.sh | 1 - .../ubuntu/conf/etc/apache2/apache2.conf | 82 --- .../ubuntu/conf/etc/apache2/includes.conf | 5 - .../ubuntu/conf/etc/apache2/modules.conf | 15 - .../apache2/sites-enabled/server-common.inc | 59 -- .../ubuntu/conf/etc/php/8.5/fpm/php-fpm.conf | 10 - .../conf/etc/php/8.5/fpm/pool.d/zabbix.conf | 36 - .../ubuntu/conf/etc/zabbix/apache.conf | 5 - .../ubuntu/conf/etc/zabbix/apache_ssl.conf | 29 - Dockerfiles/web-nginx-mysql/README.md | 334 --------- .../web-nginx-mysql/alpine/.dockerignore | 1 - Dockerfiles/web-nginx-mysql/alpine/Dockerfile | 139 ---- Dockerfiles/web-nginx-mysql/alpine/README.md | 1 - Dockerfiles/web-nginx-mysql/alpine/build.sh | 1 - .../etc/nginx/includes/server-common.conf | 105 --- .../conf/etc/nginx/includes/server-ssl.conf | 17 - .../alpine/conf/etc/nginx/nginx.conf | 71 -- .../alpine/conf/etc/php85/php-fpm.conf | 10 - .../conf/etc/php85/php-fpm.d/zabbix.conf | 39 -- .../alpine/conf/etc/zabbix/nginx.conf | 7 - .../alpine/conf/etc/zabbix/nginx_ssl.conf | 10 - .../web-nginx-mysql/centos/.dockerignore | 1 - Dockerfiles/web-nginx-mysql/centos/Dockerfile | 146 ---- Dockerfiles/web-nginx-mysql/centos/README.md | 1 - Dockerfiles/web-nginx-mysql/centos/build.sh | 1 - .../etc/nginx/includes/server-common.conf | 105 --- .../conf/etc/nginx/includes/server-ssl.conf | 17 - .../centos/conf/etc/nginx/nginx.conf | 71 -- .../centos/conf/etc/php-fpm.conf | 10 - .../centos/conf/etc/php-fpm.d/zabbix.conf | 39 -- .../centos/conf/etc/zabbix/nginx.conf | 7 - .../centos/conf/etc/zabbix/nginx_ssl.conf | 10 - Dockerfiles/web-nginx-mysql/ol/.dockerignore | 1 - Dockerfiles/web-nginx-mysql/ol/Dockerfile | 145 ---- Dockerfiles/web-nginx-mysql/ol/README.md | 1 - Dockerfiles/web-nginx-mysql/ol/build.sh | 1 - .../etc/nginx/includes/server-common.conf | 105 --- .../conf/etc/nginx/includes/server-ssl.conf | 17 - .../ol/conf/etc/nginx/nginx.conf | 71 -- .../web-nginx-mysql/ol/conf/etc/php-fpm.conf | 10 - .../ol/conf/etc/php-fpm.d/zabbix.conf | 39 -- .../ol/conf/etc/zabbix/nginx.conf | 7 - .../ol/conf/etc/zabbix/nginx_ssl.conf | 10 - .../web-nginx-mysql/rhel/.dockerignore | 1 - Dockerfiles/web-nginx-mysql/rhel/Dockerfile | 169 ----- Dockerfiles/web-nginx-mysql/rhel/README.html | 199 ------ Dockerfiles/web-nginx-mysql/rhel/build.sh | 1 - .../etc/nginx/includes/server-common.conf | 105 --- .../conf/etc/nginx/includes/server-ssl.conf | 17 - .../rhel/conf/etc/nginx/nginx.conf | 71 -- .../rhel/conf/etc/php-fpm.conf | 10 - .../rhel/conf/etc/php-fpm.d/zabbix.conf | 39 -- .../rhel/conf/etc/zabbix/nginx.conf | 7 - .../rhel/conf/etc/zabbix/nginx_ssl.conf | 10 - .../rhel/licenses/AGPL-v3.0.txt | 661 ------------------ .../web-nginx-mysql/ubuntu/.dockerignore | 1 - Dockerfiles/web-nginx-mysql/ubuntu/Dockerfile | 148 ---- Dockerfiles/web-nginx-mysql/ubuntu/README.md | 1 - Dockerfiles/web-nginx-mysql/ubuntu/build.sh | 1 - .../etc/nginx/includes/server-common.conf | 105 --- .../conf/etc/nginx/includes/server-ssl.conf | 17 - .../ubuntu/conf/etc/nginx/nginx.conf | 71 -- .../ubuntu/conf/etc/php/8.5/fpm/php-fpm.conf | 10 - .../conf/etc/php/8.5/fpm/pool.d/zabbix.conf | 39 -- .../ubuntu/conf/etc/zabbix/nginx.conf | 7 - .../ubuntu/conf/etc/zabbix/nginx_ssl.conf | 10 - Dockerfiles/web-nginx-pgsql/README.md | 333 --------- .../web-nginx-pgsql/alpine/.dockerignore | 1 - Dockerfiles/web-nginx-pgsql/alpine/Dockerfile | 137 ---- Dockerfiles/web-nginx-pgsql/alpine/README.md | 1 - Dockerfiles/web-nginx-pgsql/alpine/build.sh | 1 - .../etc/nginx/includes/server-common.conf | 105 --- .../conf/etc/nginx/includes/server-ssl.conf | 17 - .../alpine/conf/etc/nginx/nginx.conf | 71 -- .../alpine/conf/etc/php85/php-fpm.conf | 10 - .../conf/etc/php85/php-fpm.d/zabbix.conf | 36 - .../alpine/conf/etc/zabbix/nginx.conf | 7 - .../alpine/conf/etc/zabbix/nginx_ssl.conf | 10 - .../web-nginx-pgsql/centos/.dockerignore | 1 - Dockerfiles/web-nginx-pgsql/centos/Dockerfile | 145 ---- Dockerfiles/web-nginx-pgsql/centos/README.md | 1 - Dockerfiles/web-nginx-pgsql/centos/build.sh | 1 - .../etc/nginx/includes/server-common.conf | 105 --- .../conf/etc/nginx/includes/server-ssl.conf | 17 - .../centos/conf/etc/nginx/nginx.conf | 71 -- .../centos/conf/etc/php-fpm.conf | 10 - .../centos/conf/etc/php-fpm.d/zabbix.conf | 36 - .../centos/conf/etc/zabbix/nginx.conf | 7 - .../centos/conf/etc/zabbix/nginx_ssl.conf | 10 - Dockerfiles/web-nginx-pgsql/ol/.dockerignore | 1 - Dockerfiles/web-nginx-pgsql/ol/Dockerfile | 144 ---- Dockerfiles/web-nginx-pgsql/ol/README.md | 1 - Dockerfiles/web-nginx-pgsql/ol/build.sh | 1 - .../etc/nginx/includes/server-common.conf | 105 --- .../conf/etc/nginx/includes/server-ssl.conf | 17 - .../ol/conf/etc/nginx/nginx.conf | 71 -- .../web-nginx-pgsql/ol/conf/etc/php-fpm.conf | 10 - .../ol/conf/etc/php-fpm.d/zabbix.conf | 36 - .../ol/conf/etc/zabbix/nginx.conf | 7 - .../ol/conf/etc/zabbix/nginx_ssl.conf | 10 - .../web-nginx-pgsql/rhel/.dockerignore | 1 - Dockerfiles/web-nginx-pgsql/rhel/Dockerfile | 168 ----- Dockerfiles/web-nginx-pgsql/rhel/README.html | 200 ------ Dockerfiles/web-nginx-pgsql/rhel/build.sh | 1 - .../etc/nginx/includes/server-common.conf | 105 --- .../conf/etc/nginx/includes/server-ssl.conf | 17 - .../rhel/conf/etc/nginx/nginx.conf | 71 -- .../rhel/conf/etc/php-fpm.conf | 10 - .../rhel/conf/etc/php-fpm.d/zabbix.conf | 36 - .../rhel/conf/etc/zabbix/nginx.conf | 7 - .../rhel/conf/etc/zabbix/nginx_ssl.conf | 10 - .../rhel/licenses/AGPL-v3.0.txt | 661 ------------------ .../web-nginx-pgsql/ubuntu/.dockerignore | 1 - Dockerfiles/web-nginx-pgsql/ubuntu/Dockerfile | 147 ---- Dockerfiles/web-nginx-pgsql/ubuntu/README.md | 1 - Dockerfiles/web-nginx-pgsql/ubuntu/build.sh | 1 - .../etc/nginx/includes/server-common.conf | 105 --- .../conf/etc/nginx/includes/server-ssl.conf | 17 - .../ubuntu/conf/etc/nginx/nginx.conf | 71 -- .../ubuntu/conf/etc/php/8.5/fpm/php-fpm.conf | 10 - .../conf/etc/php/8.5/fpm/pool.d/zabbix.conf | 36 - .../ubuntu/conf/etc/zabbix/nginx.conf | 7 - .../ubuntu/conf/etc/zabbix/nginx_ssl.conf | 10 - Dockerfiles/web-service/README.md | 166 ----- Dockerfiles/web-service/alpine/.dockerignore | 1 - Dockerfiles/web-service/alpine/Dockerfile | 79 --- Dockerfiles/web-service/alpine/README.md | 1 - Dockerfiles/web-service/alpine/build.sh | 1 - Dockerfiles/web-service/centos/.dockerignore | 1 - Dockerfiles/web-service/centos/Dockerfile | 96 --- Dockerfiles/web-service/centos/README.md | 1 - Dockerfiles/web-service/centos/build.sh | 1 - Dockerfiles/web-service/ol/.dockerignore | 1 - Dockerfiles/web-service/ol/Dockerfile | 94 --- Dockerfiles/web-service/ol/README.md | 1 - Dockerfiles/web-service/ol/build.sh | 1 - Dockerfiles/web-service/rhel/.dockerignore | 1 - Dockerfiles/web-service/rhel/Dockerfile | 112 --- Dockerfiles/web-service/rhel/README.html | 68 -- Dockerfiles/web-service/rhel/build.sh | 1 - .../web-service/rhel/licenses/AGPL-v3.0.txt | 661 ------------------ Dockerfiles/web-service/ubuntu/.dockerignore | 1 - Dockerfiles/web-service/ubuntu/Dockerfile | 91 --- Dockerfiles/web-service/ubuntu/README.md | 1 - Dockerfiles/web-service/ubuntu/build.sh | 1 - .../conf/etc/apt/preferences.d/chromium.pref | 14 - .../etc/apt/sources.list.d/debian.sources | 11 - 537 files changed, 32273 deletions(-) delete mode 100644 Dockerfiles/agent/README.md delete mode 100644 Dockerfiles/agent/alpine/.dockerignore delete mode 100644 Dockerfiles/agent/alpine/Dockerfile delete mode 120000 Dockerfiles/agent/alpine/README.md delete mode 120000 Dockerfiles/agent/alpine/build.sh delete mode 100644 Dockerfiles/agent/centos/.dockerignore delete mode 100644 Dockerfiles/agent/centos/Dockerfile delete mode 120000 Dockerfiles/agent/centos/README.md delete mode 120000 Dockerfiles/agent/centos/build.sh delete mode 100644 Dockerfiles/agent/ol/.dockerignore delete mode 100644 Dockerfiles/agent/ol/Dockerfile delete mode 120000 Dockerfiles/agent/ol/README.md delete mode 120000 Dockerfiles/agent/ol/build.sh delete mode 100644 Dockerfiles/agent/rhel/.dockerignore delete mode 100644 Dockerfiles/agent/rhel/Dockerfile delete mode 100644 Dockerfiles/agent/rhel/README.html delete mode 120000 Dockerfiles/agent/rhel/build.sh delete mode 100644 Dockerfiles/agent/rhel/licenses/AGPL-v3.0.txt delete mode 100644 Dockerfiles/agent/ubuntu/.dockerignore delete mode 100644 Dockerfiles/agent/ubuntu/Dockerfile delete mode 120000 Dockerfiles/agent/ubuntu/README.md delete mode 120000 Dockerfiles/agent/ubuntu/build.sh delete mode 100644 Dockerfiles/agent/windows/Dockerfile delete mode 100644 Dockerfiles/agent/windows/Dockerfile.dockerignore delete mode 120000 Dockerfiles/agent/windows/README.md delete mode 100644 Dockerfiles/agent2/README.md delete mode 100644 Dockerfiles/agent2/alpine/.dockerignore delete mode 100644 Dockerfiles/agent2/alpine/Dockerfile delete mode 120000 Dockerfiles/agent2/alpine/README.md delete mode 120000 Dockerfiles/agent2/alpine/build.sh delete mode 100644 Dockerfiles/agent2/centos/.dockerignore delete mode 100644 Dockerfiles/agent2/centos/Dockerfile delete mode 120000 Dockerfiles/agent2/centos/README.md delete mode 120000 Dockerfiles/agent2/centos/build.sh delete mode 100644 Dockerfiles/agent2/ol/.dockerignore delete mode 100644 Dockerfiles/agent2/ol/Dockerfile delete mode 120000 Dockerfiles/agent2/ol/README.md delete mode 120000 Dockerfiles/agent2/ol/build.sh delete mode 100644 Dockerfiles/agent2/rhel/.dockerignore delete mode 100644 Dockerfiles/agent2/rhel/Dockerfile delete mode 100644 Dockerfiles/agent2/rhel/Dockerfile.cuda delete mode 100644 Dockerfiles/agent2/rhel/README.html delete mode 120000 Dockerfiles/agent2/rhel/build.sh delete mode 100644 Dockerfiles/agent2/rhel/licenses/AGPL-v3.0.txt delete mode 100644 Dockerfiles/agent2/ubuntu/.dockerignore delete mode 100644 Dockerfiles/agent2/ubuntu/Dockerfile delete mode 120000 Dockerfiles/agent2/ubuntu/README.md delete mode 120000 Dockerfiles/agent2/ubuntu/build.sh delete mode 100644 Dockerfiles/agent2/windows/Dockerfile delete mode 100644 Dockerfiles/agent2/windows/Dockerfile.dockerignore delete mode 120000 Dockerfiles/agent2/windows/README.md delete mode 100644 Dockerfiles/build-base/README.md delete mode 100644 Dockerfiles/build-base/alpine/.dockerignore delete mode 100644 Dockerfiles/build-base/alpine/Dockerfile delete mode 120000 Dockerfiles/build-base/alpine/README.md delete mode 120000 Dockerfiles/build-base/alpine/build.sh delete mode 100644 Dockerfiles/build-base/centos/.dockerignore delete mode 100644 Dockerfiles/build-base/centos/Dockerfile delete mode 120000 Dockerfiles/build-base/centos/README.md delete mode 120000 Dockerfiles/build-base/centos/build.sh delete mode 100644 Dockerfiles/build-base/ol/.dockerignore delete mode 100644 Dockerfiles/build-base/ol/Dockerfile delete mode 120000 Dockerfiles/build-base/ol/README.md delete mode 120000 Dockerfiles/build-base/ol/build.sh delete mode 100644 Dockerfiles/build-base/rhel/.dockerignore delete mode 100644 Dockerfiles/build-base/rhel/Dockerfile delete mode 120000 Dockerfiles/build-base/rhel/README.md delete mode 120000 Dockerfiles/build-base/rhel/build.sh delete mode 100644 Dockerfiles/build-base/rhel/licenses/AGPL-v3.0.txt delete mode 100644 Dockerfiles/build-base/ubuntu/.dockerignore delete mode 100644 Dockerfiles/build-base/ubuntu/Dockerfile delete mode 120000 Dockerfiles/build-base/ubuntu/README.md delete mode 120000 Dockerfiles/build-base/ubuntu/build.sh delete mode 100644 Dockerfiles/build-base/windows/CMakeLists.txt delete mode 100644 Dockerfiles/build-base/windows/Dockerfile.agent delete mode 100644 Dockerfiles/build-base/windows/Dockerfile.agent2 delete mode 100644 Dockerfiles/build-base/windows/Dockerfile_llvm_clang.agent2 delete mode 100644 Dockerfiles/build-base/windows/Dockerfile_msvcrt.agent2 delete mode 100644 Dockerfiles/build-base/windows/Dockerfile_vcpkg.agent2 delete mode 120000 Dockerfiles/build-base/windows/README.md delete mode 100644 Dockerfiles/build-mysql/README.md delete mode 100644 Dockerfiles/build-mysql/alpine/.dockerignore delete mode 100644 Dockerfiles/build-mysql/alpine/Dockerfile delete mode 120000 Dockerfiles/build-mysql/alpine/README.md delete mode 120000 Dockerfiles/build-mysql/alpine/build.sh delete mode 100644 Dockerfiles/build-mysql/alpine/patches/chromedp_no_sandbox.patch delete mode 100644 Dockerfiles/build-mysql/centos/.dockerignore delete mode 100644 Dockerfiles/build-mysql/centos/Dockerfile delete mode 120000 Dockerfiles/build-mysql/centos/README.md delete mode 120000 Dockerfiles/build-mysql/centos/build.sh delete mode 100644 Dockerfiles/build-mysql/centos/patches/chromedp_no_sandbox.patch delete mode 100644 Dockerfiles/build-mysql/ol/.dockerignore delete mode 100644 Dockerfiles/build-mysql/ol/Dockerfile delete mode 120000 Dockerfiles/build-mysql/ol/README.md delete mode 120000 Dockerfiles/build-mysql/ol/build.sh delete mode 100644 Dockerfiles/build-mysql/ol/patches/chromedp_no_sandbox.patch delete mode 100644 Dockerfiles/build-mysql/rhel/.dockerignore delete mode 100644 Dockerfiles/build-mysql/rhel/Dockerfile delete mode 120000 Dockerfiles/build-mysql/rhel/README.md delete mode 120000 Dockerfiles/build-mysql/rhel/build.sh delete mode 100644 Dockerfiles/build-mysql/rhel/patches/chromedp_no_sandbox.patch delete mode 100644 Dockerfiles/build-mysql/ubuntu/.dockerignore delete mode 100644 Dockerfiles/build-mysql/ubuntu/Dockerfile delete mode 120000 Dockerfiles/build-mysql/ubuntu/README.md delete mode 120000 Dockerfiles/build-mysql/ubuntu/build.sh delete mode 100644 Dockerfiles/build-mysql/ubuntu/patches/chromedp_no_sandbox.patch delete mode 100644 Dockerfiles/build-mysql/windows/Dockerfile.agent delete mode 100644 Dockerfiles/build-mysql/windows/Dockerfile.agent2 delete mode 100644 Dockerfiles/build-mysql/windows/Dockerfile_llvm_clang.agent2 delete mode 100644 Dockerfiles/build-mysql/windows/Dockerfile_vcpkg.agent2 delete mode 120000 Dockerfiles/build-mysql/windows/README.md delete mode 100644 Dockerfiles/build-pgsql/README.md delete mode 100644 Dockerfiles/build-pgsql/alpine/.dockerignore delete mode 100644 Dockerfiles/build-pgsql/alpine/Dockerfile delete mode 120000 Dockerfiles/build-pgsql/alpine/README.md delete mode 120000 Dockerfiles/build-pgsql/alpine/build.sh delete mode 100644 Dockerfiles/build-pgsql/alpine/patches/chromedp_no_sandbox.patch delete mode 100644 Dockerfiles/build-pgsql/centos/.dockerignore delete mode 100644 Dockerfiles/build-pgsql/centos/Dockerfile delete mode 120000 Dockerfiles/build-pgsql/centos/README.md delete mode 120000 Dockerfiles/build-pgsql/centos/build.sh delete mode 100644 Dockerfiles/build-pgsql/centos/patches/chromedp_no_sandbox.patch delete mode 100644 Dockerfiles/build-pgsql/ol/.dockerignore delete mode 100644 Dockerfiles/build-pgsql/ol/Dockerfile delete mode 120000 Dockerfiles/build-pgsql/ol/README.md delete mode 120000 Dockerfiles/build-pgsql/ol/build.sh delete mode 100644 Dockerfiles/build-pgsql/ol/patches/chromedp_no_sandbox.patch delete mode 100644 Dockerfiles/build-pgsql/rhel/.dockerignore delete mode 100644 Dockerfiles/build-pgsql/rhel/Dockerfile delete mode 120000 Dockerfiles/build-pgsql/rhel/README.md delete mode 120000 Dockerfiles/build-pgsql/rhel/build.sh delete mode 100644 Dockerfiles/build-pgsql/rhel/patches/chromedp_no_sandbox.patch delete mode 100644 Dockerfiles/build-pgsql/ubuntu/.dockerignore delete mode 100644 Dockerfiles/build-pgsql/ubuntu/Dockerfile delete mode 120000 Dockerfiles/build-pgsql/ubuntu/README.md delete mode 120000 Dockerfiles/build-pgsql/ubuntu/build.sh delete mode 100644 Dockerfiles/build-pgsql/ubuntu/patches/chromedp_no_sandbox.patch delete mode 100644 Dockerfiles/build-sqlite3/README.md delete mode 100644 Dockerfiles/build-sqlite3/alpine/.dockerignore delete mode 100644 Dockerfiles/build-sqlite3/alpine/Dockerfile delete mode 120000 Dockerfiles/build-sqlite3/alpine/README.md delete mode 120000 Dockerfiles/build-sqlite3/alpine/build.sh delete mode 100644 Dockerfiles/build-sqlite3/alpine/patches/.gitkeep delete mode 100644 Dockerfiles/build-sqlite3/centos/.dockerignore delete mode 100644 Dockerfiles/build-sqlite3/centos/Dockerfile delete mode 120000 Dockerfiles/build-sqlite3/centos/README.md delete mode 120000 Dockerfiles/build-sqlite3/centos/build.sh delete mode 100644 Dockerfiles/build-sqlite3/centos/patches/.gitkeep delete mode 100644 Dockerfiles/build-sqlite3/ol/.dockerignore delete mode 100644 Dockerfiles/build-sqlite3/ol/Dockerfile delete mode 120000 Dockerfiles/build-sqlite3/ol/README.md delete mode 120000 Dockerfiles/build-sqlite3/ol/build.sh delete mode 100644 Dockerfiles/build-sqlite3/ol/patches/.gitkeep delete mode 100644 Dockerfiles/build-sqlite3/rhel/.dockerignore delete mode 100644 Dockerfiles/build-sqlite3/rhel/Dockerfile delete mode 120000 Dockerfiles/build-sqlite3/rhel/README.md delete mode 120000 Dockerfiles/build-sqlite3/rhel/build.sh delete mode 100644 Dockerfiles/build-sqlite3/rhel/patches/.gitkeep delete mode 100644 Dockerfiles/build-sqlite3/ubuntu/.dockerignore delete mode 100644 Dockerfiles/build-sqlite3/ubuntu/Dockerfile delete mode 120000 Dockerfiles/build-sqlite3/ubuntu/README.md delete mode 120000 Dockerfiles/build-sqlite3/ubuntu/build.sh delete mode 100644 Dockerfiles/build-sqlite3/ubuntu/patches/.gitkeep delete mode 100644 Dockerfiles/java-gateway/README.md delete mode 100644 Dockerfiles/java-gateway/alpine/.dockerignore delete mode 100644 Dockerfiles/java-gateway/alpine/Dockerfile delete mode 120000 Dockerfiles/java-gateway/alpine/README.md delete mode 120000 Dockerfiles/java-gateway/alpine/build.sh delete mode 100644 Dockerfiles/java-gateway/centos/.dockerignore delete mode 100644 Dockerfiles/java-gateway/centos/Dockerfile delete mode 120000 Dockerfiles/java-gateway/centos/README.md delete mode 120000 Dockerfiles/java-gateway/centos/build.sh delete mode 100644 Dockerfiles/java-gateway/ol/.dockerignore delete mode 100644 Dockerfiles/java-gateway/ol/Dockerfile delete mode 120000 Dockerfiles/java-gateway/ol/README.md delete mode 120000 Dockerfiles/java-gateway/ol/build.sh delete mode 100644 Dockerfiles/java-gateway/rhel/.dockerignore delete mode 100644 Dockerfiles/java-gateway/rhel/Dockerfile delete mode 100644 Dockerfiles/java-gateway/rhel/README.html delete mode 120000 Dockerfiles/java-gateway/rhel/build.sh delete mode 100644 Dockerfiles/java-gateway/rhel/licenses/AGPL-v3.0.txt delete mode 100644 Dockerfiles/java-gateway/ubuntu/.dockerignore delete mode 100644 Dockerfiles/java-gateway/ubuntu/Dockerfile delete mode 120000 Dockerfiles/java-gateway/ubuntu/README.md delete mode 120000 Dockerfiles/java-gateway/ubuntu/build.sh delete mode 100644 Dockerfiles/proxy-mysql/README.md delete mode 100644 Dockerfiles/proxy-mysql/alpine/.dockerignore delete mode 100644 Dockerfiles/proxy-mysql/alpine/Dockerfile delete mode 120000 Dockerfiles/proxy-mysql/alpine/README.md delete mode 120000 Dockerfiles/proxy-mysql/alpine/build.sh delete mode 100644 Dockerfiles/proxy-mysql/centos/.dockerignore delete mode 100644 Dockerfiles/proxy-mysql/centos/Dockerfile delete mode 120000 Dockerfiles/proxy-mysql/centos/README.md delete mode 120000 Dockerfiles/proxy-mysql/centos/build.sh delete mode 100644 Dockerfiles/proxy-mysql/ol/.dockerignore delete mode 100644 Dockerfiles/proxy-mysql/ol/Dockerfile delete mode 120000 Dockerfiles/proxy-mysql/ol/README.md delete mode 120000 Dockerfiles/proxy-mysql/ol/build.sh delete mode 100644 Dockerfiles/proxy-mysql/rhel/.dockerignore delete mode 100644 Dockerfiles/proxy-mysql/rhel/Dockerfile delete mode 100644 Dockerfiles/proxy-mysql/rhel/README.html delete mode 120000 Dockerfiles/proxy-mysql/rhel/build.sh delete mode 100644 Dockerfiles/proxy-mysql/rhel/licenses/AGPL-v3.0.txt delete mode 100644 Dockerfiles/proxy-mysql/ubuntu/.dockerignore delete mode 100644 Dockerfiles/proxy-mysql/ubuntu/Dockerfile delete mode 120000 Dockerfiles/proxy-mysql/ubuntu/README.md delete mode 120000 Dockerfiles/proxy-mysql/ubuntu/build.sh delete mode 100644 Dockerfiles/proxy-sqlite3/README.md delete mode 100644 Dockerfiles/proxy-sqlite3/alpine/.dockerignore delete mode 100644 Dockerfiles/proxy-sqlite3/alpine/Dockerfile delete mode 120000 Dockerfiles/proxy-sqlite3/alpine/README.md delete mode 120000 Dockerfiles/proxy-sqlite3/alpine/build.sh delete mode 100644 Dockerfiles/proxy-sqlite3/centos/.dockerignore delete mode 100644 Dockerfiles/proxy-sqlite3/centos/Dockerfile delete mode 120000 Dockerfiles/proxy-sqlite3/centos/README.md delete mode 120000 Dockerfiles/proxy-sqlite3/centos/build.sh delete mode 100644 Dockerfiles/proxy-sqlite3/ol/.dockerignore delete mode 100644 Dockerfiles/proxy-sqlite3/ol/Dockerfile delete mode 120000 Dockerfiles/proxy-sqlite3/ol/README.md delete mode 120000 Dockerfiles/proxy-sqlite3/ol/build.sh delete mode 100644 Dockerfiles/proxy-sqlite3/rhel/.dockerignore delete mode 100644 Dockerfiles/proxy-sqlite3/rhel/Dockerfile delete mode 100644 Dockerfiles/proxy-sqlite3/rhel/README.html delete mode 120000 Dockerfiles/proxy-sqlite3/rhel/build.sh delete mode 100644 Dockerfiles/proxy-sqlite3/rhel/licenses/AGPL-v3.0.txt delete mode 100644 Dockerfiles/proxy-sqlite3/ubuntu/.dockerignore delete mode 100644 Dockerfiles/proxy-sqlite3/ubuntu/Dockerfile delete mode 120000 Dockerfiles/proxy-sqlite3/ubuntu/README.md delete mode 120000 Dockerfiles/proxy-sqlite3/ubuntu/build.sh delete mode 100644 Dockerfiles/server-mysql/README.md delete mode 100644 Dockerfiles/server-mysql/alpine/.dockerignore delete mode 100644 Dockerfiles/server-mysql/alpine/Dockerfile delete mode 120000 Dockerfiles/server-mysql/alpine/README.md delete mode 120000 Dockerfiles/server-mysql/alpine/build.sh delete mode 100644 Dockerfiles/server-mysql/centos/.dockerignore delete mode 100644 Dockerfiles/server-mysql/centos/Dockerfile delete mode 120000 Dockerfiles/server-mysql/centos/README.md delete mode 120000 Dockerfiles/server-mysql/centos/build.sh delete mode 100644 Dockerfiles/server-mysql/ol/.dockerignore delete mode 100644 Dockerfiles/server-mysql/ol/Dockerfile delete mode 120000 Dockerfiles/server-mysql/ol/README.md delete mode 120000 Dockerfiles/server-mysql/ol/build.sh delete mode 100644 Dockerfiles/server-mysql/rhel/.dockerignore delete mode 100644 Dockerfiles/server-mysql/rhel/Dockerfile delete mode 100644 Dockerfiles/server-mysql/rhel/README.html delete mode 120000 Dockerfiles/server-mysql/rhel/build.sh delete mode 100644 Dockerfiles/server-mysql/rhel/licenses/AGPL-v3.0.txt delete mode 100644 Dockerfiles/server-mysql/ubuntu/.dockerignore delete mode 100644 Dockerfiles/server-mysql/ubuntu/Dockerfile delete mode 120000 Dockerfiles/server-mysql/ubuntu/README.md delete mode 120000 Dockerfiles/server-mysql/ubuntu/build.sh delete mode 100644 Dockerfiles/server-pgsql/README.md delete mode 100644 Dockerfiles/server-pgsql/alpine/.dockerignore delete mode 100644 Dockerfiles/server-pgsql/alpine/Dockerfile delete mode 120000 Dockerfiles/server-pgsql/alpine/README.md delete mode 120000 Dockerfiles/server-pgsql/alpine/build.sh delete mode 100644 Dockerfiles/server-pgsql/centos/.dockerignore delete mode 100644 Dockerfiles/server-pgsql/centos/Dockerfile delete mode 120000 Dockerfiles/server-pgsql/centos/README.md delete mode 120000 Dockerfiles/server-pgsql/centos/build.sh delete mode 100644 Dockerfiles/server-pgsql/ol/.dockerignore delete mode 100644 Dockerfiles/server-pgsql/ol/Dockerfile delete mode 120000 Dockerfiles/server-pgsql/ol/README.md delete mode 120000 Dockerfiles/server-pgsql/ol/build.sh delete mode 100644 Dockerfiles/server-pgsql/rhel/.dockerignore delete mode 100644 Dockerfiles/server-pgsql/rhel/Dockerfile delete mode 100644 Dockerfiles/server-pgsql/rhel/README.html delete mode 120000 Dockerfiles/server-pgsql/rhel/build.sh delete mode 100644 Dockerfiles/server-pgsql/rhel/licenses/AGPL-v3.0.txt delete mode 100644 Dockerfiles/server-pgsql/ubuntu/.dockerignore delete mode 100644 Dockerfiles/server-pgsql/ubuntu/Dockerfile delete mode 120000 Dockerfiles/server-pgsql/ubuntu/README.md delete mode 120000 Dockerfiles/server-pgsql/ubuntu/build.sh delete mode 100644 Dockerfiles/snmptraps/README.md delete mode 100644 Dockerfiles/snmptraps/alpine/.dockerignore delete mode 100644 Dockerfiles/snmptraps/alpine/Dockerfile delete mode 120000 Dockerfiles/snmptraps/alpine/README.md delete mode 120000 Dockerfiles/snmptraps/alpine/build.sh delete mode 100644 Dockerfiles/snmptraps/centos/.dockerignore delete mode 100644 Dockerfiles/snmptraps/centos/Dockerfile delete mode 120000 Dockerfiles/snmptraps/centos/README.md delete mode 120000 Dockerfiles/snmptraps/centos/build.sh delete mode 100644 Dockerfiles/snmptraps/ol/.dockerignore delete mode 100644 Dockerfiles/snmptraps/ol/Dockerfile delete mode 120000 Dockerfiles/snmptraps/ol/README.md delete mode 120000 Dockerfiles/snmptraps/ol/build.sh delete mode 100644 Dockerfiles/snmptraps/rhel/.dockerignore delete mode 100644 Dockerfiles/snmptraps/rhel/Dockerfile delete mode 100644 Dockerfiles/snmptraps/rhel/README.html delete mode 120000 Dockerfiles/snmptraps/rhel/build.sh delete mode 100644 Dockerfiles/snmptraps/rhel/licenses/AGPL-v3.0.txt delete mode 100644 Dockerfiles/snmptraps/ubuntu/.dockerignore delete mode 100644 Dockerfiles/snmptraps/ubuntu/Dockerfile delete mode 120000 Dockerfiles/snmptraps/ubuntu/README.md delete mode 120000 Dockerfiles/snmptraps/ubuntu/build.sh delete mode 100644 Dockerfiles/web-apache-mysql/README.md delete mode 100644 Dockerfiles/web-apache-mysql/alpine/.dockerignore delete mode 100644 Dockerfiles/web-apache-mysql/alpine/Dockerfile delete mode 120000 Dockerfiles/web-apache-mysql/alpine/README.md delete mode 120000 Dockerfiles/web-apache-mysql/alpine/build.sh delete mode 100644 Dockerfiles/web-apache-mysql/alpine/conf/etc/apache2/conf.d/mime.conf delete mode 100644 Dockerfiles/web-apache-mysql/alpine/conf/etc/apache2/conf.d/server-common.inc delete mode 100644 Dockerfiles/web-apache-mysql/alpine/conf/etc/apache2/httpd.conf delete mode 100644 Dockerfiles/web-apache-mysql/alpine/conf/etc/apache2/includes.conf delete mode 100644 Dockerfiles/web-apache-mysql/alpine/conf/etc/apache2/modules.conf delete mode 100644 Dockerfiles/web-apache-mysql/alpine/conf/etc/php85/php-fpm.conf delete mode 100644 Dockerfiles/web-apache-mysql/alpine/conf/etc/php85/php-fpm.d/zabbix.conf delete mode 100644 Dockerfiles/web-apache-mysql/alpine/conf/etc/zabbix/apache.conf delete mode 100644 Dockerfiles/web-apache-mysql/alpine/conf/etc/zabbix/apache_ssl.conf delete mode 100644 Dockerfiles/web-apache-mysql/centos/.dockerignore delete mode 100644 Dockerfiles/web-apache-mysql/centos/Dockerfile delete mode 120000 Dockerfiles/web-apache-mysql/centos/README.md delete mode 120000 Dockerfiles/web-apache-mysql/centos/build.sh delete mode 100644 Dockerfiles/web-apache-mysql/centos/conf/etc/httpd/conf.d/mime.conf delete mode 100644 Dockerfiles/web-apache-mysql/centos/conf/etc/httpd/conf.d/server-common.inc delete mode 100644 Dockerfiles/web-apache-mysql/centos/conf/etc/httpd/conf/httpd.conf delete mode 100644 Dockerfiles/web-apache-mysql/centos/conf/etc/httpd/includes.conf delete mode 100644 Dockerfiles/web-apache-mysql/centos/conf/etc/httpd/modules.conf delete mode 100644 Dockerfiles/web-apache-mysql/centos/conf/etc/php-fpm.conf delete mode 100644 Dockerfiles/web-apache-mysql/centos/conf/etc/php-fpm.d/zabbix.conf delete mode 100644 Dockerfiles/web-apache-mysql/centos/conf/etc/zabbix/apache.conf delete mode 100644 Dockerfiles/web-apache-mysql/centos/conf/etc/zabbix/apache_ssl.conf delete mode 100644 Dockerfiles/web-apache-mysql/ol/.dockerignore delete mode 100644 Dockerfiles/web-apache-mysql/ol/Dockerfile delete mode 120000 Dockerfiles/web-apache-mysql/ol/README.md delete mode 120000 Dockerfiles/web-apache-mysql/ol/build.sh delete mode 100644 Dockerfiles/web-apache-mysql/ol/conf/etc/httpd/conf.d/mime.conf delete mode 100644 Dockerfiles/web-apache-mysql/ol/conf/etc/httpd/conf.d/server-common.inc delete mode 100644 Dockerfiles/web-apache-mysql/ol/conf/etc/httpd/conf/httpd.conf delete mode 100644 Dockerfiles/web-apache-mysql/ol/conf/etc/httpd/includes.conf delete mode 100644 Dockerfiles/web-apache-mysql/ol/conf/etc/httpd/modules.conf delete mode 100644 Dockerfiles/web-apache-mysql/ol/conf/etc/php-fpm.conf delete mode 100644 Dockerfiles/web-apache-mysql/ol/conf/etc/php-fpm.d/zabbix.conf delete mode 100644 Dockerfiles/web-apache-mysql/ol/conf/etc/zabbix/apache.conf delete mode 100644 Dockerfiles/web-apache-mysql/ol/conf/etc/zabbix/apache_ssl.conf delete mode 100644 Dockerfiles/web-apache-mysql/ubuntu/.dockerignore delete mode 100644 Dockerfiles/web-apache-mysql/ubuntu/Dockerfile delete mode 120000 Dockerfiles/web-apache-mysql/ubuntu/README.md delete mode 120000 Dockerfiles/web-apache-mysql/ubuntu/build.sh delete mode 100644 Dockerfiles/web-apache-mysql/ubuntu/conf/etc/apache2/apache2.conf delete mode 100644 Dockerfiles/web-apache-mysql/ubuntu/conf/etc/apache2/includes.conf delete mode 100644 Dockerfiles/web-apache-mysql/ubuntu/conf/etc/apache2/modules.conf delete mode 100644 Dockerfiles/web-apache-mysql/ubuntu/conf/etc/apache2/sites-enabled/server-common.inc delete mode 100644 Dockerfiles/web-apache-mysql/ubuntu/conf/etc/php/8.5/fpm/php-fpm.conf delete mode 100644 Dockerfiles/web-apache-mysql/ubuntu/conf/etc/php/8.5/fpm/pool.d/zabbix.conf delete mode 100644 Dockerfiles/web-apache-mysql/ubuntu/conf/etc/zabbix/apache.conf delete mode 100644 Dockerfiles/web-apache-mysql/ubuntu/conf/etc/zabbix/apache_ssl.conf delete mode 100644 Dockerfiles/web-apache-pgsql/README.md delete mode 100644 Dockerfiles/web-apache-pgsql/alpine/.dockerignore delete mode 100644 Dockerfiles/web-apache-pgsql/alpine/Dockerfile delete mode 120000 Dockerfiles/web-apache-pgsql/alpine/README.md delete mode 120000 Dockerfiles/web-apache-pgsql/alpine/build.sh delete mode 100644 Dockerfiles/web-apache-pgsql/alpine/conf/etc/apache2/conf.d/mime.conf delete mode 100644 Dockerfiles/web-apache-pgsql/alpine/conf/etc/apache2/conf.d/server-common.inc delete mode 100644 Dockerfiles/web-apache-pgsql/alpine/conf/etc/apache2/httpd.conf delete mode 100644 Dockerfiles/web-apache-pgsql/alpine/conf/etc/apache2/includes.conf delete mode 100644 Dockerfiles/web-apache-pgsql/alpine/conf/etc/apache2/modules.conf delete mode 100644 Dockerfiles/web-apache-pgsql/alpine/conf/etc/php85/php-fpm.conf delete mode 100644 Dockerfiles/web-apache-pgsql/alpine/conf/etc/php85/php-fpm.d/zabbix.conf delete mode 100644 Dockerfiles/web-apache-pgsql/alpine/conf/etc/zabbix/apache.conf delete mode 100644 Dockerfiles/web-apache-pgsql/alpine/conf/etc/zabbix/apache_ssl.conf delete mode 100644 Dockerfiles/web-apache-pgsql/centos/.dockerignore delete mode 100644 Dockerfiles/web-apache-pgsql/centos/Dockerfile delete mode 120000 Dockerfiles/web-apache-pgsql/centos/README.md delete mode 120000 Dockerfiles/web-apache-pgsql/centos/build.sh delete mode 100644 Dockerfiles/web-apache-pgsql/centos/conf/etc/httpd/conf.d/mime.conf delete mode 100644 Dockerfiles/web-apache-pgsql/centos/conf/etc/httpd/conf.d/server-common.inc delete mode 100644 Dockerfiles/web-apache-pgsql/centos/conf/etc/httpd/conf/httpd.conf delete mode 100644 Dockerfiles/web-apache-pgsql/centos/conf/etc/httpd/includes.conf delete mode 100644 Dockerfiles/web-apache-pgsql/centos/conf/etc/httpd/modules.conf delete mode 100644 Dockerfiles/web-apache-pgsql/centos/conf/etc/php-fpm.conf delete mode 100644 Dockerfiles/web-apache-pgsql/centos/conf/etc/php-fpm.d/zabbix.conf delete mode 100644 Dockerfiles/web-apache-pgsql/centos/conf/etc/zabbix/apache.conf delete mode 100644 Dockerfiles/web-apache-pgsql/centos/conf/etc/zabbix/apache_ssl.conf delete mode 100644 Dockerfiles/web-apache-pgsql/ol/.dockerignore delete mode 100644 Dockerfiles/web-apache-pgsql/ol/Dockerfile delete mode 120000 Dockerfiles/web-apache-pgsql/ol/README.md delete mode 120000 Dockerfiles/web-apache-pgsql/ol/build.sh delete mode 100644 Dockerfiles/web-apache-pgsql/ol/conf/etc/httpd/conf.d/mime.conf delete mode 100644 Dockerfiles/web-apache-pgsql/ol/conf/etc/httpd/conf.d/server-common.inc delete mode 100644 Dockerfiles/web-apache-pgsql/ol/conf/etc/httpd/conf/httpd.conf delete mode 100644 Dockerfiles/web-apache-pgsql/ol/conf/etc/httpd/includes.conf delete mode 100644 Dockerfiles/web-apache-pgsql/ol/conf/etc/httpd/modules.conf delete mode 100644 Dockerfiles/web-apache-pgsql/ol/conf/etc/php-fpm.conf delete mode 100644 Dockerfiles/web-apache-pgsql/ol/conf/etc/php-fpm.d/zabbix.conf delete mode 100644 Dockerfiles/web-apache-pgsql/ol/conf/etc/zabbix/apache.conf delete mode 100644 Dockerfiles/web-apache-pgsql/ol/conf/etc/zabbix/apache_ssl.conf delete mode 100644 Dockerfiles/web-apache-pgsql/ubuntu/.dockerignore delete mode 100644 Dockerfiles/web-apache-pgsql/ubuntu/Dockerfile delete mode 120000 Dockerfiles/web-apache-pgsql/ubuntu/README.md delete mode 120000 Dockerfiles/web-apache-pgsql/ubuntu/build.sh delete mode 100644 Dockerfiles/web-apache-pgsql/ubuntu/conf/etc/apache2/apache2.conf delete mode 100644 Dockerfiles/web-apache-pgsql/ubuntu/conf/etc/apache2/includes.conf delete mode 100644 Dockerfiles/web-apache-pgsql/ubuntu/conf/etc/apache2/modules.conf delete mode 100644 Dockerfiles/web-apache-pgsql/ubuntu/conf/etc/apache2/sites-enabled/server-common.inc delete mode 100644 Dockerfiles/web-apache-pgsql/ubuntu/conf/etc/php/8.5/fpm/php-fpm.conf delete mode 100644 Dockerfiles/web-apache-pgsql/ubuntu/conf/etc/php/8.5/fpm/pool.d/zabbix.conf delete mode 100644 Dockerfiles/web-apache-pgsql/ubuntu/conf/etc/zabbix/apache.conf delete mode 100644 Dockerfiles/web-apache-pgsql/ubuntu/conf/etc/zabbix/apache_ssl.conf delete mode 100644 Dockerfiles/web-nginx-mysql/README.md delete mode 100644 Dockerfiles/web-nginx-mysql/alpine/.dockerignore delete mode 100644 Dockerfiles/web-nginx-mysql/alpine/Dockerfile delete mode 120000 Dockerfiles/web-nginx-mysql/alpine/README.md delete mode 120000 Dockerfiles/web-nginx-mysql/alpine/build.sh delete mode 100644 Dockerfiles/web-nginx-mysql/alpine/conf/etc/nginx/includes/server-common.conf delete mode 100644 Dockerfiles/web-nginx-mysql/alpine/conf/etc/nginx/includes/server-ssl.conf delete mode 100644 Dockerfiles/web-nginx-mysql/alpine/conf/etc/nginx/nginx.conf delete mode 100644 Dockerfiles/web-nginx-mysql/alpine/conf/etc/php85/php-fpm.conf delete mode 100644 Dockerfiles/web-nginx-mysql/alpine/conf/etc/php85/php-fpm.d/zabbix.conf delete mode 100644 Dockerfiles/web-nginx-mysql/alpine/conf/etc/zabbix/nginx.conf delete mode 100644 Dockerfiles/web-nginx-mysql/alpine/conf/etc/zabbix/nginx_ssl.conf delete mode 100644 Dockerfiles/web-nginx-mysql/centos/.dockerignore delete mode 100644 Dockerfiles/web-nginx-mysql/centos/Dockerfile delete mode 120000 Dockerfiles/web-nginx-mysql/centos/README.md delete mode 120000 Dockerfiles/web-nginx-mysql/centos/build.sh delete mode 100644 Dockerfiles/web-nginx-mysql/centos/conf/etc/nginx/includes/server-common.conf delete mode 100644 Dockerfiles/web-nginx-mysql/centos/conf/etc/nginx/includes/server-ssl.conf delete mode 100644 Dockerfiles/web-nginx-mysql/centos/conf/etc/nginx/nginx.conf delete mode 100644 Dockerfiles/web-nginx-mysql/centos/conf/etc/php-fpm.conf delete mode 100644 Dockerfiles/web-nginx-mysql/centos/conf/etc/php-fpm.d/zabbix.conf delete mode 100644 Dockerfiles/web-nginx-mysql/centos/conf/etc/zabbix/nginx.conf delete mode 100644 Dockerfiles/web-nginx-mysql/centos/conf/etc/zabbix/nginx_ssl.conf delete mode 100644 Dockerfiles/web-nginx-mysql/ol/.dockerignore delete mode 100644 Dockerfiles/web-nginx-mysql/ol/Dockerfile delete mode 120000 Dockerfiles/web-nginx-mysql/ol/README.md delete mode 120000 Dockerfiles/web-nginx-mysql/ol/build.sh delete mode 100644 Dockerfiles/web-nginx-mysql/ol/conf/etc/nginx/includes/server-common.conf delete mode 100644 Dockerfiles/web-nginx-mysql/ol/conf/etc/nginx/includes/server-ssl.conf delete mode 100644 Dockerfiles/web-nginx-mysql/ol/conf/etc/nginx/nginx.conf delete mode 100644 Dockerfiles/web-nginx-mysql/ol/conf/etc/php-fpm.conf delete mode 100644 Dockerfiles/web-nginx-mysql/ol/conf/etc/php-fpm.d/zabbix.conf delete mode 100644 Dockerfiles/web-nginx-mysql/ol/conf/etc/zabbix/nginx.conf delete mode 100644 Dockerfiles/web-nginx-mysql/ol/conf/etc/zabbix/nginx_ssl.conf delete mode 100644 Dockerfiles/web-nginx-mysql/rhel/.dockerignore delete mode 100644 Dockerfiles/web-nginx-mysql/rhel/Dockerfile delete mode 100644 Dockerfiles/web-nginx-mysql/rhel/README.html delete mode 120000 Dockerfiles/web-nginx-mysql/rhel/build.sh delete mode 100644 Dockerfiles/web-nginx-mysql/rhel/conf/etc/nginx/includes/server-common.conf delete mode 100644 Dockerfiles/web-nginx-mysql/rhel/conf/etc/nginx/includes/server-ssl.conf delete mode 100644 Dockerfiles/web-nginx-mysql/rhel/conf/etc/nginx/nginx.conf delete mode 100644 Dockerfiles/web-nginx-mysql/rhel/conf/etc/php-fpm.conf delete mode 100644 Dockerfiles/web-nginx-mysql/rhel/conf/etc/php-fpm.d/zabbix.conf delete mode 100644 Dockerfiles/web-nginx-mysql/rhel/conf/etc/zabbix/nginx.conf delete mode 100644 Dockerfiles/web-nginx-mysql/rhel/conf/etc/zabbix/nginx_ssl.conf delete mode 100644 Dockerfiles/web-nginx-mysql/rhel/licenses/AGPL-v3.0.txt delete mode 100644 Dockerfiles/web-nginx-mysql/ubuntu/.dockerignore delete mode 100644 Dockerfiles/web-nginx-mysql/ubuntu/Dockerfile delete mode 120000 Dockerfiles/web-nginx-mysql/ubuntu/README.md delete mode 120000 Dockerfiles/web-nginx-mysql/ubuntu/build.sh delete mode 100644 Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/nginx/includes/server-common.conf delete mode 100644 Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/nginx/includes/server-ssl.conf delete mode 100644 Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/nginx/nginx.conf delete mode 100644 Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/php/8.5/fpm/php-fpm.conf delete mode 100644 Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/php/8.5/fpm/pool.d/zabbix.conf delete mode 100644 Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/zabbix/nginx.conf delete mode 100644 Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/zabbix/nginx_ssl.conf delete mode 100644 Dockerfiles/web-nginx-pgsql/README.md delete mode 100644 Dockerfiles/web-nginx-pgsql/alpine/.dockerignore delete mode 100644 Dockerfiles/web-nginx-pgsql/alpine/Dockerfile delete mode 120000 Dockerfiles/web-nginx-pgsql/alpine/README.md delete mode 120000 Dockerfiles/web-nginx-pgsql/alpine/build.sh delete mode 100644 Dockerfiles/web-nginx-pgsql/alpine/conf/etc/nginx/includes/server-common.conf delete mode 100644 Dockerfiles/web-nginx-pgsql/alpine/conf/etc/nginx/includes/server-ssl.conf delete mode 100644 Dockerfiles/web-nginx-pgsql/alpine/conf/etc/nginx/nginx.conf delete mode 100644 Dockerfiles/web-nginx-pgsql/alpine/conf/etc/php85/php-fpm.conf delete mode 100644 Dockerfiles/web-nginx-pgsql/alpine/conf/etc/php85/php-fpm.d/zabbix.conf delete mode 100644 Dockerfiles/web-nginx-pgsql/alpine/conf/etc/zabbix/nginx.conf delete mode 100644 Dockerfiles/web-nginx-pgsql/alpine/conf/etc/zabbix/nginx_ssl.conf delete mode 100644 Dockerfiles/web-nginx-pgsql/centos/.dockerignore delete mode 100644 Dockerfiles/web-nginx-pgsql/centos/Dockerfile delete mode 120000 Dockerfiles/web-nginx-pgsql/centos/README.md delete mode 120000 Dockerfiles/web-nginx-pgsql/centos/build.sh delete mode 100644 Dockerfiles/web-nginx-pgsql/centos/conf/etc/nginx/includes/server-common.conf delete mode 100644 Dockerfiles/web-nginx-pgsql/centos/conf/etc/nginx/includes/server-ssl.conf delete mode 100644 Dockerfiles/web-nginx-pgsql/centos/conf/etc/nginx/nginx.conf delete mode 100644 Dockerfiles/web-nginx-pgsql/centos/conf/etc/php-fpm.conf delete mode 100644 Dockerfiles/web-nginx-pgsql/centos/conf/etc/php-fpm.d/zabbix.conf delete mode 100644 Dockerfiles/web-nginx-pgsql/centos/conf/etc/zabbix/nginx.conf delete mode 100644 Dockerfiles/web-nginx-pgsql/centos/conf/etc/zabbix/nginx_ssl.conf delete mode 100644 Dockerfiles/web-nginx-pgsql/ol/.dockerignore delete mode 100644 Dockerfiles/web-nginx-pgsql/ol/Dockerfile delete mode 120000 Dockerfiles/web-nginx-pgsql/ol/README.md delete mode 120000 Dockerfiles/web-nginx-pgsql/ol/build.sh delete mode 100644 Dockerfiles/web-nginx-pgsql/ol/conf/etc/nginx/includes/server-common.conf delete mode 100644 Dockerfiles/web-nginx-pgsql/ol/conf/etc/nginx/includes/server-ssl.conf delete mode 100644 Dockerfiles/web-nginx-pgsql/ol/conf/etc/nginx/nginx.conf delete mode 100644 Dockerfiles/web-nginx-pgsql/ol/conf/etc/php-fpm.conf delete mode 100644 Dockerfiles/web-nginx-pgsql/ol/conf/etc/php-fpm.d/zabbix.conf delete mode 100644 Dockerfiles/web-nginx-pgsql/ol/conf/etc/zabbix/nginx.conf delete mode 100644 Dockerfiles/web-nginx-pgsql/ol/conf/etc/zabbix/nginx_ssl.conf delete mode 100644 Dockerfiles/web-nginx-pgsql/rhel/.dockerignore delete mode 100644 Dockerfiles/web-nginx-pgsql/rhel/Dockerfile delete mode 100644 Dockerfiles/web-nginx-pgsql/rhel/README.html delete mode 120000 Dockerfiles/web-nginx-pgsql/rhel/build.sh delete mode 100644 Dockerfiles/web-nginx-pgsql/rhel/conf/etc/nginx/includes/server-common.conf delete mode 100644 Dockerfiles/web-nginx-pgsql/rhel/conf/etc/nginx/includes/server-ssl.conf delete mode 100644 Dockerfiles/web-nginx-pgsql/rhel/conf/etc/nginx/nginx.conf delete mode 100644 Dockerfiles/web-nginx-pgsql/rhel/conf/etc/php-fpm.conf delete mode 100644 Dockerfiles/web-nginx-pgsql/rhel/conf/etc/php-fpm.d/zabbix.conf delete mode 100644 Dockerfiles/web-nginx-pgsql/rhel/conf/etc/zabbix/nginx.conf delete mode 100644 Dockerfiles/web-nginx-pgsql/rhel/conf/etc/zabbix/nginx_ssl.conf delete mode 100644 Dockerfiles/web-nginx-pgsql/rhel/licenses/AGPL-v3.0.txt delete mode 100644 Dockerfiles/web-nginx-pgsql/ubuntu/.dockerignore delete mode 100644 Dockerfiles/web-nginx-pgsql/ubuntu/Dockerfile delete mode 120000 Dockerfiles/web-nginx-pgsql/ubuntu/README.md delete mode 120000 Dockerfiles/web-nginx-pgsql/ubuntu/build.sh delete mode 100644 Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/nginx/includes/server-common.conf delete mode 100644 Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/nginx/includes/server-ssl.conf delete mode 100644 Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/nginx/nginx.conf delete mode 100644 Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/php/8.5/fpm/php-fpm.conf delete mode 100644 Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/php/8.5/fpm/pool.d/zabbix.conf delete mode 100644 Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/zabbix/nginx.conf delete mode 100644 Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/zabbix/nginx_ssl.conf delete mode 100644 Dockerfiles/web-service/README.md delete mode 100644 Dockerfiles/web-service/alpine/.dockerignore delete mode 100644 Dockerfiles/web-service/alpine/Dockerfile delete mode 120000 Dockerfiles/web-service/alpine/README.md delete mode 120000 Dockerfiles/web-service/alpine/build.sh delete mode 100644 Dockerfiles/web-service/centos/.dockerignore delete mode 100644 Dockerfiles/web-service/centos/Dockerfile delete mode 120000 Dockerfiles/web-service/centos/README.md delete mode 120000 Dockerfiles/web-service/centos/build.sh delete mode 100644 Dockerfiles/web-service/ol/.dockerignore delete mode 100644 Dockerfiles/web-service/ol/Dockerfile delete mode 120000 Dockerfiles/web-service/ol/README.md delete mode 120000 Dockerfiles/web-service/ol/build.sh delete mode 100644 Dockerfiles/web-service/rhel/.dockerignore delete mode 100644 Dockerfiles/web-service/rhel/Dockerfile delete mode 100644 Dockerfiles/web-service/rhel/README.html delete mode 120000 Dockerfiles/web-service/rhel/build.sh delete mode 100644 Dockerfiles/web-service/rhel/licenses/AGPL-v3.0.txt delete mode 100644 Dockerfiles/web-service/ubuntu/.dockerignore delete mode 100644 Dockerfiles/web-service/ubuntu/Dockerfile delete mode 120000 Dockerfiles/web-service/ubuntu/README.md delete mode 120000 Dockerfiles/web-service/ubuntu/build.sh delete mode 100644 Dockerfiles/web-service/ubuntu/conf/etc/apt/preferences.d/chromium.pref delete mode 100644 Dockerfiles/web-service/ubuntu/conf/etc/apt/sources.list.d/debian.sources diff --git a/Dockerfiles/agent/README.md b/Dockerfiles/agent/README.md deleted file mode 100644 index 07d1e728..00000000 --- a/Dockerfiles/agent/README.md +++ /dev/null @@ -1,243 +0,0 @@ -![logo](https://assets.zabbix.com/img/logo/zabbix_logo_500x131.png) - -# What is Zabbix? - -Zabbix is an enterprise-class open source distributed monitoring solution. - -Zabbix is software that monitors numerous parameters of a network and the health and integrity of servers. Zabbix uses a flexible notification mechanism that allows users to configure e-mail based alerts for virtually any event. This allows a fast reaction to server problems. Zabbix offers excellent reporting and data visualisation features based on the stored data. This makes Zabbix ideal for capacity planning. - -For more information and related downloads for Zabbix components, please visit https://hub.docker.com/u/zabbix/ and https://zabbix.com - -# What is Zabbix agent? - -Zabbix agent is deployed on a monitoring target to actively monitor local resources and applications (hard drives, memory, processor statistics etc). - -# Zabbix agent images - -These are the only official Zabbix agent Docker images. They are based on Alpine Linux v3.24, Ubuntu 26.04 (resolute), CentOS Stream 10, Oracle Linux 10, Windows 10 LTSC 2019 and Windows 11 LTSC 2022 images. The available versions of Zabbix agent are: - - Zabbix agent 6.0 (tags: alpine-6.0-latest, ubuntu-6.0-latest, ol-6.0-latest) - Zabbix agent 6.0.* (tags: alpine-6.0.*, ubuntu-6.0.*, ol-6.0.*, ltsc2019-6.0.*, ltsc2022-6.0.*) - Zabbix agent 7.0 (tags: alpine-7.0-latest, ubuntu-7.0-latest, ol-7.0-latest) - Zabbix agent 7.0.* (tags: alpine-7.0.*, ubuntu-7.0.*, ol-7.0.*, ltsc2019-7.0.*, ltsc2022-7.0.*) - Zabbix agent 7.2 (tags: alpine-7.2-latest, ubuntu-7.2-latest, ol-7.2-latest) - Zabbix agent 7.2.* (tags: alpine-7.2.*, ubuntu-7.2.*, ol-7.2.*, ltsc2019-7.2.*, ltsc2022-7.2.*) - Zabbix agent 7.4 (tags: alpine-7.4-latest, ubuntu-7.4-latest, ol-7.4-latest, alpine-latest, ubuntu-latest, ol-latest, ltsc2019-latest, ltsc2022-latest, latest) - Zabbix agent 7.4.* (tags: alpine-7.4.*, ubuntu-7.4.*, ol-7.4.*, ltsc2019-7.4.*, ltsc2022-7.4.*) - Zabbix agent 8.0 (tags: alpine-trunk, ubuntu-trunk, ol-trunk, ltsc2019-trunk, ltsc2022-trunk) - -Images are updated when new releases are published. The image with ``latest`` tag is based on Alpine Linux. - -# How to use this image - -## Start `zabbix-agent` - -Start a Zabbix agent container as follows: - - docker run --name some-zabbix-agent -e ZBX_HOSTNAME="some-hostname" -e ZBX_SERVER_HOST="some-zabbix-server" --init -d zabbix/zabbix-agent:tag - -Where `some-zabbix-agent` is the name you want to assign to your container, `some-hostname` is the hostname, it is Hostname parameter in Zabbix agent configuration file, `some-zabbix-server` is IP or DNS name of Zabbix server or proxy and `tag` is the tag specifying the version you want. See the list above for relevant tags, or look at the [full list of tags](https://hub.docker.com/r/zabbix/zabbix-agent/tags/). - -## Connects from Zabbix server or Zabbix proxy in other containers (Passive checks) - -This image exposes the standard Zabbix agent port (``10050``) to perform passive checks, so container linking makes Zabbix agent instance available to Zabbix server and Zabbix proxy containers. Start your application container like this in order to link it to the Zabbix agent container: - -```console -$ docker run --name some-zabbix-server --link some-zabbix-agent:zabbix-agent --init -d zabbix/zabbix-server:latest -``` - -## Connect to Zabbix server or Zabbix proxy containers (Active checks) - -This image supports perform active checks, so container linking makes Zabbix server and Zabbix proxy containers available to Zabbix agent instance. Start your application container like this in order to link Zabbix agent to Zabbix server or Zabbix proxy containers: - -```console -$ docker run --name some-zabbix-agent --link some-zabbix-server:zabbix-server --init -d zabbix/zabbix-agent:latest -``` - -## Container shell access and viewing Zabbix agent logs - -The `docker exec` command allows you to run commands inside a Docker container. The following command line will give you a bash shell inside your `zabbix-agent` container: - -```console -$ docker exec -ti some-zabbix-agent /bin/bash -``` - -The Zabbix agent log is available through Docker's container log: - -```console -$ docker logs some-zabbix-agent -``` - -## Privileged mode - -By default, Docker containers are "unprivileged" and do not have access to the most of host resources. Zabbix agent is designed to monitor system resources, to do that Zabbix agent container must be privileged or you may mount some system-wide volumes. For example: - -```console -$ docker run --name some-zabbix-agent --link some-zabbix-server:zabbix-server --privileged --init -d zabbix/zabbix-agent:latest -``` -```console -$ docker run --name some-zabbix-agent --link some-zabbix-server:zabbix-server -v /dev/sdc:/dev/sdc --init -d zabbix/zabbix-agent:latest -``` - -## Environment Variables - -When you start the `zabbix-agent` image, you can adjust the configuration of the Zabbix agent by passing one or more environment variables on the `docker run` command line. - -### `ZBX_HOSTNAME` - -This variable is unique, case sensitive hostname. By default, value is `hostname` of the container. It is ``Hostname`` parameter in ``zabbix_agentd.conf``. - -### `ZBX_SERVER_HOST` - -This variable is IP or DNS name of Zabbix server or Zabbix proxy. By default, value is `zabbix-server`. It is ``Server`` parameter in ``zabbix_agentd.conf``. It is allowed to specify Zabbix server or Zabbix proxy port number using ``ZBX_SERVER_PORT`` variable. It make sense in case of non-default port for active checks. - -### `ZBX_PASSIVE_ALLOW` - -This variable is boolean (``true`` or ``false``) and enables or disables feature of passive checks. By default, value is `true`. - -### `ZBX_PASSIVESERVERS` - -The variable is comma separated list of allowed Zabbix server or proxy hosts for connections to Zabbix agent container. - -### `ZBX_ACTIVE_ALLOW` - -This variable is boolean (``true`` or ``false``) and enables or disables feature of active checks. By default, value is `true`. - -### `ZBX_ACTIVESERVERS` - -The variable is comma separated list of allowed Zabbix server or proxy hosts for connections to Zabbix agent container. You may specify port of Zabbix server or Zabbix proxy in such syntax: ``zabbix-server:10061,zabbix-proxy:10072``. - -### `ZBX_LOADMODULE` - -The variable is list of comma separated loadable Zabbix modules. It works with volume ``/var/lib/zabbix/modules``. The syntax of the variable is ``dummy1.so,dummy2.so``. - -### `ZBX_DEBUGLEVEL` - -The variable is used to specify debug level. By default, value is ``3``. It is ``DebugLevel`` parameter in ``zabbix_agentd.conf``. Allowed values are listed below: -- ``0`` - basic information about starting and stopping of Zabbix processes; -- ``1`` - critical information -- ``2`` - error information -- ``3`` - warnings -- ``4`` - for debugging (produces lots of information) -- ``5`` - extended debugging (produces even more information) - -### `ZBX_TIMEOUT` - -The variable is used to specify timeout for processing checks. By default, value is ``3``. - -### Other variables - -Additionally the image allows to specify many other environment variables listed below: - -``` -ZBX_SOURCEIP= -ZBX_ENABLEREMOTECOMMANDS=0 # Deprecated since 5.0.0 -ZBX_LOGREMOTECOMMANDS=0 -ZBX_HEARTBEAT_FREQUENCY=60 # Available since 6.2.0 -ZBX_HOSTINTERFACE= # Available since 4.4.0 -ZBX_HOSTINTERFACEITEM= # Available since 4.4.0 -ZBX_STARTAGENTS=10 -ZBX_HOSTNAMEITEM=system.hostname -ZBX_METADATA= -ZBX_METADATAITEM= -ZBX_REFRESHACTIVECHECKS=5 -ZBX_BUFFERSEND=5 -ZBX_BUFFERSIZE=100 -ZBX_MAXLINESPERSECOND=20 -ZBX_LISTENIP= -ZBX_LISTENPORT=10050 -ZBX_LISTENBACKLOG= -ZBX_UNSAFEUSERPARAMETERS=0 -ZBX_TLSCONNECT=unencrypted -ZBX_TLSACCEPT=unencrypted -ZBX_TLSCAFILE= -ZBX_TLSCA= -ZBX_TLSCRLFILE= -ZBX_TLSCRL= -ZBX_TLSSERVERCERTISSUER= -ZBX_TLSSERVERCERTSUBJECT= -ZBX_TLSCERTFILE= -ZBX_TLSCERT= -ZBX_TLSKEYFILE= -ZBX_TLSKEY= -ZBX_TLSPSKIDENTITY= -ZBX_TLSPSKFILE= -ZBX_TLSPSK= -ZBX_TLSCIPHERALL= # Available since 4.4.7 -ZBX_TLSCIPHERALL13= # Available since 4.4.7 -ZBX_TLSCIPHERCERT= # Available since 4.4.7 -ZBX_TLSCIPHERCERT13= # Available since 4.4.7 -ZBX_TLSCIPHERPSK= # Available since 4.4.7 -ZBX_TLSCIPHERPSK13= # Available since 4.4.7 -ZBX_DENYKEY=system.run[*] # Available since 5.0.0 -ZBX_ALLOWKEY= # Available since 5.0.0 -``` - -Default values of these variables are specified after equal sign. - -The allowed variables are identical of parameters in official ``zabbix_agentd.conf`` configuration file. For example, ``ZBX_REFRESHACTIVECHECKS`` = ``RefreshActiveChecks``. - -Please use official documentation for [``zabbix_agentd.conf``](https://www.zabbix.com/documentation/current/manual/appendix/config/zabbix_agentd) to get more information about the variables. - -## Allowed volumes for the Zabbix agent container - -### ``/etc/zabbix/zabbix_agentd.d`` - -The volume allows include ``*.conf`` files and extend Zabbix agent using ``UserParameter`` feature. - -### ``/var/lib/zabbix/modules`` - -The volume allows load additional modules and extend Zabbix agent using ``LoadModule`` feature. - -### ``/var/lib/zabbix/enc`` - -The volume is used to store TLS related files. These file names are specified using ``ZBX_TLSCAFILE``, ``ZBX_TLSCRLFILE``, ``ZBX_TLSCERTFILE``, ``ZBX_TLSKEYFILE`` and ``ZBX_TLSPSKFILE`` variables. Additionally it is possible to use environment variables ``ZBX_TLSCA``, ``ZBX_TLSCRL``, ``ZBX_TLSCERT``, ``ZBX_TLSKEY`` and ``ZBX_TLSPSK`` with plaintext values. - -# The image variants - -The `zabbix-agent` images come in many flavors, each designed for a specific use case. - -## `zabbix-agent:alpine-` - -This image is based on the popular [Alpine Linux project](http://alpinelinux.org), available in [the `alpine` official image](https://hub.docker.com/_/alpine). Alpine Linux is much smaller than most distribution base images (~5MB), and thus leads to much slimmer images in general. - -This variant is highly recommended when final image size being as small as possible is desired. The main caveat to note is that it does use [musl libc](http://www.musl-libc.org) instead of [glibc and friends](http://www.etalabs.net/compare_libcs.html), so certain software might run into issues depending on the depth of their libc requirements. However, most software doesn't have an issue with this, so this variant is usually a very safe choice. See [this Hacker News comment thread](https://news.ycombinator.com/item?id=10782897) for more discussion of the issues that might arise and some pro/con comparisons of using Alpine-based images. - -To minimize image size, it's uncommon for additional related tools (such as `git` or `bash`) to be included in Alpine-based images. Using this image as a base, add the things you need in your own Dockerfile (see the [`alpine` image description](https://hub.docker.com/_/alpine/) for examples of how to install packages if you are unfamiliar). - -## `zabbix-agent:ubuntu-` - -This is the defacto image. If you are unsure about what your needs are, you probably want to use this one. It is designed to be used both as a throw away container (mount your source code and start the container to start your app), as well as the base to build other images off of. - -## `zabbix-agent:ol-` - -Oracle Linux is an open-source operating system available under the GNU General Public License (GPLv2). Suitable for general purpose or Oracle workloads, it benefits from rigorous testing of more than 128,000 hours per day with real-world workloads and includes unique innovations such as Ksplice for zero-downtime kernel patching, DTrace for real-time diagnostics, the powerful Btrfs file system, and more. - -# User Feedback - -## Documentation - -Documentation for this image is stored in the [`agent/` directory](https://github.com/zabbix/zabbix-docker/tree/7.4/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.4/README.md) before attempting a pull request. - -## Issues - -If you have any problems with or questions about this image, please contact us through a [GitHub issue](https://github.com/zabbix/zabbix-docker/issues). - -### Known issues - -Currently it is not allowed to specify ``ZBX_ALIAS`` environment variable. Please use ``/etc/zabbix/zabbix_agentd.d`` volume with additional configuration files with ``Alias`` options. - -## Contributing - -You are invited to contribute new features, fixes, or updates, large or small; we are always thrilled to receive pull requests, and do our best to process them as fast as we can. - -Before you start to code, we recommend discussing your plans through a [GitHub issue](https://github.com/zabbix/zabbix-docker/issues), especially for more ambitious contributions. This gives other contributors a chance to point you in the right direction, give you feedback on your design, and help you find out if someone else is working on the same thing. - -## License - -Starting from Zabbix version 7.0, all subsequent Zabbix versions will be released under the GNU Affero General Public License version 3 (AGPLv3). -You can modify the relevant version and propagate such modified version under the terms of the AGPLv3 as published by the Free Software Foundation. -For additional details, including answers to common questions about the AGPLv3, see the generic FAQ from the [Free Software Foundation](http://www.fsf.org/licenses/gpl-faq.html). - -Zabbix is Open Source Software, however, if you use Zabbix in a commercial context we kindly ask you to support the development of Zabbix by purchasing some level of technical support. -All previous Zabbix software versions up to 6.4 are released under the GNU General Public License version 2 (GPLv2). The formal terms of the GPLv2 and AGPLv3 can be found at http://www.fsf.org/licenses/. diff --git a/Dockerfiles/agent/alpine/.dockerignore b/Dockerfiles/agent/alpine/.dockerignore deleted file mode 100644 index 88a84e55..00000000 --- a/Dockerfiles/agent/alpine/.dockerignore +++ /dev/null @@ -1 +0,0 @@ -build.sh diff --git a/Dockerfiles/agent/alpine/Dockerfile b/Dockerfiles/agent/alpine/Dockerfile deleted file mode 100644 index 697d3c51..00000000 --- a/Dockerfiles/agent/alpine/Dockerfile +++ /dev/null @@ -1,102 +0,0 @@ -# syntax=docker/dockerfile:1.6 -ARG OS_BASE_IMAGE=alpine:3.24 -ARG MAJOR_VERSION=7.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.12 -ARG BUILD_BASE_IMAGE=zabbix-build-mysql:alpine-${ZBX_VERSION} - -FROM ${BUILD_BASE_IMAGE} AS builder - -FROM ${OS_BASE_IMAGE} - -ARG MAJOR_VERSION -ARG ZBX_VERSION -ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git - -ENV TERM=xterm \ - ZBX_VERSION=${ZBX_VERSION} \ - ZBX_SOURCES=${ZBX_SOURCES} \ - ZABBIX_USER_HOME_DIR=/var/lib/zabbix \ - ZABBIX_CONF_DIR=/etc/zabbix - -ENV ZBX_LOADMODULEPATH=${ZABBIX_USER_HOME_DIR}/modules \ - ZBX_USERPARAMETERDIR=${ZABBIX_USER_HOME_DIR}/user_scripts - -LABEL org.opencontainers.image.authors="Alexey Pustovalov " \ - org.opencontainers.image.description="Zabbix agent is deployed on a monitoring target to actively monitor local resources and applications" \ - org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ - org.opencontainers.image.licenses="AGPL v3.0" \ - org.opencontainers.image.source="${ZBX_SOURCES}" \ - org.opencontainers.image.title="Zabbix agent" \ - org.opencontainers.image.url="https://zabbix.com/" \ - org.opencontainers.image.vendor="Zabbix SIA" \ - org.opencontainers.image.version="${ZBX_VERSION}" - -STOPSIGNAL SIGTERM - -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/agent/sbin/zabbix_agentd /usr/sbin/ -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/general/bin/zabbix_get /usr/bin/ -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/general/bin/zabbix_sender /usr/bin/ -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/agent/conf/ ${ZABBIX_CONF_DIR}/ - -RUN set -eux && \ - INSTALL_PKGS="bash \ - coreutils \ - tzdata \ - c-ares \ - libcurl \ - libgcc \ - libldap \ - libmodbus \ - pcre2 \ - zlib \ - iputils" && \ - apk add \ - --no-cache \ - --clean-protected \ - ${INSTALL_PKGS} && \ - addgroup \ - --system \ - --gid 1995 \ - zabbix && \ - adduser \ - --system \ - --gecos "Zabbix monitoring system" \ - --disabled-password \ - --uid 1997 \ - --ingroup zabbix \ - --shell /sbin/nologin \ - --home ${ZABBIX_USER_HOME_DIR} \ - zabbix && \ - mkdir -p ${ZABBIX_CONF_DIR} \ - ${ZABBIX_CONF_DIR}/zabbix_agentd.d \ - ${ZABBIX_USER_HOME_DIR} \ - ${ZABBIX_USER_HOME_DIR}/enc \ - ${ZABBIX_USER_HOME_DIR}/enc_internal \ - ${ZABBIX_USER_HOME_DIR}/modules \ - ${ZBX_USERPARAMETERDIR} && \ - FIX_PERM_LIST="\ - ${ZABBIX_CONF_DIR}/zabbix_agentd_modules.conf \ - ${ZABBIX_CONF_DIR}/zabbix_agentd_item_keys.conf \ - ${ZABBIX_CONF_DIR}/zabbix_agentd.d/ \ - ${ZABBIX_USER_HOME_DIR}/" && \ - chown --quiet -R zabbix:0 ${FIX_PERM_LIST} && \ - chmod -R g=u ${FIX_PERM_LIST} && \ - chown --quiet zabbix:0 ${ZABBIX_CONF_DIR}/ && \ - chmod g=u ${ZABBIX_CONF_DIR} && \ - /usr/sbin/zabbix_agentd -V - -RUN --mount=from=entrypoints,target=/tmp/entrypoints,ro \ - set -eux && \ - install -d /usr/lib/docker-entrypoint && \ - install -m 0755 /tmp/entrypoints/agent.sh /usr/bin/docker-entrypoint.sh && \ - install -m 0644 /tmp/entrypoints/lib/*.sh /usr/lib/docker-entrypoint/ - -EXPOSE 10050/tcp - -WORKDIR ${ZABBIX_USER_HOME_DIR} - -USER 1997 - -ENTRYPOINT ["/usr/bin/docker-entrypoint.sh"] - -CMD ["/usr/sbin/zabbix_agentd", "--foreground", "-c", "/etc/zabbix/zabbix_agentd.conf"] diff --git a/Dockerfiles/agent/alpine/README.md b/Dockerfiles/agent/alpine/README.md deleted file mode 120000 index 32d46ee8..00000000 --- a/Dockerfiles/agent/alpine/README.md +++ /dev/null @@ -1 +0,0 @@ -../README.md \ No newline at end of file diff --git a/Dockerfiles/agent/alpine/build.sh b/Dockerfiles/agent/alpine/build.sh deleted file mode 120000 index 46b20313..00000000 --- a/Dockerfiles/agent/alpine/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../../build.sh \ No newline at end of file diff --git a/Dockerfiles/agent/centos/.dockerignore b/Dockerfiles/agent/centos/.dockerignore deleted file mode 100644 index 88a84e55..00000000 --- a/Dockerfiles/agent/centos/.dockerignore +++ /dev/null @@ -1 +0,0 @@ -build.sh diff --git a/Dockerfiles/agent/centos/Dockerfile b/Dockerfiles/agent/centos/Dockerfile deleted file mode 100644 index 8c893311..00000000 --- a/Dockerfiles/agent/centos/Dockerfile +++ /dev/null @@ -1,116 +0,0 @@ -# syntax=docker/dockerfile:1.6 -ARG OS_BASE_IMAGE=quay.io/centos/centos:stream10-minimal -ARG MAJOR_VERSION=7.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.12 -ARG BUILD_BASE_IMAGE=zabbix-build-mysql:centos-${ZBX_VERSION} - -FROM ${BUILD_BASE_IMAGE} AS builder - -FROM ${OS_BASE_IMAGE} - -ARG MAJOR_VERSION -ARG ZBX_VERSION -ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git - -ENV TERM=xterm \ - ZBX_VERSION=${ZBX_VERSION} \ - ZBX_SOURCES=${ZBX_SOURCES} \ - ZABBIX_USER_HOME_DIR=/var/lib/zabbix \ - ZABBIX_CONF_DIR=/etc/zabbix - -ENV ZBX_LOADMODULEPATH="${ZABBIX_USER_HOME_DIR}/modules" \ - ZBX_USERPARAMETERDIR=${ZABBIX_USER_HOME_DIR}/user_scripts - -LABEL org.opencontainers.image.authors="Alexey Pustovalov " \ - org.opencontainers.image.description="Zabbix agent is deployed on a monitoring target to actively monitor local resources and applications" \ - org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ - org.opencontainers.image.licenses="AGPL v3.0" \ - org.opencontainers.image.source="${ZBX_SOURCES}" \ - org.opencontainers.image.title="Zabbix agent" \ - org.opencontainers.image.url="https://zabbix.com/" \ - org.opencontainers.image.vendor="Zabbix SIA" \ - org.opencontainers.image.version="${ZBX_VERSION}" - -STOPSIGNAL SIGTERM - -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/agent/sbin/zabbix_agentd /usr/sbin/ -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/general/bin/zabbix_get /usr/bin/ -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/general/bin/zabbix_sender /usr/bin/ -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/agent/conf/ ${ZABBIX_CONF_DIR}/ - -RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ - --mount=type=tmpfs,target=/var/cache/yum/ \ - set -eux && \ - INSTALL_PKGS="bash \ - shadow-utils \ - c-ares \ - libcurl-minimal \ - libmodbus \ - openldap \ - openssl-libs \ - pcre2 \ - zlib \ - iputils" && \ - microdnf -y install \ - --disablerepo="*" \ - --enablerepo="extras-common" \ - --setopt=install_weak_deps=0 \ - --setopt=keepcache=0 \ - --best \ - --nodocs \ - epel-release && \ - microdnf -y install \ - --disablerepo="*" \ - --enablerepo="baseos" \ - --enablerepo="appstream" \ - --enablerepo="epel" \ - --setopt=install_weak_deps=0 \ - --setopt=keepcache=0 \ - --best \ - --nodocs \ - ${INSTALL_PKGS} && \ - groupadd \ - --system \ - --gid 1995 \ - zabbix && \ - useradd \ - --system \ - --comment "Zabbix monitoring system" \ - -g zabbix \ - --uid 1997 \ - --shell /sbin/nologin \ - --home-dir ${ZABBIX_USER_HOME_DIR} \ - zabbix && \ - mkdir -p ${ZABBIX_CONF_DIR} \ - ${ZABBIX_CONF_DIR}/zabbix_agentd.d \ - ${ZABBIX_USER_HOME_DIR} \ - ${ZABBIX_USER_HOME_DIR}/enc \ - ${ZABBIX_USER_HOME_DIR}/enc_internal \ - ${ZABBIX_USER_HOME_DIR}/modules \ - ${ZBX_USERPARAMETERDIR} && \ - FIX_PERM_LIST="\ - ${ZABBIX_CONF_DIR}/zabbix_agentd_modules.conf \ - ${ZABBIX_CONF_DIR}/zabbix_agentd_item_keys.conf \ - ${ZABBIX_CONF_DIR}/zabbix_agentd.d/ \ - ${ZABBIX_USER_HOME_DIR}/" && \ - chown --quiet -R zabbix:0 ${FIX_PERM_LIST} && \ - chmod -R g=u ${FIX_PERM_LIST} && \ - chown --quiet zabbix:0 ${ZABBIX_CONF_DIR}/ && \ - chmod g=u ${ZABBIX_CONF_DIR} && \ - /usr/sbin/zabbix_agentd -V - -RUN --mount=from=entrypoints,target=/tmp/entrypoints,ro \ - set -eux && \ - install -d /usr/lib/docker-entrypoint && \ - install -m 0755 /tmp/entrypoints/agent.sh /usr/bin/docker-entrypoint.sh && \ - install -m 0644 /tmp/entrypoints/lib/*.sh /usr/lib/docker-entrypoint/ - -EXPOSE 10050/tcp - -WORKDIR ${ZABBIX_USER_HOME_DIR} - -USER 1997 - -ENTRYPOINT ["/usr/bin/docker-entrypoint.sh"] - -CMD ["/usr/sbin/zabbix_agentd", "--foreground", "-c", "/etc/zabbix/zabbix_agentd.conf"] diff --git a/Dockerfiles/agent/centos/README.md b/Dockerfiles/agent/centos/README.md deleted file mode 120000 index 32d46ee8..00000000 --- a/Dockerfiles/agent/centos/README.md +++ /dev/null @@ -1 +0,0 @@ -../README.md \ No newline at end of file diff --git a/Dockerfiles/agent/centos/build.sh b/Dockerfiles/agent/centos/build.sh deleted file mode 120000 index 46b20313..00000000 --- a/Dockerfiles/agent/centos/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../../build.sh \ No newline at end of file diff --git a/Dockerfiles/agent/ol/.dockerignore b/Dockerfiles/agent/ol/.dockerignore deleted file mode 100644 index 88a84e55..00000000 --- a/Dockerfiles/agent/ol/.dockerignore +++ /dev/null @@ -1 +0,0 @@ -build.sh diff --git a/Dockerfiles/agent/ol/Dockerfile b/Dockerfiles/agent/ol/Dockerfile deleted file mode 100644 index 741807f1..00000000 --- a/Dockerfiles/agent/ol/Dockerfile +++ /dev/null @@ -1,114 +0,0 @@ -# syntax=docker/dockerfile:1.6 -ARG OS_BASE_IMAGE=container-registry.oracle.com/os/oraclelinux:10-slim -ARG MAJOR_VERSION=7.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.12 -ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ol-${ZBX_VERSION} - -FROM ${BUILD_BASE_IMAGE} AS builder - -FROM ${OS_BASE_IMAGE} - -ARG MAJOR_VERSION -ARG ZBX_VERSION -ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git - -ENV TERM=xterm \ - ZBX_VERSION=${ZBX_VERSION} \ - ZBX_SOURCES=${ZBX_SOURCES} \ - ZABBIX_USER_HOME_DIR=/var/lib/zabbix \ - ZABBIX_CONF_DIR=/etc/zabbix - -ENV ZBX_LOADMODULEPATH="${ZABBIX_USER_HOME_DIR}/modules" \ - ZBX_USERPARAMETERDIR=${ZABBIX_USER_HOME_DIR}/user_scripts - -LABEL org.opencontainers.image.authors="Alexey Pustovalov " \ - org.opencontainers.image.description="Zabbix agent is deployed on a monitoring target to actively monitor local resources and applications" \ - org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ - org.opencontainers.image.licenses="AGPL v3.0" \ - org.opencontainers.image.source="${ZBX_SOURCES}" \ - org.opencontainers.image.title="Zabbix agent" \ - org.opencontainers.image.url="https://zabbix.com/" \ - org.opencontainers.image.vendor="Zabbix SIA" \ - org.opencontainers.image.version="${ZBX_VERSION}" - -STOPSIGNAL SIGTERM - -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/agent/sbin/zabbix_agentd /usr/sbin/ -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/general/bin/zabbix_get /usr/bin/ -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/general/bin/zabbix_sender /usr/bin/ -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/agent/conf/ ${ZABBIX_CONF_DIR}/ - -RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ - --mount=type=tmpfs,target=/var/cache/yum/ \ - set -eux && \ - INSTALL_PKGS="bash \ - c-ares \ - libcurl \ - libmodbus \ - openssl-libs \ - pcre2 \ - zlib \ - iputils" && \ - microdnf -y install \ - --disablerepo="*" \ - --enablerepo="ol10_baseos_latest" \ - --setopt=install_weak_deps=0 \ - --setopt=keepcache=0 \ - --best \ - --nodocs \ - oracle-epel-release-el10 && \ - microdnf -y install \ - --disablerepo="*" \ - --enablerepo="ol10_baseos_latest" \ - --enablerepo="ol10_appstream" \ - --enablerepo="ol10_u1_developer_EPEL" \ - --setopt=install_weak_deps=0 \ - --setopt=keepcache=0 \ - --best \ - --nodocs \ - ${INSTALL_PKGS} && \ - groupadd \ - --system \ - --gid 1995 \ - zabbix && \ - useradd \ - --system \ - --comment "Zabbix monitoring system" \ - -g zabbix \ - --uid 1997 \ - --shell /sbin/nologin \ - --home-dir ${ZABBIX_USER_HOME_DIR} \ - zabbix && \ - mkdir -p ${ZABBIX_CONF_DIR} \ - ${ZABBIX_CONF_DIR}/zabbix_agentd.d \ - ${ZABBIX_USER_HOME_DIR} \ - ${ZABBIX_USER_HOME_DIR}/enc \ - ${ZABBIX_USER_HOME_DIR}/enc_internal \ - ${ZABBIX_USER_HOME_DIR}/modules \ - ${ZBX_USERPARAMETERDIR} && \ - FIX_PERM_LIST="\ - ${ZABBIX_CONF_DIR}/zabbix_agentd_modules.conf \ - ${ZABBIX_CONF_DIR}/zabbix_agentd_item_keys.conf \ - ${ZABBIX_CONF_DIR}/zabbix_agentd.d/ \ - ${ZABBIX_USER_HOME_DIR}/" && \ - chown --quiet -R zabbix:0 ${FIX_PERM_LIST} && \ - chmod -R g=u ${FIX_PERM_LIST} && \ - chown --quiet zabbix:0 ${ZABBIX_CONF_DIR}/ && \ - chmod g=u ${ZABBIX_CONF_DIR} && \ - /usr/sbin/zabbix_agentd -V - -RUN --mount=from=entrypoints,target=/tmp/entrypoints,ro \ - set -eux && \ - install -d /usr/lib/docker-entrypoint && \ - install -m 0755 /tmp/entrypoints/agent.sh /usr/bin/docker-entrypoint.sh && \ - install -m 0644 /tmp/entrypoints/lib/*.sh /usr/lib/docker-entrypoint/ - -EXPOSE 10050/tcp - -WORKDIR ${ZABBIX_USER_HOME_DIR} - -USER 1997 - -ENTRYPOINT ["/usr/bin/docker-entrypoint.sh"] - -CMD ["/usr/sbin/zabbix_agentd", "--foreground", "-c", "/etc/zabbix/zabbix_agentd.conf"] diff --git a/Dockerfiles/agent/ol/README.md b/Dockerfiles/agent/ol/README.md deleted file mode 120000 index 32d46ee8..00000000 --- a/Dockerfiles/agent/ol/README.md +++ /dev/null @@ -1 +0,0 @@ -../README.md \ No newline at end of file diff --git a/Dockerfiles/agent/ol/build.sh b/Dockerfiles/agent/ol/build.sh deleted file mode 120000 index 46b20313..00000000 --- a/Dockerfiles/agent/ol/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../../build.sh \ No newline at end of file diff --git a/Dockerfiles/agent/rhel/.dockerignore b/Dockerfiles/agent/rhel/.dockerignore deleted file mode 100644 index 88a84e55..00000000 --- a/Dockerfiles/agent/rhel/.dockerignore +++ /dev/null @@ -1 +0,0 @@ -build.sh diff --git a/Dockerfiles/agent/rhel/Dockerfile b/Dockerfiles/agent/rhel/Dockerfile deleted file mode 100644 index 5eccf394..00000000 --- a/Dockerfiles/agent/rhel/Dockerfile +++ /dev/null @@ -1,131 +0,0 @@ -# syntax=docker/dockerfile:1.6 -ARG OS_BASE_IMAGE=registry.access.redhat.com/ubi10/ubi-minimal:10.2 -ARG MAJOR_VERSION=7.4 -ARG RELEASE=12 -ARG ZBX_VERSION=${MAJOR_VERSION}.12 -ARG BUILD_BASE_IMAGE=zabbix-build-mysql:rhel-${ZBX_VERSION} - -FROM ${BUILD_BASE_IMAGE} AS builder - -FROM ${OS_BASE_IMAGE} - -ARG MAJOR_VERSION -ARG RELEASE -ARG ZBX_VERSION -ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git - -ENV TERM=xterm \ - ZBX_VERSION=${ZBX_VERSION} \ - ZBX_SOURCES=${ZBX_SOURCES} \ - ZABBIX_USER_HOME_DIR=/var/lib/zabbix \ - ZABBIX_CONF_DIR=/etc/zabbix - -ENV ZBX_LOADMODULEPATH=${ZABBIX_USER_HOME_DIR}/modules \ - ZBX_USERPARAMETERDIR=${ZABBIX_USER_HOME_DIR}/user_scripts - -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-74" \ - release="${RELEASE}" \ - run="podman run --name zabbix-agent -p 10050:10050 -d registry.connect.redhat.com/zabbix/zabbix-agent-74:${ZBX_VERSION}" \ - summary="Zabbix agent" \ - url="https://www.zabbix.com/" \ - vendor="Zabbix SIA" \ - version="${MAJOR_VERSION}" \ - io.k8s.description="Zabbix agent is deployed on a monitoring target to actively monitor local resources and applications" \ - io.k8s.display-name="Zabbix Agent" \ - io.openshift.expose-services="10050:10050" \ - 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-74:${ZBX_VERSION}" \ - org.label-schema.license="AGPL v3.0" \ - org.label-schema.name="zabbix-agent-rhel" \ - org.label-schema.schema-version="1.0" \ - org.label-schema.url="https://zabbix.com/" \ - org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ - org.label-schema.vcs-ref="${VCS_REF}" \ - org.label-schema.vcs-url="${ZBX_SOURCES}" \ - org.label-schema.vendor="Zabbix SIA" \ - org.label-schema.version="${ZBX_VERSION}" - -STOPSIGNAL SIGTERM - -COPY licenses /licenses/ -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/agent/sbin/zabbix_agentd /usr/sbin/ -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/general/bin/zabbix_get /usr/bin/ -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/general/bin/zabbix_sender /usr/bin/ -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/agent/conf/ ${ZABBIX_CONF_DIR}/ - -RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ - --mount=type=tmpfs,target=/var/cache/yum/ \ - set -eux && \ - INSTALL_PKGS="bash \ - shadow-utils \ - tzdata \ - c-ares \ - libcurl-minimal \ - libmodbus \ - openldap \ - pcre2 \ - zlib \ - iputils" && \ - curl --tlsv1.2 -sSf -L https://dl.fedoraproject.org/pub/epel/epel-release-latest-10.noarch.rpm -o /tmp/epel-release-latest-10.noarch.rpm && \ - rpm -ivh /tmp/epel-release-latest-10.noarch.rpm && \ - rm -rf /tmp/epel-release-latest-10.noarch.rpm && \ - ARCH_SUFFIX="$(arch)"; \ - microdnf -y install \ - --disablerepo="*" \ - --enablerepo="ubi-10-baseos-rpms" \ - --enablerepo="rhel-10-for-$ARCH_SUFFIX-baseos-rpms" \ - --enablerepo="epel" \ - --setopt=install_weak_deps=0 \ - --setopt=keepcache=0 \ - --best \ - --setopt=tsflags=nodocs \ - ${INSTALL_PKGS} && \ - groupadd \ - --system \ - --gid 1995 \ - zabbix && \ - useradd \ - --system \ - --comment "Zabbix monitoring system" \ - -g zabbix \ - --uid 1997 \ - --shell /sbin/nologin \ - --home-dir ${ZABBIX_USER_HOME_DIR} \ - zabbix && \ - mkdir -p ${ZABBIX_CONF_DIR} \ - ${ZABBIX_CONF_DIR}/zabbix_agentd.d \ - ${ZABBIX_USER_HOME_DIR} \ - ${ZABBIX_USER_HOME_DIR}/enc \ - ${ZABBIX_USER_HOME_DIR}/enc_internal \ - ${ZABBIX_USER_HOME_DIR}/modules \ - ${ZBX_USERPARAMETERDIR} && \ - FIX_PERM_LIST="\ - ${ZABBIX_CONF_DIR}/zabbix_agentd_modules.conf \ - ${ZABBIX_CONF_DIR}/zabbix_agentd_item_keys.conf \ - ${ZABBIX_CONF_DIR}/zabbix_agentd.d/ \ - ${ZABBIX_USER_HOME_DIR}/" && \ - chown --quiet -R zabbix:0 ${FIX_PERM_LIST} && \ - chmod -R g=u ${FIX_PERM_LIST} && \ - chown --quiet zabbix:0 ${ZABBIX_CONF_DIR}/ && \ - chmod g=u ${ZABBIX_CONF_DIR} && \ - /usr/sbin/zabbix_agentd -V - -RUN --mount=from=entrypoints,target=/tmp/entrypoints,ro \ - set -eux && \ - install -d /usr/lib/docker-entrypoint && \ - install -m 0755 /tmp/entrypoints/agent.sh /usr/bin/docker-entrypoint.sh && \ - install -m 0644 /tmp/entrypoints/lib/*.sh /usr/lib/docker-entrypoint/ - -EXPOSE 10050/tcp - -WORKDIR ${ZABBIX_USER_HOME_DIR} - -USER 1997 - -ENTRYPOINT ["/usr/bin/docker-entrypoint.sh"] - -CMD ["/usr/sbin/zabbix_agentd", "--foreground", "-c", "/etc/zabbix/zabbix_agentd.conf"] diff --git a/Dockerfiles/agent/rhel/README.html b/Dockerfiles/agent/rhel/README.html deleted file mode 100644 index f0f8995b..00000000 --- a/Dockerfiles/agent/rhel/README.html +++ /dev/null @@ -1,140 +0,0 @@ -

What is Zabbix?

-

Zabbix is an enterprise-class open source distributed monitoring solution.

-

Zabbix is software that monitors numerous parameters of a network and the health and integrity of servers. Zabbix uses a flexible notification mechanism that allows users to configure e-mail based alerts for virtually any event. This allows a fast reaction to server problems. Zabbix offers excellent reporting and data visualisation features based on the stored data. This makes Zabbix ideal for capacity planning.

-

For more information and related downloads for Zabbix components, please visit zabbix.com

-

What is Zabbix agent?

-

Zabbix agent is deployed on a monitoring target to actively monitor local resources and applications (hard drives, memory, processor statistics etc).

-

Zabbix agent images

-

Images are updated when new releases are published.

-

How to use this image

-

Start zabbix-agent

-

Start a Zabbix agent container as follows:

-
podman run \
-    --name some-zabbix-agent \
-    -e ZBX_HOSTNAME="some-hostname" \
-    -e ZBX_SERVER_HOST="some-zabbix-server" \
-    --init \
-    -d registry.connect.redhat.com/zabbix/zabbix-agent-74:tag
-
-

Where some-zabbix-agent is the name you want to assign to your container, some-hostname is the hostname, it is Hostname parameter in Zabbix agent configuration file, some-zabbix-server is IP or DNS name of Zabbix server or proxy and tag is the tag specifying the version you want.

-

Connects from Zabbix server or Zabbix proxy in other containers (Passive checks)

-

This image exposes the standard Zabbix agent port (10050) to perform passive checks, so container linking makes Zabbix agent instance available to Zabbix server and Zabbix proxy containers. Start your application container like this in order to link it to the Zabbix agent container:

-
$ podman run \
-    --name some-zabbix-server \
-    --link some-zabbix-agent:zabbix-agent \
-    --init \
-    -d zabbix/zabbix-server:latest
-
-

Connect to Zabbix server or Zabbix proxy containers (Active checks)

-

This image supports perform active checks, so container linking makes Zabbix server and Zabbix proxy containers available to Zabbix agent instance. Start your application container like this in order to link Zabbix agent to Zabbix server or Zabbix proxy containers:

-
$ podman run \
-    --name some-zabbix-agent \
-    --link some-zabbix-server:zabbix-server \
-    --init \
-    -d registry.connect.redhat.com/zabbix/zabbix-agent-74:latest
-
-

Container shell access and viewing Zabbix agent logs

-

The podman exec command allows you to run commands inside a Podman container. The following command line will give you a bash shell inside your zabbix-agent container:

-
$ podman exec -ti some-zabbix-agent /bin/bash
-
-

The Zabbix agent log is available through Podman's container log:

-
$ podman logs some-zabbix-agent
-
-

Privileged mode

-

By default, Podman containers are "unprivileged" and do not have access to the most of host resources. Zabbix agent is designed to monitor system resources, to do that Zabbix agent container must be privileged or you may mount some system-wide volumes. For example:

-
$ podman run \
-    --name some-zabbix-agent \
-    --link some-zabbix-server:zabbix-server \
-    --privileged \
-    --init \
-    -d registry.connect.redhat.com/zabbix/zabbix-agent-74:latest
-
-
$ podman run \
-    --name some-zabbix-agent \
-    --link some-zabbix-server:zabbix-server \
-    -v /dev/sdc:/dev/sdc \
-    --init \
-    -d registry.connect.redhat.com/zabbix/zabbix-agent-74:latest
-
-

Environment Variables

-

When you start the zabbix-agent image, you can adjust the configuration of the Zabbix agent by passing one or more environment variables on the podman run command line.

-

ZBX_HOSTNAME

-

This variable is unique, case sensitive hostname. By default, value is hostname of the container. It is Hostname parameter in zabbix_agentd.conf.

-

ZBX_SERVER_HOST

-

This variable is IP or DNS name of Zabbix server or Zabbix proxy. By default, value is zabbix-server. It is Server parameter in zabbix_agentd.conf. It is allowed to specify Zabbix server or Zabbix proxy port number using ZBX_SERVER_PORT variable. It make sense in case of non-default port for active checks.

-

ZBX_PASSIVE_ALLOW

-

This variable is boolean (true or false) and enables or disables feature of passive checks. By default, value is true.

-

ZBX_PASSIVESERVERS

-

The variable is comma separated list of allowed Zabbix server or proxy hosts for connections to Zabbix agent container.

-

ZBX_ACTIVE_ALLOW

-

This variable is boolean (true or false) and enables or disables feature of active checks. By default, value is true.

-

ZBX_ACTIVESERVERS

-

The variable is comma separated list of allowed Zabbix server or proxy hosts for connections to Zabbix agent container. You may specify port of Zabbix server or Zabbix proxy in such syntax: zabbix-server:10061,zabbix-proxy:10072.

-

ZBX_LOADMODULE

-

The variable is list of comma separated loadable Zabbix modules. It works with volume /var/lib/zabbix/modules. The syntax of the variable is dummy1.so,dummy2.so.

-

ZBX_DEBUGLEVEL

-

The variable is used to specify debug level. By default, value is 3. It is DebugLevel parameter in zabbix_agentd.conf. Allowed values are listed below:

-
    -
  • 0 - basic information about starting and stopping of Zabbix processes;
    • -
  • 1 - critical information
    • -
  • 2 - error information
    • -
  • 3 - warnings
    • -
  • 4 - for debugging (produces lots of information)
    • -
  • 5 - extended debugging (produces even more information)
    • -
-

ZBX_TIMEOUT

-

The variable is used to specify timeout for processing checks. By default, value is 3.

-

Other variables

-

Additionally the image allows to specify many other environment variables listed below:

-
ZBX_SOURCEIP=
-ZBX_ENABLEREMOTECOMMANDS=0 # Deprecated since 5.0.0
-ZBX_LOGREMOTECOMMANDS=0
-ZBX_HEARTBEAT_FREQUENCY=60 # Available since 6.2.0
-ZBX_HOSTINTERFACE= # Available since 4.4.0
-ZBX_HOSTINTERFACEITEM= # Available since 4.4.0
-ZBX_STARTAGENTS=10
-ZBX_HOSTNAMEITEM=system.hostname
-ZBX_METADATA=
-ZBX_METADATAITEM=
-ZBX_REFRESHACTIVECHECKS=5
-ZBX_BUFFERSEND=5
-ZBX_BUFFERSIZE=100
-ZBX_MAXLINESPERSECOND=20
-ZBX_LISTENIP=
-ZBX_LISTENPORT=10050
-ZBX_LISTENBACKLOG=
-ZBX_UNSAFEUSERPARAMETERS=0
-ZBX_TLSCONNECT=unencrypted
-ZBX_TLSACCEPT=unencrypted
-ZBX_TLSCAFILE=
-ZBX_TLSCA=
-ZBX_TLSCRLFILE=
-ZBX_TLSCRL=
-ZBX_TLSSERVERCERTISSUER=
-ZBX_TLSSERVERCERTSUBJECT=
-ZBX_TLSCERTFILE=
-ZBX_TLSCERT=
-ZBX_TLSKEYFILE=
-ZBX_TLSKEY=
-ZBX_TLSPSKIDENTITY=
-ZBX_TLSPSKFILE=
-ZBX_TLSPSK=
-ZBX_TLSCIPHERALL= # Available since 4.4.7
-ZBX_TLSCIPHERALL13= # Available since 4.4.7
-ZBX_TLSCIPHERCERT= # Available since 4.4.7
-ZBX_TLSCIPHERCERT13= # Available since 4.4.7
-ZBX_TLSCIPHERPSK= # Available since 4.4.7
-ZBX_TLSCIPHERPSK13= # Available since 4.4.7
-ZBX_DENYKEY=system.run[*] # Available since 5.0.0
-ZBX_ALLOWKEY= # Available since 5.0.0
-
-

Default values of these variables are specified after equal sign.

-

The allowed variables are identical of parameters in official zabbix_agentd.conf configuration file. For example, ZBX_REFRESHACTIVECHECKS = RefreshActiveChecks.

-

Please use official documentation for zabbix_agentd.conf to get more information about the variables.

-

Allowed volumes for the Zabbix agent container

-

/etc/zabbix/zabbix_agentd.d

-

The volume allows include *.conf files and extend Zabbix agent using UserParameter feature.

-

/var/lib/zabbix/modules

-

The volume allows load additional modules and extend Zabbix agent using LoadModule feature.

-

/var/lib/zabbix/enc

-

The volume is used to store TLS related files. These file names are specified using ZBX_TLSCAFILE, ZBX_TLSCRLFILE, ZBX_TLSCERTFILE, ZBX_TLSKEYFILE and ZBX_TLSPSKFILE variables. Additionally it is possible to use environment variables ZBX_TLSCA, ZBX_TLSCRL, ZBX_TLSCERT, ZBX_TLSKEY and ZBX_TLSPSK with plaintext values.

diff --git a/Dockerfiles/agent/rhel/build.sh b/Dockerfiles/agent/rhel/build.sh deleted file mode 120000 index 46b20313..00000000 --- a/Dockerfiles/agent/rhel/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../../build.sh \ No newline at end of file diff --git a/Dockerfiles/agent/rhel/licenses/AGPL-v3.0.txt b/Dockerfiles/agent/rhel/licenses/AGPL-v3.0.txt deleted file mode 100644 index be3f7b28..00000000 --- a/Dockerfiles/agent/rhel/licenses/AGPL-v3.0.txt +++ /dev/null @@ -1,661 +0,0 @@ - GNU AFFERO GENERAL PUBLIC LICENSE - Version 3, 19 November 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU Affero General Public License is a free, copyleft license for -software and other kinds of works, specifically designed to ensure -cooperation with the community in the case of network server software. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -our General Public Licenses are intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - Developers that use our General Public Licenses protect your rights -with two steps: (1) assert copyright on the software, and (2) offer -you this License which gives you legal permission to copy, distribute -and/or modify the software. - - A secondary benefit of defending all users' freedom is that -improvements made in alternate versions of the program, if they -receive widespread use, become available for other developers to -incorporate. Many developers of free software are heartened and -encouraged by the resulting cooperation. However, in the case of -software used on network servers, this result may fail to come about. -The GNU General Public License permits making a modified version and -letting the public access it on a server without ever releasing its -source code to the public. - - The GNU Affero General Public License is designed specifically to -ensure that, in such cases, the modified source code becomes available -to the community. It requires the operator of a network server to -provide the source code of the modified version running there to the -users of that server. Therefore, public use of a modified version, on -a publicly accessible server, gives the public access to the source -code of the modified version. - - An older license, called the Affero General Public License and -published by Affero, was designed to accomplish similar goals. This is -a different license, not a version of the Affero GPL, but Affero has -released a new version of the Affero GPL which permits relicensing under -this license. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU Affero General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Remote Network Interaction; Use with the GNU General Public License. - - Notwithstanding any other provision of this License, if you modify the -Program, your modified version must prominently offer all users -interacting with it remotely through a computer network (if your version -supports such interaction) an opportunity to receive the Corresponding -Source of your version by providing access to the Corresponding Source -from a network server at no charge, through some standard or customary -means of facilitating copying of software. This Corresponding Source -shall include the Corresponding Source for any work covered by version 3 -of the GNU General Public License that is incorporated pursuant to the -following paragraph. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the work with which it is combined will remain governed by version -3 of the GNU General Public License. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU Affero General Public License from time to time. Such new versions -will be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU Affero General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU Affero General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU Affero General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Affero General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Affero General Public License for more details. - - You should have received a copy of the GNU Affero General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If your software can interact with users remotely through a computer -network, you should also make sure that it provides a way for users to -get its source. For example, if your program is a web application, its -interface could display a "Source" link that leads users to an archive -of the code. There are many ways you could offer source, and different -solutions will be better for different programs; see section 13 for the -specific requirements. - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU AGPL, see -. diff --git a/Dockerfiles/agent/ubuntu/.dockerignore b/Dockerfiles/agent/ubuntu/.dockerignore deleted file mode 100644 index 88a84e55..00000000 --- a/Dockerfiles/agent/ubuntu/.dockerignore +++ /dev/null @@ -1 +0,0 @@ -build.sh diff --git a/Dockerfiles/agent/ubuntu/Dockerfile b/Dockerfiles/agent/ubuntu/Dockerfile deleted file mode 100644 index 13022e12..00000000 --- a/Dockerfiles/agent/ubuntu/Dockerfile +++ /dev/null @@ -1,103 +0,0 @@ -# syntax=docker/dockerfile:1.6 -ARG OS_BASE_IMAGE=ubuntu:resolute -ARG MAJOR_VERSION=7.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.12 -ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION} - -FROM ${BUILD_BASE_IMAGE} AS builder - -FROM ${OS_BASE_IMAGE} - -ARG MAJOR_VERSION -ARG ZBX_VERSION -ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git - -ENV TERM=xterm \ - ZBX_VERSION=${ZBX_VERSION} \ - ZBX_SOURCES=${ZBX_SOURCES} \ - ZABBIX_USER_HOME_DIR=/var/lib/zabbix \ - ZABBIX_CONF_DIR=/etc/zabbix - -ENV ZBX_LOADMODULEPATH=${ZABBIX_USER_HOME_DIR}/modules \ - ZBX_USERPARAMETERDIR=${ZABBIX_USER_HOME_DIR}/user_scripts - -LABEL org.opencontainers.image.authors="Alexey Pustovalov " \ - org.opencontainers.image.description="Zabbix agent is deployed on a monitoring target to actively monitor local resources and applications" \ - org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ - org.opencontainers.image.licenses="AGPL v3.0" \ - org.opencontainers.image.source="${ZBX_SOURCES}" \ - org.opencontainers.image.title="Zabbix agent" \ - org.opencontainers.image.url="https://zabbix.com/" \ - org.opencontainers.image.vendor="Zabbix SIA" \ - org.opencontainers.image.version="${ZBX_VERSION}" - -STOPSIGNAL SIGTERM - -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/agent/sbin/zabbix_agentd /usr/sbin/ -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/general/bin/zabbix_get /usr/bin/ -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/general/bin/zabbix_sender /usr/bin/ -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/agent/conf/ ${ZABBIX_CONF_DIR}/ - -RUN --mount=type=cache,target=/var/cache/apt/,sharing=locked \ - --mount=type=cache,target=/var/lib/apt/,sharing=locked \ - set -eux && \ - INSTALL_PKGS="bash \ - ca-certificates \ - tzdata \ - libcares2 \ - libcurl4t64 \ - libldap2 \ - libmodbus5 \ - libpcre2-8-0 \ - libssl3t64 \ - zlib1g \ - iputils-ping" && \ - apt-get update && \ - DEBIAN_FRONTEND=noninteractive apt-get install -y \ - --no-install-recommends \ - ${INSTALL_PKGS} && \ - groupadd \ - --system \ - --gid 1995 \ - zabbix && \ - useradd \ - --system \ - --comment "Zabbix monitoring system" \ - -g zabbix \ - --uid 1997 \ - --shell /sbin/nologin \ - --home-dir ${ZABBIX_USER_HOME_DIR} \ - zabbix && \ - mkdir -p ${ZABBIX_CONF_DIR} \ - ${ZABBIX_CONF_DIR}/zabbix_agentd.d \ - ${ZABBIX_USER_HOME_DIR} \ - ${ZABBIX_USER_HOME_DIR}/enc \ - ${ZABBIX_USER_HOME_DIR}/enc_internal \ - ${ZABBIX_USER_HOME_DIR}/modules \ - ${ZBX_USERPARAMETERDIR} && \ - FIX_PERM_LIST="\ - ${ZABBIX_CONF_DIR}/zabbix_agentd_modules.conf \ - ${ZABBIX_CONF_DIR}/zabbix_agentd_item_keys.conf \ - ${ZABBIX_CONF_DIR}/zabbix_agentd.d/ \ - ${ZABBIX_USER_HOME_DIR}/" && \ - chown --quiet -R zabbix:0 ${FIX_PERM_LIST} && \ - chmod -R g=u ${FIX_PERM_LIST} && \ - chown --quiet zabbix:0 ${ZABBIX_CONF_DIR}/ && \ - chmod g=u ${ZABBIX_CONF_DIR} && \ - /usr/sbin/zabbix_agentd -V - -RUN --mount=from=entrypoints,target=/tmp/entrypoints,ro \ - set -eux && \ - install -d /usr/lib/docker-entrypoint && \ - install -m 0755 /tmp/entrypoints/agent.sh /usr/bin/docker-entrypoint.sh && \ - install -m 0644 /tmp/entrypoints/lib/*.sh /usr/lib/docker-entrypoint/ - -EXPOSE 10050/tcp - -WORKDIR ${ZABBIX_USER_HOME_DIR} - -USER 1997 - -ENTRYPOINT ["/usr/bin/docker-entrypoint.sh"] - -CMD ["/usr/sbin/zabbix_agentd", "--foreground", "-c", "/etc/zabbix/zabbix_agentd.conf"] diff --git a/Dockerfiles/agent/ubuntu/README.md b/Dockerfiles/agent/ubuntu/README.md deleted file mode 120000 index 32d46ee8..00000000 --- a/Dockerfiles/agent/ubuntu/README.md +++ /dev/null @@ -1 +0,0 @@ -../README.md \ No newline at end of file diff --git a/Dockerfiles/agent/ubuntu/build.sh b/Dockerfiles/agent/ubuntu/build.sh deleted file mode 120000 index 46b20313..00000000 --- a/Dockerfiles/agent/ubuntu/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../../build.sh \ No newline at end of file diff --git a/Dockerfiles/agent/windows/Dockerfile b/Dockerfiles/agent/windows/Dockerfile deleted file mode 100644 index 910fa7d1..00000000 --- a/Dockerfiles/agent/windows/Dockerfile +++ /dev/null @@ -1,87 +0,0 @@ -# syntax=docker/dockerfile:1.6 -# escape=` -ARG OS_BASE_IMAGE=mcr.microsoft.com/windows/nanoserver:ltsc2022 -ARG ENTRYPOINT_BUILD_IMAGE=golang:1.26.5-windowsservercore-ltsc2022 - -ARG MAJOR_VERSION=7.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.12 - -ARG BUILD_BASE_IMAGE=zabbix-build-agent:ltsc2022-agent-${ZBX_VERSION} - -FROM ${ENTRYPOINT_BUILD_IMAGE} AS entrypoint-builder - -COPY ["templates/entrypoints", "C:\\entrypoints"] - -WORKDIR C:\entrypoints - -SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] - -RUN $env:CGO_ENABLED = '0'; ` - go build -buildvcs=false -trimpath -ldflags='-s -w -buildid=' ` - -o C:\docker-entrypoint.exe ` - ./cmd/agent; - -FROM ${BUILD_BASE_IMAGE} AS builder -FROM ${OS_BASE_IMAGE} - -ARG MAJOR_VERSION -ARG ZBX_VERSION -ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git - -ENV ZABBIX_USER_HOME_DIR="C:\zabbix" ` - ZABBIX_CONF_DIR="C:\zabbix\conf" - -ENV ZBX_USERPARAMETERDIR="${ZABBIX_USER_HOME_DIR}\user_scripts" - -LABEL org.opencontainers.image.title="Zabbix agent" ` - org.opencontainers.image.authors="Alexey Pustovalov " ` - org.opencontainers.image.vendor="Zabbix SIA" ` - org.opencontainers.image.url="https://zabbix.com/" ` - org.opencontainers.image.description="Zabbix agent is deployed on a monitoring target to actively monitor local resources and applications" ` - org.opencontainers.image.licenses="AGPL v3.0" ` - org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" ` - org.opencontainers.image.version="${ZBX_VERSION}" ` - org.opencontainers.image.source="${ZBX_SOURCES}" - -COPY --from=builder ["C:\\zabbix-${ZBX_VERSION}-output", "C:\\zabbix"] -COPY ["templates/config/agent_windows", "C:\\zabbix\\conf"] -COPY --from=builder ["C:\\build_deps\\pwsh", "C:\\Program Files\\PowerShell"] -COPY --from=entrypoint-builder ["C:\\docker-entrypoint.exe", "C:\\zabbix\\docker-entrypoint.exe"] -COPY ["templates/entrypoints/licenses/go-THIRD-PARTY-NOTICES.txt", "C:\\licenses\\"] - -WORKDIR C:\zabbix\ - -USER ContainerAdministrator - -SHELL ["C:\\Program Files\\PowerShell\\pwsh.exe", "-Command", "$ErrorActionPreference = 'Stop';"] - -RUN $env:PATH = [string]::Format('{0}\zabbix\sbin;{0}\zabbix\bin;{0}\Program Files\PowerShell;', $env:SystemDrive) + $env:PATH; ` - [Environment]::SetEnvironmentVariable('PATH', $env:PATH, [EnvironmentVariableTarget]::Machine); ` - ` - [Environment]::SetEnvironmentVariable('ZABBIX_USER_HOME_DIR', $env:ZABBIX_USER_HOME_DIR, [EnvironmentVariableTarget]::Machine); ` - ` - Write-Host ('Verifying Zabbix agent {0} ...' -f $env:ZBX_VERSION); ` - zabbix_agentd.exe -V; - -RUN Set-Location -Path $env:SystemDrive\.; ` - ` - New-Item -Force -ItemType directory -Path $env:ZABBIX_CONF_DIR | Out-Null; ` - New-Item -Force -ItemType directory -Path $env:ZABBIX_CONF_DIR\zabbix_agentd.d | Out-Null; ` - New-Item -Force -ItemType directory -Path $env:ZABBIX_USER_HOME_DIR\enc | Out-Null; ` - New-Item -Force -ItemType directory -Path $env:ZABBIX_USER_HOME_DIR\enc_internal | Out-Null; ` - New-Item -Force -ItemType directory -Path $env:ZBX_USERPARAMETERDIR | Out-Null; ` - ` - net accounts /MaxPWAge:unlimited; ` - net user /add zabbix /expire:never /passwordreq:no; ` - $acl = Get-Acl -Path $env:ZABBIX_USER_HOME_DIR; ` - $ace = New-Object Security.AccessControl.FileSystemAccessRule ('zabbix', 'Modify', 'ContainerInherit, ObjectInherit', 'InheritOnly', 'Allow'); ` - $acl.AddAccessRule($ace); ` - Set-Acl -AclObject $acl -Path $env:ZABBIX_USER_HOME_DIR; - -USER zabbix - -EXPOSE 10050/tcp - -ENTRYPOINT ["C:\\zabbix\\docker-entrypoint.exe"] - -CMD ["C:\\zabbix\\sbin\\zabbix_agentd.exe", "-c", "C:\\zabbix\\conf\\zabbix_agentd.conf", "-f"] diff --git a/Dockerfiles/agent/windows/Dockerfile.dockerignore b/Dockerfiles/agent/windows/Dockerfile.dockerignore deleted file mode 100644 index 74c9fd0a..00000000 --- a/Dockerfiles/agent/windows/Dockerfile.dockerignore +++ /dev/null @@ -1,17 +0,0 @@ -** -!templates/ -!templates/entrypoints/ -!templates/entrypoints/go.mod -!templates/entrypoints/cmd/ -!templates/entrypoints/cmd/agent/ -!templates/entrypoints/cmd/agent/** -!templates/entrypoints/internal/ -!templates/entrypoints/internal/agent/ -!templates/entrypoints/internal/agent/** -!templates/entrypoints/internal/bootstrap/ -!templates/entrypoints/internal/bootstrap/** -!templates/entrypoints/licenses/ -!templates/entrypoints/licenses/go-THIRD-PARTY-NOTICES.txt -!templates/config/ -!templates/config/agent_windows/ -!templates/config/agent_windows/** diff --git a/Dockerfiles/agent/windows/README.md b/Dockerfiles/agent/windows/README.md deleted file mode 120000 index 32d46ee8..00000000 --- a/Dockerfiles/agent/windows/README.md +++ /dev/null @@ -1 +0,0 @@ -../README.md \ No newline at end of file diff --git a/Dockerfiles/agent2/README.md b/Dockerfiles/agent2/README.md deleted file mode 100644 index 0f961b7a..00000000 --- a/Dockerfiles/agent2/README.md +++ /dev/null @@ -1,243 +0,0 @@ -![logo](https://assets.zabbix.com/img/logo/zabbix_logo_500x131.png) - -# What is Zabbix? - -Zabbix is an enterprise-class open source distributed monitoring solution. - -Zabbix is software that monitors numerous parameters of a network and the health and integrity of servers. Zabbix uses a flexible notification mechanism that allows users to configure e-mail based alerts for virtually any event. This allows a fast reaction to server problems. Zabbix offers excellent reporting and data visualisation features based on the stored data. This makes Zabbix ideal for capacity planning. - -For more information and related downloads for Zabbix components, please visit https://hub.docker.com/u/zabbix/ and https://zabbix.com - -# What is Zabbix agent 2? - -Zabbix agent 2 is deployed on a monitoring target to actively monitor local resources and applications (hard drives, memory, processor statistics etc). - -# Zabbix agent 2 images - -These are the only official Zabbix agent 2 Docker images. They are based on Alpine Linux v3.24, Ubuntu 26.04 (resolute), CentOS Stream 10, Oracle Linux 10, Windows 10 LTSC 2019 and Windows 11 LTSC 2022 images. The available versions of Zabbix agent 2 are: - - Zabbix agent 2 6.0 (tags: alpine-6.0-latest, ubuntu-6.0-latest, ol-6.0-latest) - Zabbix agent 2 6.0.* (tags: alpine-6.0.*, ubuntu-6.0.*, ol-6.0.*, ltsc2019-6.0.*, ltsc2022-6.0.*) - Zabbix agent 2 7.0 (tags: alpine-7.0-latest, ubuntu-7.0-latest, ol-7.0-latest) - Zabbix agent 2 7.0.* (tags: alpine-7.0.*, ubuntu-7.0.*, ol-7.0.*, ltsc2019-7.0.*, ltsc2022-7.0.*) - Zabbix agent 2 7.2 (tags: alpine-7.2-latest, ubuntu-7.2-latest, ol-7.2-latest) - Zabbix agent 2 7.2.* (tags: alpine-7.2.*, ubuntu-7.2.*, ol-7.2.*, ltsc2019-7.2.*, ltsc2022-7.2.*) - Zabbix agent 2 7.4 (tags: alpine-7.4-latest, ubuntu-7.4-latest, ol-7.4-latest, alpine-latest, ubuntu-latest, ol-latest, ltsc2019-latest, ltsc2022-latest, latest) - Zabbix agent 2 7.4.* (tags: alpine-7.4.*, ubuntu-7.4.*, ol-7.4.*, ltsc2019-7.4.*, ltsc2022-7.4.*) - Zabbix agent 2 8.0 (tags: alpine-trunk, ubuntu-trunk, ol-trunk, ltsc2019-trunk, ltsc2022-trunk) - -Images are updated when new releases are published. The image with ``latest`` tag is based on Alpine Linux. - -# How to use this image - -## Start `zabbix-agent2` - -Start a Zabbix agent 2 container as follows: - - docker run --name some-zabbix-agent -e ZBX_HOSTNAME="some-hostname" -e ZBX_SERVER_HOST="some-zabbix-server" --init -d zabbix/zabbix-agent2:tag - -Where `some-zabbix-agent2` is the name you want to assign to your container, `some-hostname` is the hostname, it is Hostname parameter in Zabbix agent 2 configuration file, `some-zabbix-server` is IP or DNS name of Zabbix server or proxy and `tag` is the tag specifying the version you want. See the list above for relevant tags, or look at the [full list of tags](https://hub.docker.com/r/zabbix/zabbix-agent2/tags/). - -## Connects from Zabbix server or Zabbix proxy in other containers (Passive checks) - -This image exposes the standard Zabbix agent 2 port (``10050``) to perform passive checks, so container linking makes Zabbix agent 2 instance available to Zabbix server and Zabbix proxy containers. Start your application container like this in order to link it to the Zabbix agent 2 container: - -```console -$ docker run --name some-zabbix-server --link some-zabbix-agent:zabbix-agent2 --init -d zabbix/zabbix-server:latest -``` - -## Connect to Zabbix server or Zabbix proxy containers (Active checks) - -This image supports perform active checks, so container linking makes Zabbix server and Zabbix proxy containers available to Zabbix agent 2 instance. Start your application container like this in order to link Zabbix agent 2 to Zabbix server or Zabbix proxy containers: - -```console -$ docker run --name some-zabbix-agent --link some-zabbix-server:zabbix-server --init -d zabbix/zabbix-agent2:latest -``` - -## Container shell access and viewing Zabbix agent 2 logs - -The `docker exec` command allows you to run commands inside a Docker container. The following command line will give you a bash shell inside your `zabbix-agent2` container: - -```console -$ docker exec -ti some-zabbix-agent /bin/bash -``` - -The Zabbix agent 2 log is available through Docker's container log: - -```console -$ docker logs some-zabbix-agent -``` - -## Privileged mode - -By default, Docker containers are "unprivileged" and do not have access to the most of host resources. Zabbix agent 2 is designed to monitor system resources, to do that Zabbix agent 2 container must be privileged or you may mount some system-wide volumes. For example: - -```console -$ docker run --name some-zabbix-agent --link some-zabbix-server:zabbix-server --privileged --init -d zabbix/zabbix-agent2:latest -``` -```console -$ docker run --name some-zabbix-agent --link some-zabbix-server:zabbix-server -v /dev/sdc:/dev/sdc --init -d zabbix/zabbix-agent2:latest -``` - -## Environment Variables - -When you start the `zabbix-agent2` image, you can adjust the configuration of the Zabbix agent 2 by passing one or more environment variables on the `docker run` command line. - -### `ZBX_HOSTNAME` - -This variable is unique, case sensitive hostname. By default, value is `hostname` of the container. It is ``Hostname`` parameter in ``zabbix_agent2.conf``. - -### `ZBX_SERVER_HOST` - -This variable is IP or DNS name of Zabbix server or Zabbix proxy. By default, value is `zabbix-server`. It is ``Server`` parameter in ``zabbix_agent2.conf``. It is allowed to specify Zabbix server or Zabbix proxy port number using ``ZBX_SERVER_PORT`` variable. It make sense in case of non-default port for active checks. - -### `ZBX_PASSIVE_ALLOW` - -This variable is boolean (``true`` or ``false``) and enables or disables feature of passive checks. By default, value is `true`. - -### `ZBX_PASSIVESERVERS` - -The variable is comma separated list of allowed Zabbix server or proxy hosts for connections to Zabbix agent 2 container. - -### `ZBX_ACTIVE_ALLOW` - -This variable is boolean (``true`` or ``false``) and enables or disables feature of active checks. By default, value is `true`. - -### `ZBX_ACTIVESERVERS` - -The variable is comma separated list of allowed Zabbix server or proxy hosts for connections to Zabbix agent 2 container. You may specify port of Zabbix server or Zabbix proxy in such syntax: ``zabbix-server:10061,zabbix-proxy:10072``. - -### `ZBX_DEBUGLEVEL` - -The variable is used to specify debug level. By default, value is ``3``. It is ``DebugLevel`` parameter in ``zabbix_agent2.conf``. Allowed values are listed below: -- ``0`` - basic information about starting and stopping of Zabbix processes; -- ``1`` - critical information -- ``2`` - error information -- ``3`` - warnings -- ``4`` - for debugging (produces lots of information) -- ``5`` - extended debugging (produces even more information) - -### `ZBX_TIMEOUT` - -The variable is used to specify timeout for processing checks. By default, value is ``3``. - -### Other variables - -Additionally the image allows to specify many other environment variables listed below: - -``` -ZBX_ENABLEPERSISTENTBUFFER=false # Available since 5.0.0 -ZBX_PERSISTENTBUFFERPERIOD=1h # Available since 5.0.0 -ZBX_ENABLESTATUSPORT= -ZBX_SOURCEIP= -ZBX_HEARTBEAT_FREQUENCY=60 # Available since 6.2.0 -ZBX_ENABLEREMOTECOMMANDS=0 # Deprecated since 5.0.0 -ZBX_LOGREMOTECOMMANDS=0 -ZBX_FORCEACTIVECHECKSONSTART=0 # Available since 6.0.2 -ZBX_HOSTINTERFACE= # Available since 4.4.0 -ZBX_HOSTINTERFACEITEM= # Available since 4.4.0 -ZBX_HOSTNAMEITEM=system.hostname -ZBX_METADATA= -ZBX_METADATAITEM= -ZBX_REFRESHACTIVECHECKS=5 -ZBX_BUFFERSEND=5 -ZBX_BUFFERSIZE=1000 -ZBX_MAXLINESPERSECOND=20 -ZBX_EVENTLOGMAXLINESPERSECOND=20 # Windows only -ZBX_LISTENIP= -ZBX_LISTENPORT=10050 -ZBX_PLUGINTIMEOUT= -ZBX_UNSAFEUSERPARAMETERS=0 -ZBX_TLSCONNECT=unencrypted -ZBX_TLSACCEPT=unencrypted -ZBX_TLSCAFILE= -ZBX_TLSCA= -ZBX_TLSCRLFILE= -ZBX_TLSCRL= -ZBX_TLSSERVERCERTISSUER= -ZBX_TLSSERVERCERTSUBJECT= -ZBX_TLSCERTFILE= -ZBX_TLSCERT= -ZBX_TLSKEYFILE= -ZBX_TLSKEY= -ZBX_TLSPSKIDENTITY= -ZBX_TLSPSKFILE= -ZBX_TLSPSK= -ZBX_TLSCIPHERALL= -ZBX_TLSCIPHERALL13= -ZBX_TLSCIPHERCERT= -ZBX_TLSCIPHERCERT13= -ZBX_TLSCIPHERPSK= -ZBX_TLSCIPHERPSK13= -ZBX_DENYKEY=system.run[*] # Available since 5.0.0 -ZBX_ALLOWKEY= # Available since 5.0.0 -``` - -Default values of these variables are specified after equal sign. - -The allowed variables are identical of parameters in official ``zabbix_agent2.conf`` configuration file. For example, ``ZBX_REFRESHACTIVECHECKS`` = ``RefreshActiveChecks``. - -Please use official documentation for [``zabbix_agent2.conf``](https://www.zabbix.com/documentation/current/manual/appendix/config/zabbix_agent2) to get more information about the variables. - -## Allowed volumes for the Zabbix agent 2 container - -### ``/etc/zabbix/zabbix_agentd.d`` - -The volume allows include ``*.conf`` files and extend Zabbix agent 2 using ``UserParameter`` feature. - -### ``/var/lib/zabbix/enc`` - -The volume is used to store TLS related files. These file names are specified using ``ZBX_TLSCAFILE``, ``ZBX_TLSCRLFILE``, ``ZBX_TLSCERTFILE``, ``ZBX_TLSKEYFILE`` and ``ZBX_TLSPSKFILE`` variables. Additionally it is possible to use environment variables ``ZBX_TLSCA``, ``ZBX_TLSCRL``, ``ZBX_TLSCERT``, ``ZBX_TLSKEY`` and ``ZBX_TLSPSK`` with plaintext values. - -### ``/var/lib/zabbix/buffer`` - -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. - -# The image variants - -The `zabbix-agent2` images come in many flavors, each designed for a specific use case. - -## `zabbix-agent2:alpine-` - -This image is based on the popular [Alpine Linux project](http://alpinelinux.org), available in [the `alpine` official image](https://hub.docker.com/_/alpine). Alpine Linux is much smaller than most distribution base images (~5MB), and thus leads to much slimmer images in general. - -This variant is highly recommended when final image size being as small as possible is desired. The main caveat to note is that it does use [musl libc](http://www.musl-libc.org) instead of [glibc and friends](http://www.etalabs.net/compare_libcs.html), so certain software might run into issues depending on the depth of their libc requirements. However, most software doesn't have an issue with this, so this variant is usually a very safe choice. See [this Hacker News comment thread](https://news.ycombinator.com/item?id=10782897) for more discussion of the issues that might arise and some pro/con comparisons of using Alpine-based images. - -To minimize image size, it's uncommon for additional related tools (such as `git` or `bash`) to be included in Alpine-based images. Using this image as a base, add the things you need in your own Dockerfile (see the [`alpine` image description](https://hub.docker.com/_/alpine/) for examples of how to install packages if you are unfamiliar). - -## `zabbix-agent2:ubuntu-` - -This is the defacto image. If you are unsure about what your needs are, you probably want to use this one. It is designed to be used both as a throw away container (mount your source code and start the container to start your app), as well as the base to build other images off of. - -## `zabbix-agent2:ol-` - -Oracle Linux is an open-source operating system available under the GNU General Public License (GPLv2). Suitable for general purpose or Oracle workloads, it benefits from rigorous testing of more than 128,000 hours per day with real-world workloads and includes unique innovations such as Ksplice for zero-downtime kernel patching, DTrace for real-time diagnostics, the powerful Btrfs file system, and more. - -# User Feedback - -## Documentation - -Documentation for this image is stored in the [`agent2/` directory](https://github.com/zabbix/zabbix-docker/tree/7.4/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.4/README.md) before attempting a pull request. - -## Issues - -If you have any problems with or questions about this image, please contact us through a [GitHub issue](https://github.com/zabbix/zabbix-docker/issues). - -### Known issues - -Currently it is not allowed to specify ``ZBX_ALIAS`` environment variable. Please use ``/etc/zabbix/zabbix_agentd.d`` volume with additional configuration files with ``Alias`` options. - -## Contributing - -You are invited to contribute new features, fixes, or updates, large or small; we are always thrilled to receive pull requests, and do our best to process them as fast as we can. - -Before you start to code, we recommend discussing your plans through a [GitHub issue](https://github.com/zabbix/zabbix-docker/issues), especially for more ambitious contributions. This gives other contributors a chance to point you in the right direction, give you feedback on your design, and help you find out if someone else is working on the same thing. - -## License - -Starting from Zabbix version 7.0, all subsequent Zabbix versions will be released under the GNU Affero General Public License version 3 (AGPLv3). -You can modify the relevant version and propagate such modified version under the terms of the AGPLv3 as published by the Free Software Foundation. -For additional details, including answers to common questions about the AGPLv3, see the generic FAQ from the [Free Software Foundation](http://www.fsf.org/licenses/gpl-faq.html). - -Zabbix is Open Source Software, however, if you use Zabbix in a commercial context we kindly ask you to support the development of Zabbix by purchasing some level of technical support. -All previous Zabbix software versions up to 6.4 are released under the GNU General Public License version 2 (GPLv2). The formal terms of the GPLv2 and AGPLv3 can be found at http://www.fsf.org/licenses/. diff --git a/Dockerfiles/agent2/alpine/.dockerignore b/Dockerfiles/agent2/alpine/.dockerignore deleted file mode 100644 index 88a84e55..00000000 --- a/Dockerfiles/agent2/alpine/.dockerignore +++ /dev/null @@ -1 +0,0 @@ -build.sh diff --git a/Dockerfiles/agent2/alpine/Dockerfile b/Dockerfiles/agent2/alpine/Dockerfile deleted file mode 100644 index 09f5ec3f..00000000 --- a/Dockerfiles/agent2/alpine/Dockerfile +++ /dev/null @@ -1,101 +0,0 @@ -# syntax=docker/dockerfile:1.6 -ARG OS_BASE_IMAGE=alpine:3.24 -ARG MAJOR_VERSION=7.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.12 -ARG BUILD_BASE_IMAGE=zabbix-build-mysql:alpine-${ZBX_VERSION} - -FROM ${BUILD_BASE_IMAGE} AS builder - -FROM ${OS_BASE_IMAGE} - -ARG MAJOR_VERSION -ARG ZBX_VERSION -ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git - -ENV TERM=xterm \ - ZBX_VERSION=${ZBX_VERSION} \ - ZBX_SOURCES=${ZBX_SOURCES} \ - ZABBIX_USER_HOME_DIR=/var/lib/zabbix \ - ZABBIX_CONF_DIR=/etc/zabbix - -ENV ZBX_PERSISTENTBUFFERFILE=$ZABBIX_USER_HOME_DIR/buffer/agent2.db \ - ZBX_USERPARAMETERDIR=${ZABBIX_USER_HOME_DIR}/user_scripts - -LABEL org.opencontainers.image.authors="Alexey Pustovalov " \ - org.opencontainers.image.description="Zabbix agent 2 is deployed on a monitoring target to actively monitor local resources and applications" \ - org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ - org.opencontainers.image.licenses="AGPL v3.0" \ - org.opencontainers.image.source="${ZBX_SOURCES}" \ - org.opencontainers.image.title="Zabbix agent 2" \ - org.opencontainers.image.url="https://zabbix.com/" \ - org.opencontainers.image.vendor="Zabbix SIA" \ - org.opencontainers.image.version="${ZBX_VERSION}" - -STOPSIGNAL SIGTERM - -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/agent2/sbin/zabbix_agent2 /usr/sbin/ -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/agent2/sbin/zabbix-agent2-plugin/ /usr/sbin/zabbix-agent2-plugin/ -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/general/bin/zabbix_get /usr/bin/ -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/general/bin/zabbix_sender /usr/bin/ -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/agent2/conf/ ${ZABBIX_CONF_DIR}/ - -RUN set -eux && \ - INSTALL_PKGS="bash \ - coreutils \ - tzdata \ - pcre2 \ - iputils \ - smartmontools \ - sudo" && \ - apk add \ - --no-cache \ - --clean-protected \ - ${INSTALL_PKGS} && \ - addgroup \ - --system \ - --gid 1995 \ - zabbix && \ - adduser \ - --system \ - --gecos "Zabbix monitoring system" \ - --disabled-password \ - --uid 1997 \ - --ingroup zabbix \ - --shell /sbin/nologin \ - --home ${ZABBIX_USER_HOME_DIR}/ \ - zabbix && \ - echo "zabbix ALL=(root) NOPASSWD: /usr/sbin/smartctl" >> /etc/sudoers.d/zabbix && \ - mkdir -p ${ZABBIX_CONF_DIR} \ - ${ZABBIX_CONF_DIR}/zabbix_agentd.d \ - ${ZABBIX_CONF_DIR}/zabbix_agent2.d \ - ${ZABBIX_USER_HOME_DIR} \ - ${ZABBIX_USER_HOME_DIR}/enc \ - ${ZABBIX_USER_HOME_DIR}/enc_internal \ - ${ZABBIX_USER_HOME_DIR}/buffer \ - ${ZBX_USERPARAMETERDIR} && \ - FIX_PERM_LIST="\ - ${ZABBIX_CONF_DIR}/zabbix_agent2_item_keys.conf \ - ${ZABBIX_CONF_DIR}/zabbix_agentd.d/ \ - ${ZABBIX_CONF_DIR}/zabbix_agent2.d/ \ - ${ZABBIX_USER_HOME_DIR}/" && \ - chown --quiet -R zabbix:0 ${FIX_PERM_LIST} && \ - chmod -R g=u ${FIX_PERM_LIST} && \ - chown --quiet zabbix:0 ${ZABBIX_CONF_DIR}/ && \ - chmod g=u ${ZABBIX_CONF_DIR} && \ - /usr/sbin/zabbix_agent2 -V - -RUN --mount=from=entrypoints,target=/tmp/entrypoints,ro \ - set -eux && \ - install -d /usr/lib/docker-entrypoint && \ - install -m 0755 /tmp/entrypoints/agent2.sh /usr/bin/docker-entrypoint.sh && \ - install -m 0644 /tmp/entrypoints/lib/*.sh /usr/lib/docker-entrypoint/ - -EXPOSE 10050/tcp 31999/tcp - -WORKDIR ${ZABBIX_USER_HOME_DIR} - -USER 1997 - -ENTRYPOINT ["/usr/bin/docker-entrypoint.sh"] - -CMD ["/usr/sbin/zabbix_agent2", "--foreground", "-c", "/etc/zabbix/zabbix_agent2.conf"] diff --git a/Dockerfiles/agent2/alpine/README.md b/Dockerfiles/agent2/alpine/README.md deleted file mode 120000 index 32d46ee8..00000000 --- a/Dockerfiles/agent2/alpine/README.md +++ /dev/null @@ -1 +0,0 @@ -../README.md \ No newline at end of file diff --git a/Dockerfiles/agent2/alpine/build.sh b/Dockerfiles/agent2/alpine/build.sh deleted file mode 120000 index 46b20313..00000000 --- a/Dockerfiles/agent2/alpine/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../../build.sh \ No newline at end of file diff --git a/Dockerfiles/agent2/centos/.dockerignore b/Dockerfiles/agent2/centos/.dockerignore deleted file mode 100644 index 88a84e55..00000000 --- a/Dockerfiles/agent2/centos/.dockerignore +++ /dev/null @@ -1 +0,0 @@ -build.sh diff --git a/Dockerfiles/agent2/centos/Dockerfile b/Dockerfiles/agent2/centos/Dockerfile deleted file mode 100644 index 37fb4a17..00000000 --- a/Dockerfiles/agent2/centos/Dockerfile +++ /dev/null @@ -1,117 +0,0 @@ -# syntax=docker/dockerfile:1.6 -ARG OS_BASE_IMAGE=quay.io/centos/centos:stream10-minimal -ARG MAJOR_VERSION=7.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.12 -ARG BUILD_BASE_IMAGE=zabbix-build-mysql:centos-${ZBX_VERSION} - -FROM ${BUILD_BASE_IMAGE} AS builder - -FROM ${OS_BASE_IMAGE} - -ARG MAJOR_VERSION -ARG ZBX_VERSION -ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git - -ENV TERM=xterm \ - ZBX_VERSION=${ZBX_VERSION} \ - ZBX_SOURCES=${ZBX_SOURCES} \ - ZABBIX_USER_HOME_DIR=/var/lib/zabbix \ - ZABBIX_CONF_DIR=/etc/zabbix - -ENV ZBX_PERSISTENTBUFFERFILE=$ZABBIX_USER_HOME_DIR/buffer/agent2.db \ - ZBX_USERPARAMETERDIR=${ZABBIX_USER_HOME_DIR}/user_scripts - -LABEL org.opencontainers.image.authors="Alexey Pustovalov " \ - org.opencontainers.image.description="Zabbix agent 2 is deployed on a monitoring target to actively monitor local resources and applications" \ - org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ - org.opencontainers.image.licenses="AGPL v3.0" \ - org.opencontainers.image.source="${ZBX_SOURCES}" \ - org.opencontainers.image.title="Zabbix agent 2" \ - org.opencontainers.image.url="https://zabbix.com/" \ - org.opencontainers.image.vendor="Zabbix SIA" \ - org.opencontainers.image.version="${ZBX_VERSION}" - -STOPSIGNAL SIGTERM - -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/agent2/sbin/zabbix_agent2 /usr/sbin/ -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/agent2/sbin/zabbix-agent2-plugin/ /usr/sbin/zabbix-agent2-plugin/ -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/general/bin/zabbix_get /usr/bin/ -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/general/bin/zabbix_sender /usr/bin/ -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/agent2/conf/ ${ZABBIX_CONF_DIR}/ - -RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ - --mount=type=tmpfs,target=/var/cache/yum/ \ - set -eux && \ - INSTALL_PKGS="bash \ - shadow-utils \ - libcurl-minimal \ - openssl-libs \ - pcre2 \ - iputils \ - smartmontools \ - sudo" && \ - microdnf -y install \ - --disablerepo="*" \ - --enablerepo="extras-common" \ - --setopt=install_weak_deps=0 \ - --setopt=keepcache=0 \ - --best \ - --nodocs \ - epel-release && \ - microdnf -y install \ - --disablerepo="*" \ - --enablerepo="baseos" \ - --enablerepo="appstream" \ - --enablerepo="epel" \ - --setopt=install_weak_deps=0 \ - --setopt=keepcache=0 \ - --best \ - --nodocs \ - ${INSTALL_PKGS} && \ - groupadd \ - --system \ - --gid 1995 \ - zabbix && \ - useradd \ - --system \ - --comment "Zabbix monitoring system" \ - -g zabbix \ - --uid 1997 \ - --shell /sbin/nologin \ - --home-dir ${ZABBIX_USER_HOME_DIR} \ - zabbix && \ - echo "zabbix ALL=(root) NOPASSWD: /usr/sbin/smartctl" >> /etc/sudoers.d/zabbix && \ - mkdir -p ${ZABBIX_CONF_DIR} \ - ${ZABBIX_CONF_DIR}/zabbix_agentd.d \ - ${ZABBIX_CONF_DIR}/zabbix_agent2.d \ - ${ZABBIX_USER_HOME_DIR} \ - ${ZABBIX_USER_HOME_DIR}/enc \ - ${ZABBIX_USER_HOME_DIR}/enc_internal \ - ${ZABBIX_USER_HOME_DIR}/buffer \ - ${ZBX_USERPARAMETERDIR} && \ - FIX_PERM_LIST="\ - ${ZABBIX_CONF_DIR}/zabbix_agent2_item_keys.conf \ - ${ZABBIX_CONF_DIR}/zabbix_agentd.d/ \ - ${ZABBIX_CONF_DIR}/zabbix_agent2.d/ \ - ${ZABBIX_USER_HOME_DIR}/" && \ - chown --quiet -R zabbix:0 ${FIX_PERM_LIST} && \ - chmod -R g=u ${FIX_PERM_LIST} && \ - chown --quiet zabbix:0 ${ZABBIX_CONF_DIR}/ && \ - chmod g=u ${ZABBIX_CONF_DIR} && \ - /usr/sbin/zabbix_agent2 -V - -RUN --mount=from=entrypoints,target=/tmp/entrypoints,ro \ - set -eux && \ - install -d /usr/lib/docker-entrypoint && \ - install -m 0755 /tmp/entrypoints/agent2.sh /usr/bin/docker-entrypoint.sh && \ - install -m 0644 /tmp/entrypoints/lib/*.sh /usr/lib/docker-entrypoint/ - -EXPOSE 10050/tcp 31999/tcp - -WORKDIR ${ZABBIX_USER_HOME_DIR} - -USER 1997 - -ENTRYPOINT ["/usr/bin/docker-entrypoint.sh"] - -CMD ["/usr/sbin/zabbix_agent2", "--foreground", "-c", "/etc/zabbix/zabbix_agent2.conf"] diff --git a/Dockerfiles/agent2/centos/README.md b/Dockerfiles/agent2/centos/README.md deleted file mode 120000 index 32d46ee8..00000000 --- a/Dockerfiles/agent2/centos/README.md +++ /dev/null @@ -1 +0,0 @@ -../README.md \ No newline at end of file diff --git a/Dockerfiles/agent2/centos/build.sh b/Dockerfiles/agent2/centos/build.sh deleted file mode 120000 index 46b20313..00000000 --- a/Dockerfiles/agent2/centos/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../../build.sh \ No newline at end of file diff --git a/Dockerfiles/agent2/ol/.dockerignore b/Dockerfiles/agent2/ol/.dockerignore deleted file mode 100644 index 88a84e55..00000000 --- a/Dockerfiles/agent2/ol/.dockerignore +++ /dev/null @@ -1 +0,0 @@ -build.sh diff --git a/Dockerfiles/agent2/ol/Dockerfile b/Dockerfiles/agent2/ol/Dockerfile deleted file mode 100644 index 55c207d4..00000000 --- a/Dockerfiles/agent2/ol/Dockerfile +++ /dev/null @@ -1,116 +0,0 @@ -# syntax=docker/dockerfile:1.6 -ARG OS_BASE_IMAGE=container-registry.oracle.com/os/oraclelinux:10-slim -ARG MAJOR_VERSION=7.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.12 -ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ol-${ZBX_VERSION} - -FROM ${BUILD_BASE_IMAGE} AS builder - -FROM ${OS_BASE_IMAGE} - -ARG MAJOR_VERSION -ARG ZBX_VERSION -ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git - -ENV TERM=xterm \ - ZBX_VERSION=${ZBX_VERSION} \ - ZBX_SOURCES=${ZBX_SOURCES} \ - ZABBIX_USER_HOME_DIR=/var/lib/zabbix \ - ZABBIX_CONF_DIR=/etc/zabbix - -ENV ZBX_PERSISTENTBUFFERFILE=$ZABBIX_USER_HOME_DIR/buffer/agent2.db \ - ZBX_USERPARAMETERDIR=${ZABBIX_USER_HOME_DIR}/user_scripts - -LABEL org.opencontainers.image.authors="Alexey Pustovalov " \ - org.opencontainers.image.description="Zabbix agent 2 is deployed on a monitoring target to actively monitor local resources and applications" \ - org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ - org.opencontainers.image.licenses="AGPL v3.0" \ - org.opencontainers.image.source="${ZBX_SOURCES}" \ - org.opencontainers.image.title="Zabbix agent 2" \ - org.opencontainers.image.url="https://zabbix.com/" \ - org.opencontainers.image.vendor="Zabbix SIA" \ - org.opencontainers.image.version="${ZBX_VERSION}" - -STOPSIGNAL SIGTERM - -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/agent2/sbin/zabbix_agent2 /usr/sbin/ -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/agent2/sbin/zabbix-agent2-plugin/ /usr/sbin/zabbix-agent2-plugin/ -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/general/bin/zabbix_get /usr/bin/ -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/general/bin/zabbix_sender /usr/bin/ -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/agent2/conf/ ${ZABBIX_CONF_DIR}/ - -RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ - --mount=type=tmpfs,target=/var/cache/yum/ \ - set -eux && \ - INSTALL_PKGS="bash \ - libcurl \ - openssl-libs \ - pcre2 \ - iputils \ - smartmontools \ - sudo" && \ - microdnf -y install \ - --disablerepo="*" \ - --enablerepo="ol10_baseos_latest" \ - --setopt=install_weak_deps=0 \ - --setopt=keepcache=0 \ - --best \ - --nodocs \ - oracle-epel-release-el10 && \ - microdnf -y install \ - --disablerepo="*" \ - --enablerepo="ol10_baseos_latest" \ - --enablerepo="ol10_appstream" \ - --enablerepo="ol10_u1_developer_EPEL" \ - --setopt=install_weak_deps=0 \ - --setopt=keepcache=0 \ - --best \ - --nodocs \ - ${INSTALL_PKGS} && \ - groupadd \ - --system \ - --gid 1995 \ - zabbix && \ - useradd \ - --system \ - --comment "Zabbix monitoring system" \ - -g zabbix \ - --uid 1997 \ - --shell /sbin/nologin \ - --home-dir ${ZABBIX_USER_HOME_DIR} \ - zabbix && \ - echo "zabbix ALL=(root) NOPASSWD: /usr/sbin/smartctl" >> /etc/sudoers.d/zabbix && \ - mkdir -p ${ZABBIX_CONF_DIR} \ - ${ZABBIX_CONF_DIR}/zabbix_agentd.d \ - ${ZABBIX_CONF_DIR}/zabbix_agent2.d \ - ${ZABBIX_USER_HOME_DIR} \ - ${ZABBIX_USER_HOME_DIR}/enc \ - ${ZABBIX_USER_HOME_DIR}/enc_internal \ - ${ZABBIX_USER_HOME_DIR}/buffer \ - ${ZBX_USERPARAMETERDIR} && \ - FIX_PERM_LIST="\ - ${ZABBIX_CONF_DIR}/zabbix_agent2_item_keys.conf \ - ${ZABBIX_CONF_DIR}/zabbix_agentd.d/ \ - ${ZABBIX_CONF_DIR}/zabbix_agent2.d/ \ - ${ZABBIX_USER_HOME_DIR}/" && \ - chown --quiet -R zabbix:0 ${FIX_PERM_LIST} && \ - chmod -R g=u ${FIX_PERM_LIST} && \ - chown --quiet zabbix:0 ${ZABBIX_CONF_DIR}/ && \ - chmod g=u ${ZABBIX_CONF_DIR} && \ - /usr/sbin/zabbix_agent2 -V - -RUN --mount=from=entrypoints,target=/tmp/entrypoints,ro \ - set -eux && \ - install -d /usr/lib/docker-entrypoint && \ - install -m 0755 /tmp/entrypoints/agent2.sh /usr/bin/docker-entrypoint.sh && \ - install -m 0644 /tmp/entrypoints/lib/*.sh /usr/lib/docker-entrypoint/ - -EXPOSE 10050/tcp 31999/tcp - -WORKDIR ${ZABBIX_USER_HOME_DIR} - -USER 1997 - -ENTRYPOINT ["/usr/bin/docker-entrypoint.sh"] - -CMD ["/usr/sbin/zabbix_agent2", "--foreground", "-c", "/etc/zabbix/zabbix_agent2.conf"] diff --git a/Dockerfiles/agent2/ol/README.md b/Dockerfiles/agent2/ol/README.md deleted file mode 120000 index 32d46ee8..00000000 --- a/Dockerfiles/agent2/ol/README.md +++ /dev/null @@ -1 +0,0 @@ -../README.md \ No newline at end of file diff --git a/Dockerfiles/agent2/ol/build.sh b/Dockerfiles/agent2/ol/build.sh deleted file mode 120000 index 46b20313..00000000 --- a/Dockerfiles/agent2/ol/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../../build.sh \ No newline at end of file diff --git a/Dockerfiles/agent2/rhel/.dockerignore b/Dockerfiles/agent2/rhel/.dockerignore deleted file mode 100644 index 88a84e55..00000000 --- a/Dockerfiles/agent2/rhel/.dockerignore +++ /dev/null @@ -1 +0,0 @@ -build.sh diff --git a/Dockerfiles/agent2/rhel/Dockerfile b/Dockerfiles/agent2/rhel/Dockerfile deleted file mode 100644 index 058f08d6..00000000 --- a/Dockerfiles/agent2/rhel/Dockerfile +++ /dev/null @@ -1,126 +0,0 @@ -# syntax=docker/dockerfile:1.6 -ARG OS_BASE_IMAGE=registry.access.redhat.com/ubi10/ubi-minimal:10.2 -ARG MAJOR_VERSION=7.4 -ARG RELEASE=12 -ARG ZBX_VERSION=${MAJOR_VERSION}.12 -ARG BUILD_BASE_IMAGE=zabbix-build-mysql:rhel-${ZBX_VERSION} - -FROM ${BUILD_BASE_IMAGE} AS builder - -FROM ${OS_BASE_IMAGE} - -ARG MAJOR_VERSION -ARG RELEASE -ARG ZBX_VERSION -ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git - -ENV TERM=xterm \ - ZBX_VERSION=${ZBX_VERSION} \ - ZBX_SOURCES=${ZBX_SOURCES} \ - ZABBIX_USER_HOME_DIR=/var/lib/zabbix \ - ZABBIX_CONF_DIR=/etc/zabbix - -ENV ZBX_PERSISTENTBUFFERFILE=$ZABBIX_USER_HOME_DIR/buffer/agent2.db \ - ZBX_USERPARAMETERDIR=${ZABBIX_USER_HOME_DIR}/user_scripts - -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-74" \ - release="${RELEASE}" \ - run="docker run --name zabbix-agent2 --link zabbix-server:zabbix-server -p 10050:10050 -d registry.connect.redhat.com/zabbix/zabbix-agent2-74:${ZBX_VERSION}" \ - summary="Zabbix agent" \ - url="https://www.zabbix.com/" \ - vendor="Zabbix SIA" \ - version="${MAJOR_VERSION}" \ - io.k8s.description="Zabbix agent 2 is deployed on a monitoring target to actively monitor local resources and applications" \ - io.k8s.display-name="Zabbix Agent 2" \ - io.openshift.expose-services="10050:10050" \ - 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-74:${ZBX_VERSION}" \ - org.label-schema.license="AGPL v3.0" \ - org.label-schema.name="zabbix-agent2-rhel" \ - org.label-schema.schema-version="1.0" \ - org.label-schema.url="https://zabbix.com/" \ - org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ - org.label-schema.vcs-ref="${VCS_REF}" \ - org.label-schema.vcs-url="${ZBX_SOURCES}" \ - org.label-schema.vendor="Zabbix SIA" \ - org.label-schema.version="${ZBX_VERSION}" - -STOPSIGNAL SIGTERM - -COPY licenses /licenses/ -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/agent2/sbin/zabbix_agent2 /usr/sbin/ -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/agent2/sbin/zabbix-agent2-plugin/ /usr/sbin/zabbix-agent2-plugin/ -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/general/bin/zabbix_get /usr/bin/ -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/general/bin/zabbix_sender /usr/bin/ -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/agent2/conf/ ${ZABBIX_CONF_DIR}/ - -RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ - --mount=type=tmpfs,target=/var/cache/yum/ \ - set -eux && \ - INSTALL_PKGS="bash \ - shadow-utils \ - tzdata \ - libcurl-minimal \ - pcre2 \ - iputils \ - smartmontools \ - sudo" && \ - microdnf -y install \ - --disablerepo="*" \ - --enablerepo="ubi-10-baseos-rpms" \ - --setopt=install_weak_deps=0 \ - --setopt=keepcache=0 \ - --best \ - --setopt=tsflags=nodocs \ - ${INSTALL_PKGS} && \ - groupadd \ - --system \ - --gid 1995 \ - zabbix && \ - useradd \ - --system \ - --comment "Zabbix monitoring system" \ - -g zabbix \ - --uid 1997 \ - --shell /sbin/nologin \ - --home-dir ${ZABBIX_USER_HOME_DIR} \ - zabbix && \ - echo "zabbix ALL=(root) NOPASSWD: /usr/sbin/smartctl" >> /etc/sudoers.d/zabbix && \ - mkdir -p ${ZABBIX_CONF_DIR} \ - ${ZABBIX_CONF_DIR}/zabbix_agentd.d \ - ${ZABBIX_CONF_DIR}/zabbix_agent2.d \ - ${ZABBIX_USER_HOME_DIR} \ - ${ZABBIX_USER_HOME_DIR}/enc \ - ${ZABBIX_USER_HOME_DIR}/enc_internal \ - ${ZABBIX_USER_HOME_DIR}/buffer \ - ${ZBX_USERPARAMETERDIR} && \ - FIX_PERM_LIST="\ - ${ZABBIX_CONF_DIR}/zabbix_agent2_item_keys.conf \ - ${ZABBIX_CONF_DIR}/zabbix_agentd.d/ \ - ${ZABBIX_CONF_DIR}/zabbix_agent2.d/ \ - ${ZABBIX_USER_HOME_DIR}/" && \ - chown --quiet -R zabbix:0 ${FIX_PERM_LIST} && \ - chmod -R g=u ${FIX_PERM_LIST} && \ - chown --quiet zabbix:0 ${ZABBIX_CONF_DIR}/ && \ - chmod g=u ${ZABBIX_CONF_DIR} && \ - /usr/sbin/zabbix_agent2 -V - -RUN --mount=from=entrypoints,target=/tmp/entrypoints,ro \ - set -eux && \ - install -d /usr/lib/docker-entrypoint && \ - install -m 0755 /tmp/entrypoints/agent2.sh /usr/bin/docker-entrypoint.sh && \ - install -m 0644 /tmp/entrypoints/lib/*.sh /usr/lib/docker-entrypoint/ - -EXPOSE 10050/tcp 31999/tcp - -WORKDIR ${ZABBIX_USER_HOME_DIR} - -USER 1997 - -ENTRYPOINT ["/usr/bin/docker-entrypoint.sh"] - -CMD ["/usr/sbin/zabbix_agent2", "--foreground", "-c", "/etc/zabbix/zabbix_agent2.conf"] diff --git a/Dockerfiles/agent2/rhel/Dockerfile.cuda b/Dockerfiles/agent2/rhel/Dockerfile.cuda deleted file mode 100644 index 331a9f90..00000000 --- a/Dockerfiles/agent2/rhel/Dockerfile.cuda +++ /dev/null @@ -1,144 +0,0 @@ -# syntax=docker/dockerfile:1.6 -ARG OS_BASE_IMAGE=nvidia/cuda:12.9.0-base-ubi9 -ARG MAJOR_VERSION=7.4 -ARG RELEASE=12 -ARG ZBX_VERSION=${MAJOR_VERSION}.12 -ARG BUILD_BASE_IMAGE=registry.connect.redhat.com/zabbix/zabbix-agent2-74:${ZBX_VERSION} - -FROM ${BUILD_BASE_IMAGE} AS builder - -FROM ${OS_BASE_IMAGE} - -ARG MAJOR_VERSION -ARG RELEASE -ARG ZBX_VERSION -ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git - -ENV TERM=xterm \ - ZBX_VERSION=${ZBX_VERSION} \ - ZBX_SOURCES=${ZBX_SOURCES} \ - ZABBIX_USER_HOME_DIR=/var/lib/zabbix \ - ZABBIX_CONF_DIR=/etc/zabbix - -ENV ZBX_PERSISTENTBUFFERFILE=$ZABBIX_USER_HOME_DIR/buffer/agent2.db \ - ZBX_USERPARAMETERDIR=${ZABBIX_USER_HOME_DIR}/user_scripts - -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-74" \ - release="${RELEASE}" \ - run="docker run --name zabbix-agent2 --link zabbix-server:zabbix-server -p 10050:10050 -d registry.connect.redhat.com/zabbix/zabbix-agent2-74:${ZBX_VERSION}" \ - summary="Zabbix agent" \ - url="https://www.zabbix.com/" \ - vendor="Zabbix SIA" \ - version="${MAJOR_VERSION}" \ - io.k8s.description="Zabbix agent 2 is deployed on a monitoring target to actively monitor local resources and applications" \ - io.k8s.display-name="Zabbix Agent 2" \ - io.openshift.expose-services="10050:10050" \ - 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-74:${ZBX_VERSION}" \ - org.label-schema.license="AGPL v3.0" \ - org.label-schema.name="zabbix-agent2-rhel" \ - org.label-schema.schema-version="1.0" \ - org.label-schema.url="https://zabbix.com/" \ - org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ - org.label-schema.vcs-ref="${VCS_REF}" \ - org.label-schema.vcs-url="${ZBX_SOURCES}" \ - org.label-schema.vendor="Zabbix SIA" \ - org.label-schema.version="${ZBX_VERSION}" - -STOPSIGNAL SIGTERM - -COPY licenses /licenses/ -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/agent2/sbin/zabbix_agent2 /usr/sbin/ -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/agent2/sbin/zabbix-agent2-plugin/ /usr/sbin/zabbix-agent2-plugin/ -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/general/bin/zabbix_get /usr/bin/ -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/general/bin/zabbix_sender /usr/bin/ -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/agent2/conf/ ${ZABBIX_CONF_DIR}/ - -RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ - --mount=type=tmpfs,target=/var/cache/yum/ \ - set -eux && \ - INSTALL_PKGS="bash \ - shadow-utils \ - libcurl-minimal \ - pcre2 \ - iputils \ - smartmontools \ - sudo" && \ - dnf -y install \ - --disableplugin=subscription-manager \ - --disablerepo="*" \ - --enablerepo="ubi-9-baseos-rpms" \ - --setopt=install_weak_deps=0 \ - --setopt=keepcache=0 \ - --best \ - --setopt=tsflags=nodocs \ - ${INSTALL_PKGS} && \ - dnf -y update \ - --disableplugin=subscription-manager \ - --disablerepo="*" \ - --enablerepo="ubi-9-baseos-rpms" \ - --setopt=install_weak_deps=0 \ - --best \ - --setopt=tsflags=nodocs \ - tzdata && \ - dnf -y reinstall \ - --disableplugin=subscription-manager \ - --disablerepo="*" \ - --enablerepo="ubi-9-baseos-rpms" \ - --setopt=install_weak_deps=0 \ - --setopt=keepcache=0 \ - --best \ - --setopt=tsflags=nodocs \ - tzdata && \ - groupadd \ - --system \ - --gid 1995 \ - zabbix && \ - useradd \ - --system \ - --comment "Zabbix monitoring system" \ - -g zabbix \ - --uid 1997 \ - --shell /sbin/nologin \ - --home-dir ${ZABBIX_USER_HOME_DIR} \ - zabbix && \ - echo "zabbix ALL=(root) NOPASSWD: /usr/sbin/smartctl" >> /etc/sudoers.d/zabbix && \ - ln -s /usr/lib64/libnvidia-ml.so.1 /usr/lib64/libnvidia-ml.so && \ - mkdir -p ${ZABBIX_CONF_DIR} \ - ${ZABBIX_CONF_DIR}/zabbix_agentd.d \ - ${ZABBIX_CONF_DIR}/zabbix_agent2.d \ - ${ZABBIX_USER_HOME_DIR} \ - ${ZABBIX_USER_HOME_DIR}/enc \ - ${ZABBIX_USER_HOME_DIR}/enc_internal \ - ${ZABBIX_USER_HOME_DIR}/buffer \ - ${ZBX_USERPARAMETERDIR} && \ - FIX_PERM_LIST="\ - ${ZABBIX_CONF_DIR}/zabbix_agent2_item_keys.conf \ - ${ZABBIX_CONF_DIR}/zabbix_agentd.d/ \ - ${ZABBIX_CONF_DIR}/zabbix_agent2.d/ \ - ${ZABBIX_USER_HOME_DIR}/" && \ - chown --quiet -R zabbix:0 ${FIX_PERM_LIST} && \ - chmod -R g=u ${FIX_PERM_LIST} && \ - chown --quiet zabbix:0 ${ZABBIX_CONF_DIR}/ && \ - chmod g=u ${ZABBIX_CONF_DIR} && \ - /usr/sbin/zabbix_agent2 -V - -RUN --mount=from=entrypoints,target=/tmp/entrypoints,ro \ - set -eux && \ - install -d /usr/lib/docker-entrypoint && \ - install -m 0755 /tmp/entrypoints/agent2.sh /usr/bin/docker-entrypoint.sh && \ - install -m 0644 /tmp/entrypoints/lib/*.sh /usr/lib/docker-entrypoint/ - -EXPOSE 10050/tcp 31999/tcp - -WORKDIR ${ZABBIX_USER_HOME_DIR} - -ENTRYPOINT ["/usr/bin/docker-entrypoint.sh"] - -USER 1997 - -CMD ["/usr/sbin/zabbix_agent2", "--foreground", "-c", "/etc/zabbix/zabbix_agent2.conf"] diff --git a/Dockerfiles/agent2/rhel/README.html b/Dockerfiles/agent2/rhel/README.html deleted file mode 100644 index dd4dc383..00000000 --- a/Dockerfiles/agent2/rhel/README.html +++ /dev/null @@ -1,142 +0,0 @@ -

What is Zabbix?

-

Zabbix is an enterprise-class open source distributed monitoring solution.

-

Zabbix is software that monitors numerous parameters of a network and the health and integrity of servers. Zabbix uses a flexible notification mechanism that allows users to configure e-mail based alerts for virtually any event. This allows a fast reaction to server problems. Zabbix offers excellent reporting and data visualisation features based on the stored data. This makes Zabbix ideal for capacity planning.

-

For more information and related downloads for Zabbix components, please visit zabbix.com

-

What is Zabbix agent 2?

-

Zabbix agent 2 is deployed on a monitoring target to actively monitor local resources and applications (hard drives, memory, processor statistics etc).

-

Zabbix agent 2 images

-

Images are updated when new releases are published.

-

How to use this image

-

Start zabbix-agent2

-

Start a Zabbix agent 2 container as follows:

-
podman run \
-    --name some-zabbix-agent \
-    -e ZBX_HOSTNAME="some-hostname" \
-    -e ZBX_SERVER_HOST="some-zabbix-server" \
-    --init \
-    -d registry.connect.redhat.com/zabbix/zabbix-agent2-74:tag
-
-

Where some-zabbix-agent2 is the name you want to assign to your container, some-hostname is the hostname, it is Hostname parameter in Zabbix agent 2 configuration file, some-zabbix-server is IP or DNS name of Zabbix server or proxy and tag is the tag specifying the version you want.

-

Connects from Zabbix server or Zabbix proxy in other containers (Passive checks)

-

This image exposes the standard Zabbix agent 2 port (10050) to perform passive checks, so container linking makes Zabbix agent 2 instance available to Zabbix server and Zabbix proxy containers. Start your application container like this in order to link it to the Zabbix agent 2 container:

-
$ podman run \
-    --name some-zabbix-server \
-    --link some-zabbix-agent:zabbix-agent2 \
-    --init \
-    -d zabbix/zabbix-server:latest
-
-

Connect to Zabbix server or Zabbix proxy containers (Active checks)

-

This image supports perform active checks, so container linking makes Zabbix server and Zabbix proxy containers available to Zabbix agent 2 instance. Start your application container like this in order to link Zabbix agent 2 to Zabbix server or Zabbix proxy containers:

-
$ podman run \
-    --name some-zabbix-agent \
-    --link some-zabbix-server:zabbix-server \
-    --init \
-    -d registry.connect.redhat.com/zabbix/zabbix-agent2-74:latest
-
-

Container shell access and viewing Zabbix agent 2 logs

-

The podman exec command allows you to run commands inside a Podman container. The following command line will give you a bash shell inside your zabbix-agent2 container:

-
$ podman exec -ti some-zabbix-agent /bin/bash
-
-

The Zabbix agent 2 log is available through Podman's container log:

-
$ podman logs some-zabbix-agent
-
-

Privileged mode

-

By default, Podman containers are "unprivileged" and do not have access to the most of host resources. Zabbix agent 2 is designed to monitor system resources, to do that Zabbix agent 2 container must be privileged or you may mount some system-wide volumes. For example:

-
$ podman run \
-    --name some-zabbix-agent \
-    --link some-zabbix-server:zabbix-server \
-    --privileged \
-    --init \
-    -d registry.connect.redhat.com/zabbix/zabbix-agent2-74:latest
-
-
$ podman run \
-    --name some-zabbix-agent \
-    --link some-zabbix-server:zabbix-server \
-    -v /dev/sdc:/dev/sdc \
-    --init \
-    -d registry.connect.redhat.com/zabbix/zabbix-agent2-74:latest
-
-

Environment Variables

-

When you start the zabbix-agent2 image, you can adjust the configuration of the Zabbix agent 2 by passing one or more environment variables on the podman run command line.

-

ZBX_HOSTNAME

-

This variable is unique, case sensitive hostname. By default, value is hostname of the container. It is Hostname parameter in zabbix_agent2.conf.

-

ZBX_SERVER_HOST

-

This variable is IP or DNS name of Zabbix server or Zabbix proxy. By default, value is zabbix-server. It is Server parameter in zabbix_agent2.conf. It is allowed to specify Zabbix server or Zabbix proxy port number using ZBX_SERVER_PORT variable. It make sense in case of non-default port for active checks.

-

ZBX_PASSIVE_ALLOW

-

This variable is boolean (true or false) and enables or disables feature of passive checks. By default, value is true.

-

ZBX_PASSIVESERVERS

-

The variable is comma separated list of allowed Zabbix server or proxy hosts for connections to Zabbix agent 2 container.

-

ZBX_ACTIVE_ALLOW

-

This variable is boolean (true or false) and enables or disables feature of active checks. By default, value is true.

-

ZBX_ACTIVESERVERS

-

The variable is comma separated list of allowed Zabbix server or proxy hosts for connections to Zabbix agent 2 container. You may specify port of Zabbix server or Zabbix proxy in such syntax: zabbix-server:10061,zabbix-proxy:10072.

-

ZBX_DEBUGLEVEL

-

The variable is used to specify debug level. By default, value is 3. It is DebugLevel parameter in zabbix_agent2.conf. Allowed values are listed below:

-
    -
  • 0 - basic information about starting and stopping of Zabbix processes;
    • -
  • 1 - critical information
    • -
  • 2 - error information
    • -
  • 3 - warnings
    • -
  • 4 - for debugging (produces lots of information)
    • -
  • 5 - extended debugging (produces even more information)
    • -
-

ZBX_TIMEOUT

-

The variable is used to specify timeout for processing checks. By default, value is 3.

-

Other variables

-

Additionally the image allows to specify many other environment variables listed below:

-
ZBX_ENABLEPERSISTENTBUFFER=false # Available since 5.0.0
-ZBX_PERSISTENTBUFFERPERIOD=1h # Available since 5.0.0
-ZBX_ENABLESTATUSPORT=
-ZBX_SOURCEIP=
-ZBX_HEARTBEAT_FREQUENCY=60 # Available since 6.2.0
-ZBX_ENABLEREMOTECOMMANDS=0 # Deprecated since 5.0.0
-ZBX_LOGREMOTECOMMANDS=0
-ZBX_FORCEACTIVECHECKSONSTART=0 # Available since 6.0.2
-ZBX_HOSTINTERFACE= # Available since 4.4.0
-ZBX_HOSTINTERFACEITEM= # Available since 4.4.0
-ZBX_HOSTNAMEITEM=system.hostname
-ZBX_METADATA=
-ZBX_METADATAITEM=
-ZBX_REFRESHACTIVECHECKS=5
-ZBX_BUFFERSEND=5
-ZBX_BUFFERSIZE=1000
-ZBX_MAXLINESPERSECOND=20
-ZBX_EVENTLOGMAXLINESPERSECOND=20 # Windows only
-ZBX_LISTENIP=
-ZBX_LISTENPORT=10050
-ZBX_PLUGINTIMEOUT=
-ZBX_UNSAFEUSERPARAMETERS=0
-ZBX_TLSCONNECT=unencrypted
-ZBX_TLSACCEPT=unencrypted
-ZBX_TLSCAFILE=
-ZBX_TLSCA=
-ZBX_TLSCRLFILE=
-ZBX_TLSCRL=
-ZBX_TLSSERVERCERTISSUER=
-ZBX_TLSSERVERCERTSUBJECT=
-ZBX_TLSCERTFILE=
-ZBX_TLSCERT=
-ZBX_TLSKEYFILE=
-ZBX_TLSKEY=
-ZBX_TLSPSKIDENTITY=
-ZBX_TLSPSKFILE=
-ZBX_TLSPSK=
-ZBX_TLSCIPHERALL=
-ZBX_TLSCIPHERALL13=
-ZBX_TLSCIPHERCERT=
-ZBX_TLSCIPHERCERT13=
-ZBX_TLSCIPHERPSK=
-ZBX_TLSCIPHERPSK13=
-ZBX_DENYKEY=system.run[*] # Available since 5.0.0
-ZBX_ALLOWKEY= # Available since 5.0.0
-
-

Default values of these variables are specified after equal sign.

-

The allowed variables are identical of parameters in official zabbix_agent2.conf configuration file. For example, ZBX_REFRESHACTIVECHECKS = RefreshActiveChecks.

-

Please use official documentation for zabbix_agent2.conf to get more information about the variables.

-

Allowed volumes for the Zabbix agent 2 container

-

/etc/zabbix/zabbix_agentd.d

-

The volume allows include *.conf files and extend Zabbix agent 2 using UserParameter feature.

-

/var/lib/zabbix/enc

-

The volume is used to store TLS related files. These file names are specified using ZBX_TLSCAFILE, ZBX_TLSCRLFILE, ZBX_TLSCERTFILE, ZBX_TLSKEYFILE and ZBX_TLSPSKFILE variables. Additionally it is possible to use environment variables ZBX_TLSCA, ZBX_TLSCRL, ZBX_TLSCERT, ZBX_TLSKEY and ZBX_TLSPSK with plaintext values.

-

/var/lib/zabbix/buffer

-

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.

diff --git a/Dockerfiles/agent2/rhel/build.sh b/Dockerfiles/agent2/rhel/build.sh deleted file mode 120000 index 46b20313..00000000 --- a/Dockerfiles/agent2/rhel/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../../build.sh \ No newline at end of file diff --git a/Dockerfiles/agent2/rhel/licenses/AGPL-v3.0.txt b/Dockerfiles/agent2/rhel/licenses/AGPL-v3.0.txt deleted file mode 100644 index be3f7b28..00000000 --- a/Dockerfiles/agent2/rhel/licenses/AGPL-v3.0.txt +++ /dev/null @@ -1,661 +0,0 @@ - GNU AFFERO GENERAL PUBLIC LICENSE - Version 3, 19 November 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU Affero General Public License is a free, copyleft license for -software and other kinds of works, specifically designed to ensure -cooperation with the community in the case of network server software. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -our General Public Licenses are intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - Developers that use our General Public Licenses protect your rights -with two steps: (1) assert copyright on the software, and (2) offer -you this License which gives you legal permission to copy, distribute -and/or modify the software. - - A secondary benefit of defending all users' freedom is that -improvements made in alternate versions of the program, if they -receive widespread use, become available for other developers to -incorporate. Many developers of free software are heartened and -encouraged by the resulting cooperation. However, in the case of -software used on network servers, this result may fail to come about. -The GNU General Public License permits making a modified version and -letting the public access it on a server without ever releasing its -source code to the public. - - The GNU Affero General Public License is designed specifically to -ensure that, in such cases, the modified source code becomes available -to the community. It requires the operator of a network server to -provide the source code of the modified version running there to the -users of that server. Therefore, public use of a modified version, on -a publicly accessible server, gives the public access to the source -code of the modified version. - - An older license, called the Affero General Public License and -published by Affero, was designed to accomplish similar goals. This is -a different license, not a version of the Affero GPL, but Affero has -released a new version of the Affero GPL which permits relicensing under -this license. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU Affero General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Remote Network Interaction; Use with the GNU General Public License. - - Notwithstanding any other provision of this License, if you modify the -Program, your modified version must prominently offer all users -interacting with it remotely through a computer network (if your version -supports such interaction) an opportunity to receive the Corresponding -Source of your version by providing access to the Corresponding Source -from a network server at no charge, through some standard or customary -means of facilitating copying of software. This Corresponding Source -shall include the Corresponding Source for any work covered by version 3 -of the GNU General Public License that is incorporated pursuant to the -following paragraph. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the work with which it is combined will remain governed by version -3 of the GNU General Public License. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU Affero General Public License from time to time. Such new versions -will be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU Affero General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU Affero General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU Affero General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Affero General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Affero General Public License for more details. - - You should have received a copy of the GNU Affero General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If your software can interact with users remotely through a computer -network, you should also make sure that it provides a way for users to -get its source. For example, if your program is a web application, its -interface could display a "Source" link that leads users to an archive -of the code. There are many ways you could offer source, and different -solutions will be better for different programs; see section 13 for the -specific requirements. - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU AGPL, see -. diff --git a/Dockerfiles/agent2/ubuntu/.dockerignore b/Dockerfiles/agent2/ubuntu/.dockerignore deleted file mode 100644 index 88a84e55..00000000 --- a/Dockerfiles/agent2/ubuntu/.dockerignore +++ /dev/null @@ -1 +0,0 @@ -build.sh diff --git a/Dockerfiles/agent2/ubuntu/Dockerfile b/Dockerfiles/agent2/ubuntu/Dockerfile deleted file mode 100644 index 8577a69c..00000000 --- a/Dockerfiles/agent2/ubuntu/Dockerfile +++ /dev/null @@ -1,104 +0,0 @@ -# syntax=docker/dockerfile:1.6 -ARG OS_BASE_IMAGE=ubuntu:resolute -ARG MAJOR_VERSION=7.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.12 -ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION} - -FROM ${BUILD_BASE_IMAGE} AS builder - -FROM ${OS_BASE_IMAGE} - -ARG MAJOR_VERSION -ARG ZBX_VERSION -ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git - -ENV TERM=xterm \ - ZBX_VERSION=${ZBX_VERSION} \ - ZBX_SOURCES=${ZBX_SOURCES} \ - ZABBIX_USER_HOME_DIR=/var/lib/zabbix \ - ZABBIX_CONF_DIR=/etc/zabbix - -ENV ZBX_PERSISTENTBUFFERFILE=$ZABBIX_USER_HOME_DIR/buffer/agent2.db \ - ZBX_USERPARAMETERDIR=${ZABBIX_USER_HOME_DIR}/user_scripts - -LABEL org.opencontainers.image.authors="Alexey Pustovalov " \ - org.opencontainers.image.description="Zabbix agent 2 is deployed on a monitoring target to actively monitor local resources and applications" \ - org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ - org.opencontainers.image.licenses="AGPL v3.0" \ - org.opencontainers.image.source="${ZBX_SOURCES}" \ - org.opencontainers.image.title="Zabbix agent 2" \ - org.opencontainers.image.url="https://zabbix.com/" \ - org.opencontainers.image.vendor="Zabbix SIA" \ - org.opencontainers.image.version="${ZBX_VERSION}" - -STOPSIGNAL SIGTERM - -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/agent2/sbin/zabbix_agent2 /usr/sbin/ -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/agent2/sbin/zabbix-agent2-plugin/ /usr/sbin/zabbix-agent2-plugin/ -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/general/bin/zabbix_get /usr/bin/ -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/general/bin/zabbix_sender /usr/bin/ -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/agent2/conf/ ${ZABBIX_CONF_DIR}/ - -RUN --mount=type=cache,target=/var/cache/apt/,sharing=locked \ - --mount=type=cache,target=/var/lib/apt/,sharing=locked \ - set -eux && \ - INSTALL_PKGS="bash \ - ca-certificates \ - tzdata \ - libcurl4t64 \ - libpcre2-8-0 \ - libssl3t64 \ - iputils-ping \ - smartmontools \ - sudo" && \ - apt-get update && \ - DEBIAN_FRONTEND=noninteractive apt-get install -y \ - --no-install-recommends \ - ${INSTALL_PKGS} && \ - groupadd \ - --system \ - --gid 1995 \ - zabbix && \ - useradd \ - --system \ - --comment "Zabbix monitoring system" \ - -g zabbix \ - --uid 1997 \ - --shell /sbin/nologin \ - --home-dir ${ZABBIX_USER_HOME_DIR} \ - zabbix && \ - echo "zabbix ALL=(root) NOPASSWD: /usr/sbin/smartctl" >> /etc/sudoers.d/zabbix && \ - mkdir -p ${ZABBIX_CONF_DIR} \ - ${ZABBIX_CONF_DIR}/zabbix_agentd.d \ - ${ZABBIX_CONF_DIR}/zabbix_agent2.d \ - ${ZABBIX_USER_HOME_DIR} \ - ${ZABBIX_USER_HOME_DIR}/enc \ - ${ZABBIX_USER_HOME_DIR}/enc_internal \ - ${ZABBIX_USER_HOME_DIR}/buffer \ - ${ZBX_USERPARAMETERDIR} && \ - FIX_PERM_LIST="\ - ${ZABBIX_CONF_DIR}/zabbix_agent2_item_keys.conf \ - ${ZABBIX_CONF_DIR}/zabbix_agentd.d/ \ - ${ZABBIX_CONF_DIR}/zabbix_agent2.d/ \ - ${ZABBIX_USER_HOME_DIR}/" && \ - chown --quiet -R zabbix:0 ${FIX_PERM_LIST} && \ - chmod -R g=u ${FIX_PERM_LIST} && \ - chown --quiet zabbix:0 ${ZABBIX_CONF_DIR}/ && \ - chmod g=u ${ZABBIX_CONF_DIR} && \ - /usr/sbin/zabbix_agent2 -V - -RUN --mount=from=entrypoints,target=/tmp/entrypoints,ro \ - set -eux && \ - install -d /usr/lib/docker-entrypoint && \ - install -m 0755 /tmp/entrypoints/agent2.sh /usr/bin/docker-entrypoint.sh && \ - install -m 0644 /tmp/entrypoints/lib/*.sh /usr/lib/docker-entrypoint/ - -EXPOSE 10050/tcp 31999/tcp - -WORKDIR ${ZABBIX_USER_HOME_DIR} - -USER 1997 - -ENTRYPOINT ["/usr/bin/docker-entrypoint.sh"] - -CMD ["/usr/sbin/zabbix_agent2", "--foreground", "-c", "/etc/zabbix/zabbix_agent2.conf"] diff --git a/Dockerfiles/agent2/ubuntu/README.md b/Dockerfiles/agent2/ubuntu/README.md deleted file mode 120000 index 32d46ee8..00000000 --- a/Dockerfiles/agent2/ubuntu/README.md +++ /dev/null @@ -1 +0,0 @@ -../README.md \ No newline at end of file diff --git a/Dockerfiles/agent2/ubuntu/build.sh b/Dockerfiles/agent2/ubuntu/build.sh deleted file mode 120000 index 46b20313..00000000 --- a/Dockerfiles/agent2/ubuntu/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../../build.sh \ No newline at end of file diff --git a/Dockerfiles/agent2/windows/Dockerfile b/Dockerfiles/agent2/windows/Dockerfile deleted file mode 100644 index 81307f0b..00000000 --- a/Dockerfiles/agent2/windows/Dockerfile +++ /dev/null @@ -1,90 +0,0 @@ -# syntax=docker/dockerfile:1.6 -# escape=` -ARG OS_BASE_IMAGE=mcr.microsoft.com/windows/nanoserver:ltsc2022 -ARG ENTRYPOINT_BUILD_IMAGE=golang:1.26.5-windowsservercore-ltsc2022 - -ARG MAJOR_VERSION=7.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.12 - -ARG BUILD_BASE_IMAGE=zabbix-build-agent:ltsc2022-agent2-${ZBX_VERSION} - -FROM ${ENTRYPOINT_BUILD_IMAGE} AS entrypoint-builder - -COPY ["templates/entrypoints", "C:\\entrypoints"] - -WORKDIR C:\entrypoints - -SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] - -RUN $env:CGO_ENABLED = '0'; ` - go build -buildvcs=false -trimpath -ldflags='-s -w -buildid=' ` - -o C:\docker-entrypoint.exe ` - ./cmd/agent2; - -FROM ${BUILD_BASE_IMAGE} AS builder -FROM ${OS_BASE_IMAGE} - -ARG MAJOR_VERSION -ARG ZBX_VERSION -ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git - -ENV ZABBIX_USER_HOME_DIR="C:\zabbix" ` - ZABBIX_CONF_DIR="C:\zabbix\conf" - -ENV ZBX_PERSISTENTBUFFERFILE="$ZABBIX_USER_HOME_DIR\buffer\agent2.db" ` - ZBX_USERPARAMETERDIR="${ZABBIX_USER_HOME_DIR}\user_scripts" - -LABEL org.opencontainers.image.title="Zabbix agent 2" ` - org.opencontainers.image.authors="Alexey Pustovalov " ` - org.opencontainers.image.vendor="Zabbix SIA" ` - org.opencontainers.image.url="https://zabbix.com/" ` - org.opencontainers.image.description="Zabbix agent 2 is deployed on a monitoring target to actively monitor local resources and applications" ` - org.opencontainers.image.licenses="AGPL v3.0" ` - org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" ` - org.opencontainers.image.version="${ZBX_VERSION}" ` - org.opencontainers.image.source="${ZBX_SOURCES}" - -COPY --from=builder ["C:\\zabbix-${ZBX_VERSION}-output", "C:\\zabbix"] -COPY ["templates/config/agent2_windows", "C:\\zabbix\\conf"] -COPY --from=builder ["C:\\build_deps\\pwsh", "C:\\Program Files\\PowerShell"] -COPY --from=entrypoint-builder ["C:\\docker-entrypoint.exe", "C:\\zabbix\\docker-entrypoint.exe"] -COPY ["templates/entrypoints/licenses/go-THIRD-PARTY-NOTICES.txt", "C:\\licenses\\"] - -WORKDIR C:\zabbix\ - -USER ContainerAdministrator - -SHELL ["C:\\Program Files\\PowerShell\\pwsh.exe", "-Command", "$ErrorActionPreference = 'Stop';"] - -RUN $env:PATH = [string]::Format('{0}\zabbix\sbin;{0}\zabbix\bin;{0}\Program Files\PowerShell;', $env:SystemDrive) + $env:PATH; ` - [Environment]::SetEnvironmentVariable('PATH', $env:PATH, [EnvironmentVariableTarget]::Machine); ` - ` - [Environment]::SetEnvironmentVariable('ZABBIX_USER_HOME_DIR', $env:ZABBIX_USER_HOME_DIR, [EnvironmentVariableTarget]::Machine); ` - ` - Write-Host ('Verifying Zabbix agent 2 {0} ...' -f $env:ZBX_VERSION); ` - zabbix_agent2.exe -V; - -RUN Set-Location -Path $env:SystemDrive\.; ` - ` - New-Item -Force -ItemType directory -Path $env:ZABBIX_CONF_DIR | Out-Null; ` - New-Item -Force -ItemType directory -Path $env:ZABBIX_CONF_DIR\zabbix_agentd.d | Out-Null; ` - New-Item -Force -ItemType directory -Path $env:ZABBIX_CONF_DIR\zabbix_agent2.d | Out-Null; ` - New-Item -Force -ItemType directory -Path $env:ZABBIX_USER_HOME_DIR\enc | Out-Null; ` - New-Item -Force -ItemType directory -Path $env:ZABBIX_USER_HOME_DIR\enc_internal | Out-Null; ` - New-Item -Force -ItemType directory -Path $env:ZABBIX_USER_HOME_DIR\buffer | Out-Null; ` - New-Item -Force -ItemType directory -Path $env:ZBX_USERPARAMETERDIR | Out-Null; ` - ` - net accounts /MaxPWAge:unlimited; ` - net user /add zabbix /expire:never /passwordreq:no; ` - $acl = Get-Acl -Path $env:ZABBIX_USER_HOME_DIR; ` - $ace = New-Object Security.AccessControl.FileSystemAccessRule ('zabbix', 'Modify', 'ContainerInherit, ObjectInherit', 'InheritOnly', 'Allow'); ` - $acl.AddAccessRule($ace); ` - Set-Acl -AclObject $acl -Path $env:ZABBIX_USER_HOME_DIR; - -USER zabbix - -EXPOSE 10050/tcp 31999/tcp - -ENTRYPOINT ["C:\\zabbix\\docker-entrypoint.exe"] - -CMD ["C:\\zabbix\\sbin\\zabbix_agent2.exe", "-c", "C:\\zabbix\\conf\\zabbix_agent2.conf", "-f"] diff --git a/Dockerfiles/agent2/windows/Dockerfile.dockerignore b/Dockerfiles/agent2/windows/Dockerfile.dockerignore deleted file mode 100644 index 8e549e20..00000000 --- a/Dockerfiles/agent2/windows/Dockerfile.dockerignore +++ /dev/null @@ -1,17 +0,0 @@ -** -!templates/ -!templates/entrypoints/ -!templates/entrypoints/go.mod -!templates/entrypoints/cmd/ -!templates/entrypoints/cmd/agent2/ -!templates/entrypoints/cmd/agent2/** -!templates/entrypoints/internal/ -!templates/entrypoints/internal/agent/ -!templates/entrypoints/internal/agent/** -!templates/entrypoints/internal/bootstrap/ -!templates/entrypoints/internal/bootstrap/** -!templates/entrypoints/licenses/ -!templates/entrypoints/licenses/go-THIRD-PARTY-NOTICES.txt -!templates/config/ -!templates/config/agent2_windows/ -!templates/config/agent2_windows/** diff --git a/Dockerfiles/agent2/windows/README.md b/Dockerfiles/agent2/windows/README.md deleted file mode 120000 index 32d46ee8..00000000 --- a/Dockerfiles/agent2/windows/README.md +++ /dev/null @@ -1 +0,0 @@ -../README.md \ No newline at end of file diff --git a/Dockerfiles/build-base/README.md b/Dockerfiles/build-base/README.md deleted file mode 100644 index 5fd04c9d..00000000 --- a/Dockerfiles/build-base/README.md +++ /dev/null @@ -1,80 +0,0 @@ -![logo](https://assets.zabbix.com/img/logo/zabbix_logo_500x131.png) - -# What is Zabbix? - -Zabbix is an enterprise-class open source distributed monitoring solution. - -Zabbix is software that monitors numerous parameters of a network and the health and integrity of servers. Zabbix uses a flexible notification mechanism that allows users to configure e-mail based alerts for virtually any event. This allows a fast reaction to server problems. Zabbix offers excellent reporting and data visualisation features based on the stored data. This makes Zabbix ideal for capacity planning. - -For more information and related downloads for Zabbix components, please visit https://hub.docker.com/u/zabbix/ and https://zabbix.com - -# What is Zabbix build base? - -Zabbix build base image is prepared build environment for building Zabbix components. It contains all required packages, binaries and tools. - -# Zabbix build base images - -These are the only official Zabbix build base Docker images. They are based on Alpine Linux v3.24, Ubuntu 26.04 (resolute), CentOS Stream 10 and Oracle Linux 10 images. The available versions of the image are: - - Zabbix build base 6.0 (tags: alpine-6.0-latest, ubuntu-6.0-latest, ol-6.0-latest) - Zabbix build base 6.0.* (tags: alpine-6.0.*, ubuntu-6.0.*, ol-6.0.*) - Zabbix build base 7.0 (tags: alpine-7.0-latest, ubuntu-7.0-latest, ol-7.0-latest) - Zabbix build base 7.0.* (tags: alpine-7.0.*, ubuntu-7.0.*, ol-7.0.*, ltsc2019-7.0.*, ltsc2022-7.0.*) - Zabbix build base 7.2 (tags: alpine-7.2-latest, ubuntu-7.2-latest, ol-7.2-latest) - Zabbix build base 7.2.* (tags: alpine-7.2.*, ubuntu-7.2.*, ol-7.2.*, ltsc2019-7.2.*, ltsc2022-7.2.*) - Zabbix build base 7.4 (tags: alpine-7.4-latest, ubuntu-7.4-latest, ol-7.4-latest, alpine-latest, ubuntu-latest, ol-latest, latest) - Zabbix build base 7.4.* (tags: alpine-7.4.*, ubuntu-7.4.*, ol-7.4.*, ltsc2019-7.4.*, ltsc2022-7.4.*) - Zabbix build base 8.0 (tags: alpine-trunk, ubuntu-trunk, ol-trunk, ltsc2019-trunk, ltsc2022-trunk) - -Images are updated when new releases are published. The image with ``latest`` tag is based on Alpine Linux. - -# 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/7.4/Dockerfiles/build-mysql), [PostgreSQL](https://github.com/zabbix/zabbix-docker/tree/7.4/Dockerfiles/build-pgsql) and [SQLite3](https://github.com/zabbix/zabbix-docker/tree/7.4/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 - -The `zabbix-build-base` images come in many flavors, each designed for a specific use case. - -## `zabbix-build-base:alpine-` - -This image is based on the popular [Alpine Linux project](http://alpinelinux.org), available in [the `alpine` official image](https://hub.docker.com/_/alpine). Alpine Linux is much smaller than most distribution base images (~5MB), and thus leads to much slimmer images in general. - -This variant is highly recommended when final image size being as small as possible is desired. The main caveat to note is that it does use [musl libc](http://www.musl-libc.org) instead of [glibc and friends](http://www.etalabs.net/compare_libcs.html), so certain software might run into issues depending on the depth of their libc requirements. However, most software doesn't have an issue with this, so this variant is usually a very safe choice. See [this Hacker News comment thread](https://news.ycombinator.com/item?id=10782897) for more discussion of the issues that might arise and some pro/con comparisons of using Alpine-based images. - -To minimize image size, it's uncommon for additional related tools (such as `git` or `bash`) to be included in Alpine-based images. Using this image as a base, add the things you need in your own Dockerfile (see the [`alpine` image description](https://hub.docker.com/_/alpine/) for examples of how to install packages if you are unfamiliar). - -## `zabbix-build-base:ubuntu-` - -This is the defacto image. If you are unsure about what your needs are, you probably want to use this one. It is designed to be used both as a throw away container (mount your source code and start the container to start your app), as well as the base to build other images off of. - -## `zabbix-build-base:ol-` - -Oracle Linux is an open-source operating system available under the GNU General Public License (GPLv2). Suitable for general purpose or Oracle workloads, it benefits from rigorous testing of more than 128,000 hours per day with real-world workloads and includes unique innovations such as Ksplice for zero-downtime kernel patching, DTrace for real-time diagnostics, the powerful Btrfs file system, and more. - -# User Feedback - -## Documentation - -Documentation for this image is stored in the [`build-base/` directory](https://github.com/zabbix/zabbix-docker/tree/7.4/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.4/README.md) before attempting a pull request. - -## Issues - -If you have any problems with or questions about this image, please contact us through a [GitHub issue](https://github.com/zabbix/zabbix-docker/issues). - -### Known issues - -## Contributing - -You are invited to contribute new features, fixes, or updates, large or small; we are always thrilled to receive pull requests, and do our best to process them as fast as we can. - -Before you start to code, we recommend discussing your plans through a [GitHub issue](https://github.com/zabbix/zabbix-docker/issues), especially for more ambitious contributions. This gives other contributors a chance to point you in the right direction, give you feedback on your design, and help you find out if someone else is working on the same thing. - -## License - -Starting from Zabbix version 7.0, all subsequent Zabbix versions will be released under the GNU Affero General Public License version 3 (AGPLv3). -You can modify the relevant version and propagate such modified version under the terms of the AGPLv3 as published by the Free Software Foundation. -For additional details, including answers to common questions about the AGPLv3, see the generic FAQ from the [Free Software Foundation](http://www.fsf.org/licenses/gpl-faq.html). - -Zabbix is Open Source Software, however, if you use Zabbix in a commercial context we kindly ask you to support the development of Zabbix by purchasing some level of technical support. -All previous Zabbix software versions up to 6.4 are released under the GNU General Public License version 2 (GPLv2). The formal terms of the GPLv2 and AGPLv3 can be found at http://www.fsf.org/licenses/. diff --git a/Dockerfiles/build-base/alpine/.dockerignore b/Dockerfiles/build-base/alpine/.dockerignore deleted file mode 100644 index 88a84e55..00000000 --- a/Dockerfiles/build-base/alpine/.dockerignore +++ /dev/null @@ -1 +0,0 @@ -build.sh diff --git a/Dockerfiles/build-base/alpine/Dockerfile b/Dockerfiles/build-base/alpine/Dockerfile deleted file mode 100644 index 9d472489..00000000 --- a/Dockerfiles/build-base/alpine/Dockerfile +++ /dev/null @@ -1,65 +0,0 @@ -# syntax=docker/dockerfile:1.6 -ARG OS_BASE_IMAGE=alpine:3.24 -FROM ${OS_BASE_IMAGE} - -ARG MAJOR_VERSION=7.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.12 - -ENV TERM=xterm \ - ZBX_VERSION=${ZBX_VERSION} \ - JAVA_HOME=/usr/lib/jvm/default-jvm \ - GOPATH=/root/go \ - GOCACHE=/root/.cache/go-build \ - GOMODCACHE=/root/go/pkg/mod \ - GOTELEMETRY=off \ - GOFLAGS=-buildvcs=false - -LABEL org.opencontainers.image.authors="Alexey Pustovalov " \ - org.opencontainers.image.description="Zabbix build base image contains all required packages to build Zabbix images" \ - org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ - org.opencontainers.image.licenses="AGPL v3.0" \ - org.opencontainers.image.title="Zabbix build base" \ - org.opencontainers.image.url="https://zabbix.com/" \ - org.opencontainers.image.vendor="Zabbix SIA" \ - org.opencontainers.image.version="${ZBX_VERSION}" - -RUN set -eux && \ - ARCH_SUFFIX="$(apk --print-arch)"; \ - case "$ARCH_SUFFIX" in \ - riscv64) openjdk_packages='openjdk21 openjdk21-jre-headless' ;; \ - *) openjdk_packages='openjdk21 openjdk21-jre-headless' ;; \ - esac; \ - INSTALL_PKGS="bash \ - coreutils \ - curl \ - autoconf \ - automake \ - make \ - g++ \ - go \ - linux-headers \ - $openjdk_packages \ - gettext \ - git \ - patch \ - c-ares-dev \ - curl-dev \ - libevent-dev \ - libmodbus-dev \ - libpq-dev \ - libssh-dev \ - libxml2-dev \ - mysql-dev \ - net-snmp-dev \ - openipmi-dev \ - openldap-dev \ - openssl-dev \ - pcre2-dev \ - sqlite-dev \ - unixodbc-dev \ - zlib-dev" && \ - apk add \ - --no-cache \ - --clean-protected \ - ${INSTALL_PKGS} && \ - go telemetry off diff --git a/Dockerfiles/build-base/alpine/README.md b/Dockerfiles/build-base/alpine/README.md deleted file mode 120000 index 32d46ee8..00000000 --- a/Dockerfiles/build-base/alpine/README.md +++ /dev/null @@ -1 +0,0 @@ -../README.md \ No newline at end of file diff --git a/Dockerfiles/build-base/alpine/build.sh b/Dockerfiles/build-base/alpine/build.sh deleted file mode 120000 index 46b20313..00000000 --- a/Dockerfiles/build-base/alpine/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../../build.sh \ No newline at end of file diff --git a/Dockerfiles/build-base/centos/.dockerignore b/Dockerfiles/build-base/centos/.dockerignore deleted file mode 100644 index 88a84e55..00000000 --- a/Dockerfiles/build-base/centos/.dockerignore +++ /dev/null @@ -1 +0,0 @@ -build.sh diff --git a/Dockerfiles/build-base/centos/Dockerfile b/Dockerfiles/build-base/centos/Dockerfile deleted file mode 100644 index 69170285..00000000 --- a/Dockerfiles/build-base/centos/Dockerfile +++ /dev/null @@ -1,74 +0,0 @@ -# syntax=docker/dockerfile:1.6 -ARG OS_BASE_IMAGE=quay.io/centos/centos:stream10-minimal -FROM ${OS_BASE_IMAGE} - -ARG MAJOR_VERSION=7.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.12 - -ENV TERM=xterm \ - ZBX_VERSION=${ZBX_VERSION} \ - GOPATH=/root/go \ - GOCACHE=/root/.cache/go-build \ - GOMODCACHE=/root/go/pkg/mod \ - GOTELEMETRY=off \ - GOFLAGS=-buildvcs=false - -LABEL org.opencontainers.image.authors="Alexey Pustovalov " \ - org.opencontainers.image.description="Zabbix build base image contains all required packages to build Zabbix images" \ - org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ - org.opencontainers.image.licenses="AGPL v3.0" \ - org.opencontainers.image.title="Zabbix build base" \ - org.opencontainers.image.url="https://zabbix.com/" \ - org.opencontainers.image.vendor="Zabbix SIA" \ - org.opencontainers.image.version="${ZBX_VERSION}" - -RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ - --mount=type=tmpfs,target=/var/cache/yum/ \ - set -eux && \ - INSTALL_PKGS="bash \ - autoconf \ - automake \ - make \ - gcc \ - go-toolset \ - java-21-openjdk-devel \ - gettext \ - git \ - patch \ - c-ares-devel \ - libcurl-devel \ - libevent-devel \ - libmodbus-devel \ - libssh-devel \ - libxml2-devel \ - mysql8.4-devel \ - net-snmp-devel \ - OpenIPMI-devel \ - openldap-devel \ - openssl-devel \ - pcre2-devel \ - postgresql18-private-devel \ - postgresql18-server-devel \ - sqlite-devel \ - unixODBC-devel \ - zlib-devel" && \ - microdnf -y install \ - --disablerepo="*" \ - --enablerepo="extras-common" \ - --setopt=install_weak_deps=0 \ - --setopt=keepcache=0 \ - --best \ - --nodocs \ - epel-release && \ - microdnf -y install \ - --disablerepo="*" \ - --enablerepo="baseos" \ - --enablerepo="appstream" \ - --enablerepo="crb" \ - --enablerepo="epel" \ - --setopt=install_weak_deps=0 \ - --setopt=keepcache=0 \ - --best \ - --nodocs \ - ${INSTALL_PKGS} && \ - go telemetry off diff --git a/Dockerfiles/build-base/centos/README.md b/Dockerfiles/build-base/centos/README.md deleted file mode 120000 index 32d46ee8..00000000 --- a/Dockerfiles/build-base/centos/README.md +++ /dev/null @@ -1 +0,0 @@ -../README.md \ No newline at end of file diff --git a/Dockerfiles/build-base/centos/build.sh b/Dockerfiles/build-base/centos/build.sh deleted file mode 120000 index 46b20313..00000000 --- a/Dockerfiles/build-base/centos/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../../build.sh \ No newline at end of file diff --git a/Dockerfiles/build-base/ol/.dockerignore b/Dockerfiles/build-base/ol/.dockerignore deleted file mode 100644 index 88a84e55..00000000 --- a/Dockerfiles/build-base/ol/.dockerignore +++ /dev/null @@ -1 +0,0 @@ -build.sh diff --git a/Dockerfiles/build-base/ol/Dockerfile b/Dockerfiles/build-base/ol/Dockerfile deleted file mode 100644 index 464c7b88..00000000 --- a/Dockerfiles/build-base/ol/Dockerfile +++ /dev/null @@ -1,74 +0,0 @@ -# syntax=docker/dockerfile:1.6 -ARG OS_BASE_IMAGE=container-registry.oracle.com/os/oraclelinux:10-slim -FROM ${OS_BASE_IMAGE} - -ARG MAJOR_VERSION=7.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.12 - -ENV TERM=xterm \ - ZBX_VERSION=${ZBX_VERSION} \ - GOPATH=/root/go \ - GOCACHE=/root/.cache/go-build \ - GOMODCACHE=/root/go/pkg/mod \ - GOTELEMETRY=off \ - GOFLAGS=-buildvcs=false - -LABEL org.opencontainers.image.authors="Alexey Pustovalov " \ - org.opencontainers.image.description="Zabbix build base image contains all required packages to build Zabbix images" \ - org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ - org.opencontainers.image.licenses="AGPL v3.0" \ - org.opencontainers.image.title="Zabbix build base" \ - org.opencontainers.image.url="https://zabbix.com/" \ - org.opencontainers.image.vendor="Zabbix SIA" \ - org.opencontainers.image.version="${ZBX_VERSION}" - -RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ - --mount=type=tmpfs,target=/var/cache/yum/ \ - set -eux && \ - INSTALL_PKGS="bash \ - autoconf \ - automake \ - make \ - gcc \ - go-toolset \ - java-21-openjdk-devel \ - gettext \ - git \ - patch \ - c-ares-devel \ - libcurl-devel \ - libevent-devel \ - libmodbus-devel \ - libssh-devel \ - libxml2-devel \ - mysql8.4-devel \ - net-snmp-devel \ - OpenIPMI-devel \ - openldap-devel \ - openssl-devel \ - pcre2-devel \ - postgresql18-private-devel \ - postgresql18-server-devel \ - sqlite-devel \ - unixODBC-devel \ - zlib-devel" && \ - microdnf -y install \ - --disablerepo="*" \ - --enablerepo="ol10_baseos_latest" \ - --setopt=install_weak_deps=0 \ - --setopt=keepcache=0 \ - --best \ - --nodocs \ - oracle-epel-release-el10 && \ - microdnf -y install \ - --disablerepo="*" \ - --enablerepo="ol10_baseos_latest" \ - --enablerepo="ol10_appstream" \ - --enablerepo="ol10_codeready_builder" \ - --enablerepo="ol10_u1_developer_EPEL" \ - --setopt=install_weak_deps=0 \ - --setopt=keepcache=0 \ - --best \ - --nodocs \ - ${INSTALL_PKGS} && \ - go telemetry off diff --git a/Dockerfiles/build-base/ol/README.md b/Dockerfiles/build-base/ol/README.md deleted file mode 120000 index 32d46ee8..00000000 --- a/Dockerfiles/build-base/ol/README.md +++ /dev/null @@ -1 +0,0 @@ -../README.md \ No newline at end of file diff --git a/Dockerfiles/build-base/ol/build.sh b/Dockerfiles/build-base/ol/build.sh deleted file mode 120000 index 46b20313..00000000 --- a/Dockerfiles/build-base/ol/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../../build.sh \ No newline at end of file diff --git a/Dockerfiles/build-base/rhel/.dockerignore b/Dockerfiles/build-base/rhel/.dockerignore deleted file mode 100644 index 88a84e55..00000000 --- a/Dockerfiles/build-base/rhel/.dockerignore +++ /dev/null @@ -1 +0,0 @@ -build.sh diff --git a/Dockerfiles/build-base/rhel/Dockerfile b/Dockerfiles/build-base/rhel/Dockerfile deleted file mode 100644 index 3d2cf156..00000000 --- a/Dockerfiles/build-base/rhel/Dockerfile +++ /dev/null @@ -1,86 +0,0 @@ -# syntax=docker/dockerfile:1.6 -ARG OS_BASE_IMAGE=registry.access.redhat.com/ubi10/ubi-minimal:10.2 -FROM ${OS_BASE_IMAGE} - -ARG MAJOR_VERSION=7.4 -ARG RELEASE=12 -ARG ZBX_VERSION=${MAJOR_VERSION}.12 - -ENV TERM=xterm \ - ZBX_VERSION=${ZBX_VERSION} \ - GOPATH=/root/go \ - GOCACHE=/root/.cache/go-build \ - GOMODCACHE=/root/go/pkg/mod \ - GOTELEMETRY=off \ - GOFLAGS=-buildvcs=false - -LABEL description="Prepared environment to build Zabbix components" \ - maintainer="alexey.pustovalov@zabbix.com" \ - name="zabbix/zabbix-build-base-74" \ - release="${RELEASE}" \ - summary="Zabbix build base" \ - url="https://www.zabbix.com/" \ - vendor="Zabbix SIA" \ - version="${MAJOR_VERSION}" \ - io.k8s.description="Prepared environment to build Zabbix components" \ - io.k8s.display-name="Zabbix build base" \ - io.openshift.expose-services="" \ - io.openshift.tags="zabbix,build" \ - org.label-schema.description="Prepared environment to build Zabbix components" \ - org.label-schema.license="AGPL v3.0" \ - org.label-schema.name="zabbix-build-base-rhel" \ - org.label-schema.url="https://zabbix.com/" \ - org.label-schema.vcs-ref="${VCS_REF}" \ - org.label-schema.vendor="Zabbix SIA" - -COPY licenses /licenses/ - -RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ - --mount=type=tmpfs,target=/var/cache/yum/ \ -# --mount=type=bind,target=/run/secrets/,src=secrets/ \ - set -eux && \ - INSTALL_PKGS="bash \ - autoconf \ - automake \ - make \ - gcc \ - go-toolset \ - java-21-openjdk-devel \ - gettext \ - git \ - patch \ - c-ares-devel \ - libcurl-devel \ - libevent-devel \ - libmodbus-devel \ - libssh-devel \ - libxml2-devel \ - mysql8.4-devel \ - net-snmp-devel \ - OpenIPMI-devel \ - openldap-devel \ - openssl-devel \ - pcre2-devel \ - postgresql18-private-devel \ - postgresql18-server-devel \ - sqlite-devel \ - unixODBC-devel \ - zlib-devel" && \ - curl --tlsv1.2 -sSf -L https://dl.fedoraproject.org/pub/epel/epel-release-latest-10.noarch.rpm -o /tmp/epel-release-latest-10.noarch.rpm && \ - rpm -ivh /tmp/epel-release-latest-10.noarch.rpm && \ - rm -rf /tmp/epel-release-latest-10.noarch.rpm && \ - ARCH_SUFFIX="$(arch)"; \ - microdnf -y install \ - --disablerepo="*" \ - --enablerepo="ubi-10-baseos-rpms" \ - --enablerepo="ubi-10-appstream-rpms" \ - --enablerepo="rhel-10-for-$ARCH_SUFFIX-baseos-rpms" \ - --enablerepo="rhel-10-for-$ARCH_SUFFIX-appstream-rpms" \ - --enablerepo="codeready-builder-for-rhel-10-$ARCH_SUFFIX-rpms" \ - --enablerepo="epel" \ - --setopt=install_weak_deps=0 \ - --setopt=keepcache=0 \ - --best \ - --setopt=tsflags=nodocs \ - ${INSTALL_PKGS} && \ - go telemetry off diff --git a/Dockerfiles/build-base/rhel/README.md b/Dockerfiles/build-base/rhel/README.md deleted file mode 120000 index 32d46ee8..00000000 --- a/Dockerfiles/build-base/rhel/README.md +++ /dev/null @@ -1 +0,0 @@ -../README.md \ No newline at end of file diff --git a/Dockerfiles/build-base/rhel/build.sh b/Dockerfiles/build-base/rhel/build.sh deleted file mode 120000 index 46b20313..00000000 --- a/Dockerfiles/build-base/rhel/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../../build.sh \ No newline at end of file diff --git a/Dockerfiles/build-base/rhel/licenses/AGPL-v3.0.txt b/Dockerfiles/build-base/rhel/licenses/AGPL-v3.0.txt deleted file mode 100644 index be3f7b28..00000000 --- a/Dockerfiles/build-base/rhel/licenses/AGPL-v3.0.txt +++ /dev/null @@ -1,661 +0,0 @@ - GNU AFFERO GENERAL PUBLIC LICENSE - Version 3, 19 November 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU Affero General Public License is a free, copyleft license for -software and other kinds of works, specifically designed to ensure -cooperation with the community in the case of network server software. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -our General Public Licenses are intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - Developers that use our General Public Licenses protect your rights -with two steps: (1) assert copyright on the software, and (2) offer -you this License which gives you legal permission to copy, distribute -and/or modify the software. - - A secondary benefit of defending all users' freedom is that -improvements made in alternate versions of the program, if they -receive widespread use, become available for other developers to -incorporate. Many developers of free software are heartened and -encouraged by the resulting cooperation. However, in the case of -software used on network servers, this result may fail to come about. -The GNU General Public License permits making a modified version and -letting the public access it on a server without ever releasing its -source code to the public. - - The GNU Affero General Public License is designed specifically to -ensure that, in such cases, the modified source code becomes available -to the community. It requires the operator of a network server to -provide the source code of the modified version running there to the -users of that server. Therefore, public use of a modified version, on -a publicly accessible server, gives the public access to the source -code of the modified version. - - An older license, called the Affero General Public License and -published by Affero, was designed to accomplish similar goals. This is -a different license, not a version of the Affero GPL, but Affero has -released a new version of the Affero GPL which permits relicensing under -this license. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU Affero General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Remote Network Interaction; Use with the GNU General Public License. - - Notwithstanding any other provision of this License, if you modify the -Program, your modified version must prominently offer all users -interacting with it remotely through a computer network (if your version -supports such interaction) an opportunity to receive the Corresponding -Source of your version by providing access to the Corresponding Source -from a network server at no charge, through some standard or customary -means of facilitating copying of software. This Corresponding Source -shall include the Corresponding Source for any work covered by version 3 -of the GNU General Public License that is incorporated pursuant to the -following paragraph. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the work with which it is combined will remain governed by version -3 of the GNU General Public License. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU Affero General Public License from time to time. Such new versions -will be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU Affero General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU Affero General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU Affero General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Affero General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Affero General Public License for more details. - - You should have received a copy of the GNU Affero General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If your software can interact with users remotely through a computer -network, you should also make sure that it provides a way for users to -get its source. For example, if your program is a web application, its -interface could display a "Source" link that leads users to an archive -of the code. There are many ways you could offer source, and different -solutions will be better for different programs; see section 13 for the -specific requirements. - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU AGPL, see -. diff --git a/Dockerfiles/build-base/ubuntu/.dockerignore b/Dockerfiles/build-base/ubuntu/.dockerignore deleted file mode 100644 index 88a84e55..00000000 --- a/Dockerfiles/build-base/ubuntu/.dockerignore +++ /dev/null @@ -1 +0,0 @@ -build.sh diff --git a/Dockerfiles/build-base/ubuntu/Dockerfile b/Dockerfiles/build-base/ubuntu/Dockerfile deleted file mode 100644 index d78cbb47..00000000 --- a/Dockerfiles/build-base/ubuntu/Dockerfile +++ /dev/null @@ -1,63 +0,0 @@ -# syntax=docker/dockerfile:1.6 -ARG OS_BASE_IMAGE=ubuntu:resolute -FROM ${OS_BASE_IMAGE} - -ARG MAJOR_VERSION=7.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.12 - -ENV TERM=xterm \ - ZBX_VERSION=${ZBX_VERSION} \ - PATH=/usr/lib/go-1.26/bin:$PATH \ - GOPATH=/root/go \ - GOCACHE=/root/.cache/go-build \ - GOMODCACHE=/root/go/pkg/mod \ - GOTELEMETRY=off \ - GOFLAGS=-buildvcs=false - -LABEL org.opencontainers.image.authors="Alexey Pustovalov " \ - org.opencontainers.image.description="Zabbix build base image contains all required packages to build Zabbix images" \ - org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ - org.opencontainers.image.licenses="AGPL v3.0" \ - org.opencontainers.image.title="Zabbix build base" \ - org.opencontainers.image.url="https://zabbix.com/" \ - org.opencontainers.image.vendor="Zabbix SIA" \ - org.opencontainers.image.version="${ZBX_VERSION}" - -RUN --mount=type=cache,target=/var/cache/apt/,sharing=locked \ - --mount=type=cache,target=/var/lib/apt/,sharing=locked \ - set -eux && \ - INSTALL_PKGS="bash \ - curl \ - autoconf \ - automake \ - make \ - pkg-config \ - binutils \ - gcc \ - golang-1.26 \ - openjdk-21-jdk-headless \ - gettext \ - git \ - patch \ - unzip \ - libc-ares-dev \ - libc6-dev \ - libcurl4-openssl-dev \ - libevent-dev \ - libldap2-dev \ - libmodbus-dev \ - libmysqlclient-dev \ - libopenipmi-dev \ - libpcre2-dev \ - libpq-dev \ - libsnmp-dev \ - libsqlite3-dev \ - libssh-dev \ - libxml2-dev \ - unixodbc-dev \ - zlib1g-dev" && \ - apt-get update && \ - DEBIAN_FRONTEND=noninteractive apt-get install -y \ - --no-install-recommends \ - ${INSTALL_PKGS} && \ - go telemetry off diff --git a/Dockerfiles/build-base/ubuntu/README.md b/Dockerfiles/build-base/ubuntu/README.md deleted file mode 120000 index 32d46ee8..00000000 --- a/Dockerfiles/build-base/ubuntu/README.md +++ /dev/null @@ -1 +0,0 @@ -../README.md \ No newline at end of file diff --git a/Dockerfiles/build-base/ubuntu/build.sh b/Dockerfiles/build-base/ubuntu/build.sh deleted file mode 120000 index 46b20313..00000000 --- a/Dockerfiles/build-base/ubuntu/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../../build.sh \ No newline at end of file diff --git a/Dockerfiles/build-base/windows/CMakeLists.txt b/Dockerfiles/build-base/windows/CMakeLists.txt deleted file mode 100644 index a2f881b0..00000000 --- a/Dockerfiles/build-base/windows/CMakeLists.txt +++ /dev/null @@ -1,148 +0,0 @@ -cmake_minimum_required(VERSION 3.16) -project(libmodbus_win C) - -option(MODBUS_ENABLE_RTU "Build RTU backend (modbus-rtu.c)" ON) -option(MODBUS_ENABLE_TCP "Build TCP backend (modbus-tcp.c)" ON) -option(MODBUS_FIX_MSVC_SOCKOPT_WARNINGS "Fix MSVC winsock C4133 warnings" ON) - -set(SRC_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src") - -# --- 1) Prepare shim include dir (build-only includes live here) --- -set(SHIM_INC_DIR "${CMAKE_CURRENT_BINARY_DIR}/include") -file(MAKE_DIRECTORY "${SHIM_INC_DIR}") - -# We expect config.h to exist in ${SRC_DIR}/config.h (you generate it via src/win32/configure.js) -if(NOT EXISTS "${SRC_DIR}/win32/config.h") - message(FATAL_ERROR - "config.h not found at ${SRC_DIR}/win32/config.h. " - "Run src/win32/configure.js and copy config.h into src/ before configuring with CMake.") -endif() - -# --- 2) Generate shim modbus.h (static-friendly MODBUS_API) --- -file(READ "${SRC_DIR}/modbus.h" MODBUS_H_TXT) - -set(MODBUS_API_BLOCK -"#if defined(_MSC_VER) -# if defined(DLLBUILD) -/* define DLLBUILD when building the DLL */ -# define MODBUS_API __declspec(dllexport) -# else -# define MODBUS_API __declspec(dllimport) -# endif -#else -# define MODBUS_API -#endif") - -set(MODBUS_API_BLOCK_REPL -"#if defined(_MSC_VER) - /* Static library: do NOT use dllimport/dllexport in public headers */ -# if defined(DLLBUILD) -# define MODBUS_API __declspec(dllexport) -# else -# define MODBUS_API -# endif -#else -# define MODBUS_API -#endif") - -string(REPLACE "${MODBUS_API_BLOCK}" "${MODBUS_API_BLOCK_REPL}" MODBUS_H_TXT "${MODBUS_H_TXT}") -file(WRITE "${SHIM_INC_DIR}/modbus.h" "${MODBUS_H_TXT}") - -# Copy remaining headers needed to compile (build-only set includes private/config) -file(COPY "${SRC_DIR}/modbus-tcp.h" DESTINATION "${SHIM_INC_DIR}") -file(COPY "${SRC_DIR}/modbus-rtu.h" DESTINATION "${SHIM_INC_DIR}") -file(COPY "${SRC_DIR}/modbus-version.h" DESTINATION "${SHIM_INC_DIR}") - -# Build-only headers required by .c files -file(COPY "${SRC_DIR}/win32/config.h" DESTINATION "${SHIM_INC_DIR}") -file(COPY "${SRC_DIR}/modbus-private.h" DESTINATION "${SHIM_INC_DIR}") -file(COPY "${SRC_DIR}/modbus-tcp-private.h" DESTINATION "${SHIM_INC_DIR}") -file(COPY "${SRC_DIR}/modbus-rtu-private.h" DESTINATION "${SHIM_INC_DIR}") - -# --- 3) Generate shim sources (do not modify upstream sources on disk) --- -set(SHIM_SRC_DIR "${CMAKE_CURRENT_BINARY_DIR}/shim_src") -file(MAKE_DIRECTORY "${SHIM_SRC_DIR}") - -function(make_shim_source in_file out_file) - file(READ "${in_file}" TXT) - - # Force includes via include paths (so our shim headers win) - string(REPLACE "#include \"modbus.h\"" "#include " TXT "${TXT}") - string(REPLACE "#include \"modbus-tcp.h\"" "#include " TXT "${TXT}") - string(REPLACE "#include \"modbus-rtu.h\"" "#include " TXT "${TXT}") - string(REPLACE "#include \"modbus-version.h\"" "#include " TXT "${TXT}") - - # Some files include private/config with quotes; route those too - string(REPLACE "#include \"config.h\"" "#include " TXT "${TXT}") - string(REPLACE "#include \"modbus-private.h\"" "#include " TXT "${TXT}") - string(REPLACE "#include \"modbus-tcp-private.h\"" "#include " TXT "${TXT}") - string(REPLACE "#include \"modbus-rtu-private.h\"" "#include " TXT "${TXT}") - - # Optional: silence MSVC winsock setsockopt warnings (C4133) - # On Windows setsockopt expects const char* optval; libmodbus passes &int. - if (MSVC AND MODBUS_FIX_MSVC_SOCKOPT_WARNINGS) - string(REPLACE ", &option, sizeof(int))" ", (const char*)&option, sizeof(int))" TXT "${TXT}") - endif() - - file(WRITE "${out_file}" "${TXT}") -endfunction() - -# Base sources -make_shim_source("${SRC_DIR}/modbus.c" "${SHIM_SRC_DIR}/modbus.c") -make_shim_source("${SRC_DIR}/modbus-data.c" "${SHIM_SRC_DIR}/modbus-data.c") - -set(MODBUS_SOURCES - "${SHIM_SRC_DIR}/modbus.c" - "${SHIM_SRC_DIR}/modbus-data.c" -) - -if(MODBUS_ENABLE_TCP) - make_shim_source("${SRC_DIR}/modbus-tcp.c" "${SHIM_SRC_DIR}/modbus-tcp.c") - list(APPEND MODBUS_SOURCES "${SHIM_SRC_DIR}/modbus-tcp.c") -endif() - -if(MODBUS_ENABLE_RTU) - make_shim_source("${SRC_DIR}/modbus-rtu.c" "${SHIM_SRC_DIR}/modbus-rtu.c") - list(APPEND MODBUS_SOURCES "${SHIM_SRC_DIR}/modbus-rtu.c") -endif() - -add_library(modbus STATIC ${MODBUS_SOURCES}) - -# --- MSVC: silence WinSock signature warning (setsockopt wants const char*) --- -if (MSVC) - target_compile_options(modbus PRIVATE /wd4133) -endif() - -# Use shim headers for build + consumers (PUBLIC), but we will INSTALL only public headers explicitly -target_include_directories(modbus - PUBLIC - "${SHIM_INC_DIR}" -) - -if (WIN32) - target_link_libraries(modbus PUBLIC ws2_32) -endif() - -# --- Install: only public headers (no config.h, no *-private.h) --- -include(GNUInstallDirs) - -install(TARGETS modbus - ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" -) - -set(PUBLIC_HEADERS - "${SHIM_INC_DIR}/modbus.h" - "${SHIM_INC_DIR}/modbus-version.h" -) - -if(MODBUS_ENABLE_TCP) - list(APPEND PUBLIC_HEADERS "${SHIM_INC_DIR}/modbus-tcp.h") -endif() - -if(MODBUS_ENABLE_RTU) - list(APPEND PUBLIC_HEADERS "${SHIM_INC_DIR}/modbus-rtu.h") -endif() - -install(FILES ${PUBLIC_HEADERS} - DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" -) diff --git a/Dockerfiles/build-base/windows/Dockerfile.agent b/Dockerfiles/build-base/windows/Dockerfile.agent deleted file mode 100644 index 7bef42a1..00000000 --- a/Dockerfiles/build-base/windows/Dockerfile.agent +++ /dev/null @@ -1,346 +0,0 @@ -# syntax=docker/dockerfile:1.6 -# escape=` -ARG OS_BASE_IMAGE=mcr.microsoft.com/windows/servercore:ltsc2022 - -ARG NASM_VERSION=3.02 -ARG VS_BUILDTOOLS_VERSION=17 -ARG PWSH_VERSION=7.6.3 - -ARG PCRE2_VERSION=10.47 -ARG OPENSSL_VERSION=4.0.1 -ARG LIBMODBUS_VERSION=3.2.0 -ARG ZLIB_VERSION=1.3.2 -ARG CURL_VERSION=8.21.0 - -ARG MAJOR_VERSION=7.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.12 - -FROM ${OS_BASE_IMAGE} AS src - -ARG NASM_VERSION -ARG VS_BUILDTOOLS_VERSION -ARG PWSH_VERSION - -ARG PCRE2_VERSION -ARG OPENSSL_VERSION -ARG LIBMODBUS_VERSION -ARG ZLIB_VERSION -ARG CURL_VERSION - -ARG GIT_URL=https://github.com/git-for-windows/git/releases/download/v2.55.0.windows.2/MinGit-2.55.0.2-64-bit.zip -ARG PERL_URL=https://github.com/StrawberryPerl/Perl-Dist-Strawberry/releases/download/SP_54221_64bit/strawberry-perl-5.42.2.1-64bit-portable.zip - -ARG VS_BUILDTOOLS_URL=https://aka.ms/vs/$VS_BUILDTOOLS_VERSION/release/vs_buildtools.exe -ARG NASM_URL=https://www.nasm.us/pub/nasm/releasebuilds/$NASM_VERSION/win64/nasm-$NASM_VERSION-win64.zip - -ARG PCRE2_URL=https://github.com/PCRE2Project/pcre2/releases/download/pcre2-$PCRE2_VERSION/pcre2-$PCRE2_VERSION.zip -ARG OPENSSL_URL=https://github.com/openssl/openssl/releases/download/openssl-$OPENSSL_VERSION/openssl-$OPENSSL_VERSION.tar.gz -ARG LIBMODBUS_URL=https://github.com/stephane/libmodbus/archive/refs/tags/v$LIBMODBUS_VERSION.tar.gz -ARG ZLIB_URL=https://zlib.net/zlib-$ZLIB_VERSION.tar.gz -ARG CURL_URL=https://curl.se/download/curl-$CURL_VERSION.tar.gz - -ARG PWSH_URL=https://github.com/PowerShell/PowerShell/releases/download/v$PWSH_VERSION/PowerShell-$PWSH_VERSION-win-x64.zip - -ADD --checksum=sha256:d74c183c86c77248ad50017c7f45bae8f88106a6cca5d87ad09917e1c6fb0784 $PCRE2_URL build_src\pcre2.zip -ADD --checksum=sha256:2db3f3a0d6ea4b59e1f094ace2c8cd536dffb87cdc39084c5afa1e6f7f37dd09 $OPENSSL_URL build_src\openssl.tar.gz -ADD --checksum=sha256:72239f319b9b8483e3d393c5a60865d734fcff18a8abbb2486e389834a2f6ef1 $LIBMODBUS_URL build_src\libmodbus.tar.gz -ADD --checksum=sha256:bb329a0a2cd0274d05519d61c667c062e06990d72e125ee2dfa8de64f0119d16 $ZLIB_URL build_src\zlib.tar.gz -ADD --checksum=sha256:d9b327997999045a24cda50f3983e69e51c516bd8be6ef9842fc7f99135e33bb $CURL_URL build_src\curl.tar.gz - -ADD --checksum=sha256:07ddb0d00b660459560ef82a9841da7705b27cd5dcca5a0d7b025a98eca29eca $PWSH_URL build_deps\pwsh.zip -ADD --checksum=sha256:e3ea2944cea4b3fabcd69c7c1669ef69b1b66c05ac7806d81224d0abad2dec31 $GIT_URL build_deps\git.zip -ADD --checksum=sha256:32d83be90cf04b807cfb9477482bc36302cdee6f5b04cf57e81adecbd8f07898 $PERL_URL build_deps\perl.zip -ADD --checksum=sha256:161d0bfaff53c2f9e9f3e69fd0672323ebabafd1268976a5cec11be92a19aee7 $NASM_URL build_deps\nasm.zip -ADD $VS_BUILDTOOLS_URL build_deps\vs_buildtools.exe - -COPY CMakeLists.txt build_src\libmodbus_project\ - -SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] - -RUN Set-Location -Path $env:SystemDrive\.; ` - ` - $env:BUILD_SRC = [string]::Format('{0}\build_src', $env:SystemDrive); ` - [Environment]::SetEnvironmentVariable('BUILD_SRC', $env:BUILD_SRC, [EnvironmentVariableTarget]::Machine); ` - $env:BUILD_DEPS = [string]::Format('{0}\build_deps', $env:SystemDrive); ` - [Environment]::SetEnvironmentVariable('BUILD_DEPS', $env:BUILD_DEPS, [EnvironmentVariableTarget]::Machine); ` - ` - Set-Location -Path $env:BUILD_DEPS; ` - Write-Host 'Installing PowerShell...'; ` - Expand-Archive ` - -Path $env:BUILD_DEPS\pwsh.zip ` - -DestinationPath $env:BUILD_DEPS\pwsh\.; ` - Get-ChildItem -Path $env:BUILD_DEPS\pwsh -Directory | Where-Object { ` - $_.Name -match '^(cs|de|es|fr|it|ja|ko|pl|pt-BR|ru|tr|zh-Hans|zh-Hant)$' ` - } | Remove-Item -Recurse -Force; ` - Get-ChildItem -Path $env:BUILD_DEPS\pwsh -Recurse -Include '*.xml' | Where-Object { $_.FullName -notmatch '\\en-US\\' } | Remove-Item -Force; ` - Get-ChildItem -Path $env:BUILD_DEPS\pwsh -Recurse -Include '*.resources.dll' | Where-Object { $_.FullName -notmatch '\\en-US\\' } | Remove-Item -Force; ` - ` - Write-Host 'Installing NASM...'; ` - Expand-Archive ` - -Path $env:BUILD_DEPS\nasm.zip ` - -DestinationPath $env:BUILD_DEPS\.; ` - Rename-Item -Path $env:BUILD_DEPS\nasm-$env:NASM_VERSION -NewName $env:BUILD_DEPS\NASM; ` - ` - Write-Host 'Installing GIT...'; ` - Expand-Archive ` - -Path $env:BUILD_DEPS\git.zip ` - -DestinationPath $env:BUILD_DEPS\git\.; ` - ` - Write-Host 'Installing Perl...'; ` - Expand-Archive -Path $env:BUILD_DEPS\perl.zip -DestinationPath $env:BUILD_DEPS\perl\; ` - Remove-Item -Force -Recurse $env:BUILD_DEPS\perl\c\; ` - ` - Set-Location -Path $env:BUILD_SRC; ` - ` - Write-Host 'Extracting PCRE2 archive ...'; ` - Expand-Archive -Path $env:BUILD_SRC\pcre2.zip -DestinationPath $env:BUILD_SRC; ` - Rename-Item -Path $env:BUILD_SRC\pcre2-$env:PCRE2_VERSION -NewName $env:BUILD_SRC\pcre2; ` - New-Item -ItemType directory -Path "$env:BUILD_SRC\pcre2\build" | Out-Null; ` - ` - Write-Host 'Extracting OpenSSL archive ...'; ` - tar -zxf $env:BUILD_SRC\openssl.tar.gz; ` - Rename-Item -Path $env:BUILD_SRC\openssl-$env:OPENSSL_VERSION -NewName $env:BUILD_SRC\openssl; ` - Remove-Item -Recurse -Force $env:BUILD_SRC\openssl\test -ErrorAction SilentlyContinue; ` - ` - Write-Host 'Extracting Libmodbus archive ...'; ` - tar -zxf $env:BUILD_SRC\libmodbus.tar.gz; ` - Move-Item -Path $env:BUILD_SRC\libmodbus-$env:LIBMODBUS_VERSION\ -Destination $env:BUILD_SRC\libmodbus; ` - Copy-Item $env:BUILD_SRC\libmodbus_project\CMakeLists.txt -Destination $env:BUILD_SRC\libmodbus\CMakeLists.txt; ` - Remove-Item -Force -Recurse $env:BUILD_SRC\libmodbus_project\; ` - ` - Write-Host 'Extracting Zlib archive ...'; ` - tar -zxf $env:BUILD_SRC\zlib.tar.gz; ` - Move-Item -Path $env:BUILD_SRC\zlib-$env:ZLIB_VERSION\ -Destination $env:BUILD_SRC\zlib; ` - ` - Write-Host 'Extracting CURL archive ...'; ` - tar -zxf $env:BUILD_SRC\curl.tar.gz; ` - Move-Item -Path $env:BUILD_SRC\curl-$env:CURL_VERSION\ -Destination $env:BUILD_SRC\curl; ` - ` - Write-Host 'Removing downloaded...'; ` - Remove-Item -Force -Recurse $env:BUILD_SRC\*.tar.gz -ErrorAction SilentlyContinue; ` - Remove-Item -Force -Recurse $env:BUILD_SRC\*.zip -ErrorAction SilentlyContinue; ` - Remove-Item -Force -Recurse $env:BUILD_DEPS\*.tar.gz -ErrorAction SilentlyContinue; ` - Remove-Item -Force -Recurse $env:BUILD_DEPS\*.zip -ErrorAction SilentlyContinue; - -FROM ${OS_BASE_IMAGE} - -ARG NASM_VERSION -ARG VS_BUILDTOOLS_VERSION - -ARG PCRE2_VERSION -ARG OPENSSL_VERSION -ARG LIBMODBUS_VERSION -ARG ZLIB_VERSION -ARG CURL_VERSION - -ARG MAJOR_VERSION -ARG ZBX_VERSION - -ENV ZBX_VERSION=$ZBX_VERSION ` - VS_BUILDTOOLS_VERSION=$VS_BUILDTOOLS_VERSION ` - PCRE2_VERSION=$PCRE2_VERSION OPENSSL_VERSION=$OPENSSL_VERSION LIBMODBUS_VERSION=$LIBMODBUS_VERSION - -LABEL org.opencontainers.image.title="Zabbix agent build base for Windows" ` - org.opencontainers.image.authors="Alexey Pustovalov " ` - org.opencontainers.image.vendor="Zabbix SIA" ` - org.opencontainers.image.url="https://zabbix.com/" ` - org.opencontainers.image.description="Zabbix build base image contains all required packages to build Zabbix agent images" ` - org.opencontainers.image.licenses="AGPL v3.0" ` - org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" ` - org.opencontainers.image.version="${ZBX_VERSION}" - -COPY --from=src build_src build_src -COPY --from=src build_deps build_deps - -SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] - -RUN Set-Location -Path $env:SystemDrive\.; ` - ` - $env:BUILD_OUTPUT = [string]::Format('{0}\build_output', $env:SystemDrive); ` - [Environment]::SetEnvironmentVariable('BUILD_OUTPUT', $env:BUILD_OUTPUT, [EnvironmentVariableTarget]::Machine); ` - $env:BUILD_SRC = [string]::Format('{0}\build_src', $env:SystemDrive); ` - [Environment]::SetEnvironmentVariable('BUILD_SRC', $env:BUILD_SRC, [EnvironmentVariableTarget]::Machine); ` - $env:BUILD_DEPS = [string]::Format('{0}\build_deps', $env:SystemDrive); ` - [Environment]::SetEnvironmentVariable('BUILD_DEPS', $env:BUILD_DEPS, [EnvironmentVariableTarget]::Machine); ` - ` - $env:PATH = [string]::Format('{0}\perl\perl\bin;{0}\NASM;{0}\git\cmd;{0}\git\mingw64\bin;{0}\git\usr\bin;', $env:BUILD_DEPS) + $env:PATH; ` - [Environment]::SetEnvironmentVariable('PATH', $env:PATH, [EnvironmentVariableTarget]::Machine); ` - ` - New-Item -ItemType directory -Path $env:BUILD_OUTPUT -Force | Out-Null; ` - Write-Host 'Verifying install ("git version") ...'; ` - git version; ` - ` - Write-Host 'Verifying install ("nasm -v") ...'; ` - nasm -v; ` - ` - Write-Host 'Verifying install ("perl -v") ...'; ` - perl -v; ` - ` - Write-Host ('{0} - Visual Studio components installing...' -f $(Get-Date -format 'u')); ` - cmd /C start /w $env:BUILD_DEPS\vs_buildtools.exe ` - --quiet ` - --wait ` - --norestart ` - --nocache ` - --installPath """${env:ProgramFiles(x86)}\Microsoft Visual Studio\2022\BuildTools""" ` - --channelUri https://aka.ms/vs/$env:VS_BUILDTOOLS_VERSION/release/channel ` - --installChannelUri https://aka.ms/vs/$env:VS_BUILDTOOLS_VERSION/release/channel ` - --channelId VisualStudio.$env:VS_BUILDTOOLS_VERSION.Release ` - # https://docs.microsoft.com/en-us/visualstudio/install/workload-component-id-vs-build-tools?view=vs-2022 - --add Microsoft.VisualStudio.Component.Windows11SDK.22621 ` - --add Microsoft.VisualStudio.Component.VC.CMake.Project; ` - if ($err = dir $Env:TEMP -Filter dd_setup_*_errors.log | where Length -gt 0 | Get-Content) { ` - throw $err; ` - }; ` - Wait-Process -name msiexec; ` - Write-Host ('{0} - Visual Studio components installed' -f $(Get-Date -format 'u')); ` - ` - $env:VS_PATH = &(Join-Path ${env:ProgramFiles(x86)} """\Microsoft Visual Studio\Installer\vswhere.exe""") -latest -products Microsoft.VisualStudio.Product.BuildTools -property installationPath; ` - [Environment]::SetEnvironmentVariable('VS_PATH', $env:VS_PATH, [EnvironmentVariableTarget]::Machine); ` - ` - $env:VS_DEVSHELL = (Get-ChildItem $env:VS_PATH -Recurse -File -Filter Microsoft.VisualStudio.DevShell.dll).FullName; ` - [Environment]::SetEnvironmentVariable('VS_DEVSHELL', $env:VS_DEVSHELL, [EnvironmentVariableTarget]::Machine); ` - ` - Write-Host 'Visual Studio components installation cleanup'; ` - Get-ChildItem -Path """${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer""" -Directory -Recurse | Remove-Item -Force -Recurse; ` - ` - Write-Host 'Build environment is ready...'; - -RUN Import-Module $env:VS_DEVSHELL; ` - Enter-VsDevShell -VsInstallPath $env:VS_PATH -SkipAutomaticLocation -DevCmdArguments """-arch=x64"""; ` - ` - Write-Host 'Building Zlib library...'; ` - Set-Location -Path $env:SystemDrive\.; ` - $env:CL = """$env:CL /MP"""; ` - cmake -S $env:BUILD_SRC\zlib -B $env:BUILD_SRC\zlib\build ` - -G """Visual Studio 17 2022""" ` - -A x64 ` - -DZLIB_BUILD_TESTING=OFF ` - -DZLIB_BUILD_SHARED=OFF ` - -DZLIB_BUILD_STATIC=ON ` - -DZLIB_BUILD_MINIZIP=OFF ` - -DCMAKE_MSVC_RUNTIME_LIBRARY="""MultiThreaded$<$:Debug>""" ` - -DCMAKE_INSTALL_PREFIX="""$env:BUILD_OUTPUT\zlib"""; ` - cmake --build $env:BUILD_SRC\zlib\build --config Release --parallel; ` - cmake --install $env:BUILD_SRC\zlib\build --config Release; ` - Remove-Item -Path $env:BUILD_SRC\zlib\build -Force -Recurse; ` - Write-Host 'Zlib is ready...'; - -RUN Import-Module $env:VS_DEVSHELL; ` - Enter-VsDevShell -VsInstallPath $env:VS_PATH -SkipAutomaticLocation -DevCmdArguments """-arch=x64"""; ` - ` - Write-Host 'Building OpenSSL library...'; ` - Set-Location -Path $env:BUILD_SRC\openssl; ` - $env:CL = """$env:CL /nologo /MP /MT /wd4267 /wd4244"""; ` - $env:NMAKEFLAGS = """/nologo"""; ` - perl $env:BUILD_SRC\openssl\Configure ` - VC-WIN64A ` - no-autoload-config ` - no-apps ` - no-docs ` - no-dgram ` - no-dtls1-method ` - no-dtls1_2-method ` - no-gost ` - no-shared ` - no-srp ` - no-module ` - no-makedepend ` - no-tests ` - no-ui-console ` - no-winstore ` - --api=1.1.0 ` - no-deprecated ` - --prefix=$env:BUILD_OUTPUT\openssl ` - --openssldir=$env:BUILD_OUTPUT\openssl_ssl; ` - nmake /S build_libs | Out-Null; ` - nmake /S INSTALLDOCS=0 INSTALLHTML=0 install_dev; ` - $ErrorActionPreference = 'Continue'; ` - nmake /S clean 2>$null | Out-Null; ` - Write-Host 'OpenSSL is ready...'; - -RUN Import-Module $env:VS_DEVSHELL; ` - Enter-VsDevShell -VsInstallPath $env:VS_PATH -SkipAutomaticLocation -DevCmdArguments """-arch=x64"""; ` - ` - Write-Host 'Building PCRE2 library ...'; ` - Set-Location -Path $env:BUILD_SRC\pcre2; ` - $env:CL = """$env:CL /MP"""; ` - cmake -S $env:BUILD_SRC\pcre2 -B $env:BUILD_SRC\pcre2\build ` - -G """Visual Studio 17 2022""" ` - -A x64 ` - -DBUILD_SHARED_LIBS=OFF ` - -DBUILD_STATIC_LIBS=ON ` - -DPCRE2_BUILD_PCRE2_8=ON ` - -DPCRE2_BUILD_PCRE2_16=OFF ` - -DPCRE2_BUILD_PCRE2_32=OFF ` - -DPCRE2_BUILD_PCRE2GREP=OFF ` - -DPCRE2_BUILD_TESTS=OFF ` - -DPCRE2_DEBUG=OFF ` - -DPCRE2_SUPPORT_JIT=OFF ` - -DPCRE2_SUPPORT_UNICODE=ON ` - -DINSTALL_MSVC_PDB=OFF ` - -DCMAKE_MSVC_RUNTIME_LIBRARY="""MultiThreaded$<$:Debug>""" ` - -DCMAKE_INSTALL_PREFIX="""$env:BUILD_OUTPUT\pcre2"""; ` - ` - cmake --build $env:BUILD_SRC\pcre2\build --config Release --parallel; ` - cmake --install $env:BUILD_SRC\pcre2\build --config Release; ` - ` - Remove-Item -Recurse -Force -Path $env:BUILD_OUTPUT\pcre2\share -ErrorAction SilentlyContinue; ` - Remove-Item -Recurse -Force $env:BUILD_SRC\pcre2\build; ` - Write-Host 'PCRE2 is ready...'; - -RUN Import-Module $env:VS_DEVSHELL; ` - Enter-VsDevShell -VsInstallPath $env:VS_PATH -SkipAutomaticLocation -DevCmdArguments """-arch=x64"""; ` - ` - Write-Host 'Building Libmodbus library ...'; ` - $env:CL = """$env:CL /MP"""; ` - Set-Location -Path $env:BUILD_SRC\libmodbus\src\win32; ` - cscript //nologo .\configure.js; ` - Set-Location -Path $env:BUILD_SRC\libmodbus; ` - cmake -S $env:BUILD_SRC\libmodbus -B $env:BUILD_SRC\libmodbus\build ` - -G """Visual Studio 17 2022""" ` - -A x64 ` - -DBUILD_SHARED_LIBS=OFF ` - -DCMAKE_MSVC_RUNTIME_LIBRARY="""MultiThreaded$<$:Debug>""" ` - -DCMAKE_INSTALL_PREFIX="""$env:BUILD_OUTPUT\libmodbus"""; ` - ` - cmake --build $env:BUILD_SRC\libmodbus\build --config Release --parallel; ` - cmake --install $env:BUILD_SRC\libmodbus\build --config Release; ` - Remove-Item -Recurse -Force $env:BUILD_SRC\libmodbus\build; ` - Write-Host 'Libmodbus is ready...'; - -RUN Import-Module $env:VS_DEVSHELL; ` - Enter-VsDevShell -VsInstallPath $env:VS_PATH -SkipAutomaticLocation -DevCmdArguments """-arch=x64"""; ` - Write-Host 'Building Curl library...'; ` - Set-Location -Path $env:BUILD_SRC\curl; ` - $env:CL = """$env:CL /MP"""; ` - cmake -S $env:BUILD_SRC\curl -B $env:BUILD_SRC\curl\build ` - -G """Visual Studio 17 2022""" ` - -A x64 ` - -DCMAKE_MSVC_RUNTIME_LIBRARY="""MultiThreaded$<$:Debug>""" ` - -DBUILD_CURL_EXE=OFF ` - -DBUILD_EXAMPLES=OFF ` - -DBUILD_TESTING=OFF ` - -DENABLE_CURL_MANUAL=OFF ` - -DBUILD_LIBCURL_DOCS=OFF ` - -DBUILD_MISC_DOCS=OFF ` - -DBUILD_SHARED_LIBS=OFF ` - -DBUILD_STATIC_LIBS=ON ` - -DCURL_DISABLE_LDAP=ON ` - -DCURL_DISABLE_LDAPS=ON ` - -DCURL_STATIC_CRT=ON ` - -DCURL_USE_LIBPSL=OFF ` - -DCURL_USE_OPENSSL=ON ` - -DCURL_ZLIB=ON ` - -DENABLE_UNICODE=ON ` - -DOPENSSL_ROOT_DIR="""$env:BUILD_OUTPUT\openssl""" ` - -DOPENSSL_USE_STATIC_LIBS=ON ` - -DCURL_DISABLE_OPENSSL_AUTO_LOAD_CONFIG=ON ` - -DUSE_WIN32_IDN=OFF ` - -DZLIB_INCLUDE_DIR="""$env:BUILD_OUTPUT\zlib\include""" ` - -DZLIB_LIBRARY="""$env:BUILD_OUTPUT\zlib\lib\zs.lib""" ` - -DZLIB_USE_STATIC_LIBS=ON ` - -DCMAKE_INSTALL_PREFIX="""$env:BUILD_OUTPUT\curl"""; ` - cmake --build $env:BUILD_SRC\curl\build --config Release --parallel; ` - cmake --install $env:BUILD_SRC\curl\build --config Release; ` - Remove-Item -Path $env:BUILD_SRC\curl\build\ -Force -Recurse; diff --git a/Dockerfiles/build-base/windows/Dockerfile.agent2 b/Dockerfiles/build-base/windows/Dockerfile.agent2 deleted file mode 100644 index c4cad426..00000000 --- a/Dockerfiles/build-base/windows/Dockerfile.agent2 +++ /dev/null @@ -1,219 +0,0 @@ -# syntax=docker/dockerfile:1.6 -# escape=` -ARG OS_BASE_IMAGE=mcr.microsoft.com/windows/servercore:ltsc2022 - -ARG PCRE2_VERSION=10.47 -ARG OPENSSL_VERSION=4.0.1 -ARG GOLANG_VERSION=1.26.4 -ARG PWSH_VERSION=7.6.3 - -ARG MSYSTEM=UCRT64 - -ARG MAJOR_VERSION=7.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.12 - -FROM ${OS_BASE_IMAGE} as src - -ARG PCRE2_VERSION -ARG OPENSSL_VERSION -ARG GOLANG_VERSION -ARG PWSH_VERSION - -ARG MSYSTEM - -ARG MINGW_URL=https://github.com/niXman/mingw-builds-binaries/releases/download/16.1.0-rt_v14-rev1/x86_64-16.1.0-release-win32-seh-ucrt-rt_v14-rev1.7z -ARG GOLANG_URL=https://go.dev/dl/go$GOLANG_VERSION.windows-amd64.zip -ARG MSYS2_URL=https://github.com/msys2/msys2-installer/releases/download/2026-06-11/msys2-base-x86_64-20260611.sfx.exe - -ARG PCRE2_URL=https://github.com/PCRE2Project/pcre2/releases/download/pcre2-$PCRE2_VERSION/pcre2-$PCRE2_VERSION.zip -ARG OPENSSL_URL=https://github.com/openssl/openssl/releases/download/openssl-$OPENSSL_VERSION/openssl-$OPENSSL_VERSION.tar.gz - -ARG PWSH_URL=https://github.com/PowerShell/PowerShell/releases/download/v$PWSH_VERSION/PowerShell-$PWSH_VERSION-win-x64.zip - -ADD --checksum=sha256:07ddb0d00b660459560ef82a9841da7705b27cd5dcca5a0d7b025a98eca29eca $PWSH_URL build_deps\pwsh.zip -ADD --checksum=sha256:3ca8fb4630b07c419cbdd51f754e31363cfcfb83b3a5354d9e895c90be2cc345 $GOLANG_URL build_deps\go_lang.zip -ADD --checksum=sha256:12d9b93100aa092831fa7931c57e58ec86946b1587907d20e2db81928c32a98a $MINGW_URL build_deps\mingw.7z -ADD --checksum=sha256:c105946e64e08f099ac0e4647461ce762b95333ad211777666476a9a41451d65 $MSYS2_URL build_deps\msys2.sfx.exe - -ADD --checksum=sha256:d74c183c86c77248ad50017c7f45bae8f88106a6cca5d87ad09917e1c6fb0784 $PCRE2_URL build_src\pcre2.zip -ADD --checksum=sha256:2db3f3a0d6ea4b59e1f094ace2c8cd536dffb87cdc39084c5afa1e6f7f37dd09 $OPENSSL_URL build_src\openssl.tar.gz - -SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] - -RUN $env:BUILD_SRC = [string]::Format('{0}\build_src', $env:SystemDrive); ` - [Environment]::SetEnvironmentVariable('BUILD_SRC', $env:BUILD_SRC, [EnvironmentVariableTarget]::Machine); ` - $env:BUILD_DEPS = [string]::Format('{0}\build_deps', $env:SystemDrive); ` - [Environment]::SetEnvironmentVariable('BUILD_DEPS', $env:BUILD_DEPS, [EnvironmentVariableTarget]::Machine); ` - $env:MSYS_BIN = [string]::Format('{0}\msys64\{1}\bin', $env:BUILD_DEPS, $env:MSYSTEM.ToLower()); ` - [Environment]::SetEnvironmentVariable('MSYS_BIN', $env:MSYS_BIN, [EnvironmentVariableTarget]::Machine); ` - ` - $env:PATH = $env:PATH + [string]::Format(';{0}\mingw64\bin;{0}\go\bin;{0}\msys64\usr\bin', $env:BUILD_DEPS); ` - [Environment]::SetEnvironmentVariable('PATH', $env:PATH, [EnvironmentVariableTarget]::Machine); ` - ` - Set-Location -Path $env:BUILD_DEPS; ` - Write-Host 'Installing PowerShell...'; ` - Expand-Archive ` - -Path $env:BUILD_DEPS\pwsh.zip ` - -DestinationPath $env:BUILD_DEPS\pwsh\.; ` - Get-ChildItem -Path $env:BUILD_DEPS\pwsh -Directory | Where-Object { ` - $_.Name -match '^(cs|de|es|fr|it|ja|ko|pl|pt-BR|ru|tr|zh-Hans|zh-Hant)$' ` - } | Remove-Item -Recurse -Force; ` - Get-ChildItem -Path $env:BUILD_DEPS\pwsh -Recurse -Include '*.xml' | Where-Object { $_.FullName -notmatch '\\en-US\\' } | Remove-Item -Force; ` - Get-ChildItem -Path $env:BUILD_DEPS\pwsh -Recurse -Include '*.resources.dll' | Where-Object { $_.FullName -notmatch '\\en-US\\' } | Remove-Item -Force; ` - ` - Write-Host 'Installing MSYS2...'; ` - & $env:BUILD_DEPS\msys2.sfx.exe -y -o"""$env:BUILD_DEPS\""" | Out-Null; ` - function msys() { bash @('-lc') + @Args; }; ` - msys """sed -i -E '/^\[(clangarm64|mingw32|mingw64|clang64)\]/,/^Include/ s/^[^#]/#&/' /etc/pacman.conf"""; ` - msys 'pacman --noprogressbar --noconfirm -Syuu'; ` - msys 'pacman --noprogressbar --noconfirm -Syuu'; ` - msys 'pacman --noprogressbar --sync --quiet --noconfirm mingw-w64-ucrt-x86_64-cmake mingw-w64-ucrt-x86_64-7zip git'; ` - msys 'pacman --noprogressbar --noconfirm -Scc'; ` - msys 'rm -rf /usr/share/man/* /usr/share/doc/* /usr/share/locale/*'; ` - msys 'rm -rf /$MSYSTEM/usr/share/man/* /$MSYSTEM/usr/share/doc/* /$MSYSTEM/usr/share/locale/*'; ` - msys 'rm -rf /$MSYSTEM/share/man/* /$MSYSTEM/share/doc/* /$MSYSTEM/share/locale/*'; ` - msys 'rm -rf /var/cache/pacman/pkg/*'; ` - taskkill /F /FI 'MODULES eq msys-2.0.dll' | Out-Null; ` - compact /c /i /s:$env:BUILD_DEPS\msys64 | Out-Null; ` - ` - Write-Host 'Installing Mingw-w64...'; ` - & $env:MSYS_BIN\7z.exe x $env:BUILD_DEPS\mingw.7z -bso0 -bsp0; ` - compact /c /i /s:$env:BUILD_DEPS\mingw64 | Out-Null; ` - ` - Write-Host 'Installing Go Lang...'; ` - Expand-Archive -Path $env:BUILD_DEPS\go_lang.zip -DestinationPath $env:BUILD_DEPS; ` - ` - Set-Location -Path $env:BUILD_SRC; ` - ` - Write-Host 'Extracting PCRE2 archive ...'; ` - Expand-Archive -Path $env:BUILD_SRC\pcre2.zip -DestinationPath $env:BUILD_SRC; ` - Rename-Item -Path $env:BUILD_SRC\pcre2-$env:PCRE2_VERSION -NewName $env:BUILD_SRC\pcre2; ` - ` - Write-Host 'Extracting OpenSSL archive ...'; ` - $env:SystemDirectory = [Environment]::SystemDirectory; ` - tar -zxf "$env:BUILD_SRC\openssl.tar.gz"; ` - Rename-Item -Path $env:BUILD_SRC\openssl-$env:OPENSSL_VERSION -NewName $env:BUILD_SRC\openssl; ` - Remove-Item -Recurse -Force $env:BUILD_SRC\openssl\test -ErrorAction SilentlyContinue; ` - ` - Write-Host 'Removing downloaded...'; ` - Remove-Item -Force -Recurse $env:BUILD_SRC\*.tar.gz -ErrorAction SilentlyContinue; ` - Remove-Item -Force -Recurse $env:BUILD_SRC\*.zip -ErrorAction SilentlyContinue; ` - Remove-Item -Force -Recurse $env:BUILD_DEPS\*.tar.gz -ErrorAction SilentlyContinue; ` - Remove-Item -Force -Recurse $env:BUILD_DEPS\*.zip -ErrorAction SilentlyContinue; ` - Remove-Item -Force -Recurse $env:BUILD_DEPS\*.exe -ErrorAction SilentlyContinue; ` - Remove-Item -Force -Recurse $env:BUILD_DEPS\*.7z -ErrorAction SilentlyContinue; - -FROM ${OS_BASE_IMAGE} - -ARG PCRE2_VERSION -ARG OPENSSL_VERSION -ARG GOLANG_VERSION - -ARG MSYSTEM - -ARG MAJOR_VERSION -ARG ZBX_VERSION - -ENV ZBX_VERSION=$ZBX_VERSION ` - GOLANG_VERSION=$GOLANG_VERSION ` - PCRE2_VERSION=$PCRE2_VERSION OPENSSL_VERSION=$OPENSSL_VERSION ` - CHERE_INVOKING=yes MSYSTEM=$MSYSTEM - -LABEL org.opencontainers.image.title="Zabbix agent 2 build base for Windows" ` - org.opencontainers.image.authors="Alexey Pustovalov " ` - org.opencontainers.image.vendor="Zabbix SIA" ` - org.opencontainers.image.url="https://zabbix.com/" ` - org.opencontainers.image.description="Zabbix build base image contains all required packages to build Zabbix agent 2 images" ` - org.opencontainers.image.licenses="AGPL v3.0" ` - org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" ` - org.opencontainers.image.version="${ZBX_VERSION}" - -COPY --from=src build_src build_src -COPY --from=src build_deps build_deps - -SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] - -RUN Set-Location -Path $env:SystemDrive\.; ` - ` - $env:BUILD_OUTPUT = [string]::Format('{0}\build_output', $env:SystemDrive); ` - [Environment]::SetEnvironmentVariable('BUILD_OUTPUT', $env:BUILD_OUTPUT, [EnvironmentVariableTarget]::Machine); ` - $env:BUILD_SRC = [string]::Format('{0}\build_src', $env:SystemDrive); ` - [Environment]::SetEnvironmentVariable('BUILD_SRC', $env:BUILD_SRC, [EnvironmentVariableTarget]::Machine); ` - $env:BUILD_DEPS = [string]::Format('{0}\build_deps', $env:SystemDrive); ` - [Environment]::SetEnvironmentVariable('BUILD_DEPS', $env:BUILD_DEPS, [EnvironmentVariableTarget]::Machine); ` - $env:MSYS_BIN = [string]::Format('{0}\msys64\{1}\bin', $env:BUILD_DEPS, $env:MSYSTEM.ToLower()); ` - [Environment]::SetEnvironmentVariable('MSYS_BIN', $env:MSYS_BIN, [EnvironmentVariableTarget]::Machine); ` - ` - $env:PATH = $env:PATH + [string]::Format(';{0}\mingw64\bin;{0}\go\bin;{0}\msys64\usr\bin', $env:BUILD_DEPS); ` - [Environment]::SetEnvironmentVariable('PATH', $env:PATH, [EnvironmentVariableTarget]::Machine); ` - ` - New-Item -ItemType directory -Path $env:BUILD_OUTPUT -Force | Out-Null; ` - ` - Write-Host 'Verifying install ("go version") ...'; ` - go version; ` - ` - Write-Host 'Verifying install ("bash --version") ...'; ` - bash --version; ` - ` - Write-Host 'Verifying install ("gcc -v") ...'; ` - gcc -v; ` - ` - Write-Host 'Verifying install ("git -v") ...'; ` - git --version; ` - ` - Write-Host 'Build environment is ready...'; - -RUN Write-Host 'Building PCRE2 library ...'; ` - Set-Location -Path $env:BUILD_SRC\pcre2; ` - & $env:MSYS_BIN\cmake.exe -S $env:BUILD_SRC\pcre2 -B $env:BUILD_SRC\pcre2\build ` - -G 'MinGW Makefiles' ` - -DBUILD_SHARED_LIBS=OFF ` - -DBUILD_STATIC_LIBS=ON ` - -DPCRE2_BUILD_PCRE2_8=ON ` - -DPCRE2_BUILD_PCRE2_16=OFF ` - -DPCRE2_BUILD_PCRE2_32=OFF ` - -DPCRE2_BUILD_PCRE2GREP=OFF ` - -DPCRE2_BUILD_TESTS=OFF ` - -DPCRE2_DEBUG=OFF ` - -DPCRE2_SUPPORT_JIT=OFF ` - -DPCRE2_SUPPORT_UNICODE=ON ` - -DCMAKE_C_COMPILER="""$env:BUILD_DEPS\mingw64\bin\gcc.exe""" ` - -DCMAKE_C_FLAGS='-O2 -g' ` - -DCMAKE_INSTALL_PREFIX="""$env:BUILD_OUTPUT\pcre2""" . ; ` - Set-Location -Path $env:BUILD_SRC\pcre2\build; ` - mingw32-make -s -j"""$env:NUMBER_OF_PROCESSORS"""; ` - mingw32-make -s -j"""$env:NUMBER_OF_PROCESSORS""" install; ` - mingw32-make -s clean | Out-Null; ` - Remove-Item -Recurse -Force -Path $env:BUILD_OUTPUT\pcre2\share -ErrorAction SilentlyContinue; ` - Write-Host 'PCRE2 is ready...'; - -RUN Write-Host 'Building OpenSSL library...'; ` - Set-Location -Path $env:BUILD_SRC\openssl; ` - $env:CFLAGS = """$env:CFLAGS -Wno-overflow""".Trim(); ` - perl Configure ` - mingw64 ` - no-autoload-config ` - no-apps ` - no-docs ` - no-dgram ` - no-dtls1-method ` - no-dtls1_2-method ` - no-gost ` - no-shared ` - no-srp ` - no-makedepend ` - no-module ` - no-tests ` - no-ui-console ` - no-winstore ` - thread_scheme=winthreads ` - --api=1.1.0 ` - no-deprecated ` - --libdir=lib ` - --prefix=$env:BUILD_OUTPUT/openssl ` - --openssldir=$env:BUILD_OUTPUT/openssl_ssl; ` - mingw32-make -s -j"""$env:NUMBER_OF_PROCESSORS""" build_libs; ` - mingw32-make -s -j"""$env:NUMBER_OF_PROCESSORS""" install_dev; ` - mingw32-make -s clean | Out-Null; ` - Write-Host 'OpenSSL is ready...'; ` - Write-Host 'Build environment is ready'; diff --git a/Dockerfiles/build-base/windows/Dockerfile_llvm_clang.agent2 b/Dockerfiles/build-base/windows/Dockerfile_llvm_clang.agent2 deleted file mode 100644 index 8af48f41..00000000 --- a/Dockerfiles/build-base/windows/Dockerfile_llvm_clang.agent2 +++ /dev/null @@ -1,187 +0,0 @@ -# syntax=docker/dockerfile:1 -# escape=` -ARG BUILD_BASE_IMAGE=mcr.microsoft.com/windows/servercore:ltsc2022 -FROM $BUILD_BASE_IMAGE as builder_base - -ARG PCRE2_VERSION=10.44 -ARG OPENSSL_VERSION=3.3.2 -ARG GOLANG_VERSION=1.23.2 - -ARG MSYSTEM=CLANG64 - -ARG BUILD_ARCH=x64 - -ARG MAJOR_VERSION=7.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.0 - -ARG VS_BUILDTOOLS_URL=https://aka.ms/vs/17/release/vs_buildtools.exe -ARG GOLANG_URL=https://go.dev/dl/go$GOLANG_VERSION.windows-amd64.zip -ARG MSYS2_URL=https://api.github.com/repos/msys2/msys2-installer/releases/latest - -ARG PCRE2_URL=https://github.com/PhilipHazel/pcre2/releases/download/pcre2-$PCRE2_VERSION/pcre2-$PCRE2_VERSION.zip -ARG OPENSSL_URL=https://github.com/openssl/openssl/releases/download/openssl-$OPENSSL_VERSION/openssl-$OPENSSL_VERSION.tar.gz - -ENV ZBX_VERSION=$ZBX_VERSION ` - BUILD_ARCH=$BUILD_ARCH ` - GOLANG_VERSION=$GOLANG_VERSION MSYS2_URL=$MSYS2_URL ` - PCRE2_VERSION=$PCRE2_VERSION OPENSSL_VERSION=$OPENSSL_VERSION ` - PCRE2_URL=$PCRE2_URL OPENSSL_URL=$OPENSSL_URL ` - CHERE_INVOKING=yes MSYSTEM=$MSYSTEM - -LABEL org.opencontainers.image.title="Zabbix agent 2 build base for Windows" ` - org.opencontainers.image.authors="Alexey Pustovalov " ` - org.opencontainers.image.vendor="Zabbix SIA" ` - org.opencontainers.image.url="https://zabbix.com/" ` - org.opencontainers.image.description="Zabbix build base image contains all required packages to build Zabbix agent 2 images" ` - org.opencontainers.image.licenses="AGPL v3.0" ` - org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" ` - org.opencontainers.image.version="${ZBX_VERSION}" - -SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] - -ADD --checksum=sha256:21c6f0523abfd37a2f5cc85879d0ff32723ab496347f0d20793df888ecec3957 $PCRE2_URL C:\pcre2.zip -ADD --checksum=sha256:2e8a40b01979afe8be0bbfb3de5dc1c6709fedb46d6c89c10da114ab5fc3d281 $OPENSSL_URL C:\openssl.tar.gz - -RUN Set-Location -Path $env:SystemDrive\.; ` - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; ` - ` - $env:PATH = $env:PATH + [string]::Format(';{0}\go\bin;{0}\msys64\usr\bin;{0}\msys64\{1}\bin', $env:SystemDrive, $env:MSYSTEM.ToLower()); ` - [Environment]::SetEnvironmentVariable('PATH', $env:PATH, [EnvironmentVariableTarget]::Machine); ` - ` - $env:BUILD_OUTPUT = [string]::Format('{0}\build_output', $env:SystemDrive); ` - [Environment]::SetEnvironmentVariable('BUILD_OUTPUT', $env:BUILD_OUTPUT, [EnvironmentVariableTarget]::Machine); ` - $env:BUILD_SRC = [string]::Format('{0}\build_src', $env:SystemDrive); ` - [Environment]::SetEnvironmentVariable('BUILD_SRC', $env:BUILD_SRC, [EnvironmentVariableTarget]::Machine); ` - ` - Write-Host ('Downloading {0} ...' -f $env:GOLANG_URL); ` - Invoke-WebRequest -OutFile $env:TEMP\go_lang.zip -Uri $env:GOLANG_URL; ` - ` - $sha256 = 'bc28fe3002cd65cec65d0e4f6000584dacb8c71bfaff8801dfb532855ca42513'; ` - $d_sha256 = (Get-FileHash $env:TEMP\go_lang.zip -Algorithm sha256).Hash; ` - Write-Host ('Verifying SHA256 ({0}) ...' -f $sha256); ` - if ($d_sha256 -ne $sha256) { ` - Write-Host ('Checksum Go Lang ({0}) failed!' -f $d_sha256); ` - exit 1; ` - }; ` - ` - Write-Host ('Downloading {0} ...' -f $env:VS_BUILDTOOLS_URL); ` - Invoke-WebRequest -OutFile $env:TEMP\vs_buildtools.exe $env:VS_BUILDTOOLS_URL; ` - ` - Write-Host ('Downloading {0} ...' -f $env:MSYS2_URL); ` - Invoke-WebRequest -OutFile $env:TEMP\msys2.sfx.exe -Uri $(Invoke-RestMethod -UseBasicParsing $env:MSYS2_URL | ` - Select -ExpandProperty "assets" | ` - Select -ExpandProperty "browser_download_url" | ` - Select-String -Pattern '.sfx.exe$').ToString(); ` - ` - $sha256 = 'D96C53ECBFA4B9D81F6C58077965BB2E31472A8BDA4D4446EF8F45F9C601B11D'; ` - $d_sha256 = (Get-FileHash $env:TEMP\msys2.sfx.exe -Algorithm sha256).Hash; ` - Write-Host ('Verifying SHA256 ({0}) ...' -f $sha256); ` - if ((Get-FileHash $env:TEMP\msys2.sfx.exe -Algorithm sha256).Hash -ne $sha256) { ` - Write-Host ('Checksum MSYS2 ({0}) failed!' -f $d_sha256); ` -# exit 1; ` - }; ` - ` - Write-Host 'Installing Go Lang...'; ` - Expand-Archive -Path $env:TEMP\go_lang.zip -DestinationPath $env:SystemDrive\; ` - ` - Write-Host 'Verifying install ("go version") ...'; ` - go version; ` - ` - ` - Write-Host 'Installing MSYS2...'; ` - & $env:TEMP\msys2.sfx.exe -y -o"""$env:SystemDrive\""" | Out-Null; ` - bash -lc 'pacman --noprogressbar --noconfirm -Syuu'; ` - bash -lc 'pacman --noprogressbar --noconfirm -Syuu'; ` - bash -lc 'pacman --noprogressbar --sync --quiet --noconfirm mingw-w64-clang-x86_64-gcc-compat mingw-w64-clang-x86_64-cmake mingw-w64-clang-x86_64-make git'; ` - bash -lc 'pacman --noprogressbar --noconfirm -Scc'; ` - bash -lc 'rm -rf /usr/share/man/* /usr/share/doc/* /usr/share/locale/*'; ` - bash -lc 'rm -rf /$MSYSTEM/usr/share/man/* /$MSYSTEM/usr/share/doc/* /$MSYSTEM/usr/share/locale/*'; ` - bash -lc 'rm -rf /$MSYSTEM/share/man/* /$MSYSTEM/share/doc/* /$MSYSTEM/share/locale/*'; ` - bash -lc 'rm -rf /var/cache/pacman/pkg/*'; ` - taskkill /F /FI 'MODULES eq msys-2.0.dll' | Out-Null; ` - compact /c /i /s:$env:SystemDrive\msys64 | Out-Null; ` - ` - Write-Host 'Verifying install ("bash --version") ...'; ` - bash --version; ` - ` - Write-Host ('{0} - Visual Studio components installing...' -f $(Get-Date -format 'u')); ` - cmd /C start /w $env:TEMP\vs_buildtools.exe ` - --quiet ` - --wait ` - --norestart ` - --nocache ` - --installPath """${env:ProgramFiles(x86)}\Microsoft Visual Studio\2022\BuildTools""" ` - --channelUri https://aka.ms/vs/17/release/channel ` - --installChannelUri https://aka.ms/vs/17/release/channel ` - --channelId VisualStudio.17.Release ` - # https://docs.microsoft.com/en-us/visualstudio/install/workload-component-id-vs-build-tools?view=vs-2022 - --add Microsoft.VisualStudio.Component.VC.Tools.x86.x64; ` - if ($err = dir $Env:TEMP -Filter dd_setup_*_errors.log | where Length -gt 0 | Get-Content) { ` - throw $err; ` - }; ` - Wait-Process -name msiexec; ` - Write-Host ('{0} - Visual Studio components installed' -f $(Get-Date -format 'u')); ` - ` - $env:VS_PATH = &(Join-Path ${env:ProgramFiles(x86)} """\Microsoft Visual Studio\Installer\vswhere.exe""") -latest -products Microsoft.VisualStudio.Product.BuildTools -property installationPath; ` - [Environment]::SetEnvironmentVariable('VS_PATH', $env:VS_PATH, [EnvironmentVariableTarget]::Machine); ` - ` - Write-Host 'Visual Studio components installation cleanup'; ` - Get-ChildItem -Path """${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer""" -Directory -Recurse | Remove-Item -Force -Recurse; ` - ` - Write-Host 'Removing downloaded...'; ` - Remove-Item -Force -Recurse $env:TEMP\*; ` - Write-Host 'Build environment is ready...'; ` - ` - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; ` - ` - New-Item -ItemType directory -Path $env:BUILD_OUTPUT -Force | Out-Null; ` - New-Item -ItemType directory -Path $env:BUILD_SRC -Force | Out-Null; ` - Set-Location -Path $env:BUILD_SRC; ` - ` - Write-Host 'Extracting PCRE2 archive ...'; ` - Expand-Archive -Path $env:SystemDrive\pcre2.zip -DestinationPath $env:BUILD_SRC; ` - Rename-Item -Path $env:BUILD_SRC\pcre2-$env:PCRE2_VERSION -NewName $env:BUILD_SRC\pcre2; ` - ` - Write-Host 'Extracting OpenSSL archive ...'; ` - $env:SystemDirectory = [Environment]::SystemDirectory; ` - tar -zxf "$env:SystemDrive\openssl.tar.gz"; ` - Rename-Item -Path $env:BUILD_SRC\openssl-$env:OPENSSL_VERSION -NewName $env:BUILD_SRC\openssl; ` - ` - Write-Host 'Building PCRE2 library ...'; ` - Set-Location -Path $env:BUILD_SRC\pcre2; ` - cmake --log-level=ERROR ` - -G 'MinGW Makefiles' ` - -DBUILD_SHARED_LIBS=OFF ` - -DBUILD_STATIC_LIBS=ON ` - -DPCRE2_DEBUG=OFF ` - -DPCRE2_BUILD_TESTS=OFF ` - -DINSTALL_MSVC_PDB=OFF ` - -DCMAKE_C_COMPILER=gcc ` - -DCMAKE_C_FLAGS='-O2 -g' ` - -DCMAKE_INSTALL_PREFIX="""$env:BUILD_OUTPUT\pcre2""" . ; ` - mingw32-make -s -j"""$env:NUMBER_OF_PROCESSORS"""; ` - mingw32-make -s -j"""$env:NUMBER_OF_PROCESSORS""" install; ` - mingw32-make -s clean | Out-Null; ` - Remove-Item -Path $env:BUILD_OUTPUT\pcre2\share -Force -Recurse; ` - Write-Host 'PCRE2 is ready...'; ` - ` - Write-Host 'Building OpenSSL library...'; ` - Set-Location -Path $env:BUILD_SRC\openssl; ` - perl Configure ` - mingw64 ` - no-shared ` - no-ui-console ` - no-tests ` - no-unit-test ` - no-capieng ` - --api=1.1.0 ` - --libdir=lib ` - --prefix=$env:BUILD_OUTPUT/openssl ` - --openssldir=$env:BUILD_OUTPUT/openssl_ssl; ` - mingw32-make -s -j"""$env:NUMBER_OF_PROCESSORS""" build_sw; ` - mingw32-make -s -j"""$env:NUMBER_OF_PROCESSORS""" install_dev; ` - mingw32-make -s clean | Out-Null; ` - Write-Host 'OpenSSL is ready...'; ` - ` - Write-Host 'Removing downloaded...'; ` - Remove-Item -Force -Recurse $env:TEMP\*; diff --git a/Dockerfiles/build-base/windows/Dockerfile_msvcrt.agent2 b/Dockerfiles/build-base/windows/Dockerfile_msvcrt.agent2 deleted file mode 100644 index deddf1ba..00000000 --- a/Dockerfiles/build-base/windows/Dockerfile_msvcrt.agent2 +++ /dev/null @@ -1,205 +0,0 @@ -# syntax=docker/dockerfile:1 -# escape=` -ARG BUILD_BASE_IMAGE=mcr.microsoft.com/windows/servercore:ltsc2022 -FROM $BUILD_BASE_IMAGE as builder_base - -ARG PCRE2_VERSION=10.44 -ARG OPENSSL_VERSION=3.3.2 -ARG GOLANG_VERSION=1.23.2 - -ARG MSYSTEM=MINGW64 - -ARG BUILD_ARCH=x64 - -ARG MAJOR_VERSION=7.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.0 - -ARG MINGW_URL=https://github.com/niXman/mingw-builds-binaries/releases/download/14.2.0-rt_v12-rev0/x86_64-14.2.0-release-win32-seh-msvcrt-rt_v12-rev0.7z -ARG VS_BUILDTOOLS_URL=https://aka.ms/vs/17/release/vs_buildtools.exe -ARG GOLANG_URL=https://go.dev/dl/go$GOLANG_VERSION.windows-amd64.zip -ARG MSYS2_URL=https://api.github.com/repos/msys2/msys2-installer/releases/latest - -ARG PCRE2_URL=https://github.com/PhilipHazel/pcre2/releases/download/pcre2-$PCRE2_VERSION/pcre2-$PCRE2_VERSION.zip -ARG OPENSSL_URL=https://github.com/openssl/openssl/releases/download/openssl-$OPENSSL_VERSION/openssl-$OPENSSL_VERSION.tar.gz - -ENV ZBX_VERSION=$ZBX_VERSION ` - BUILD_ARCH=$BUILD_ARCH ` - MINGW_URL=$MINGW_URL VS_BUILDTOOLS_URL=$VS_BUILDTOOLS_URL GOLANG_VERSION=$GOLANG_VERSION MSYS2_URL=$MSYS2_URL ` - PCRE2_VERSION=$PCRE2_VERSION OPENSSL_VERSION=$OPENSSL_VERSION ` - PCRE2_URL=$PCRE2_URL OPENSSL_URL=$OPENSSL_URL ` - CHERE_INVOKING=yes MSYSTEM=$MSYSTEM - -LABEL org.opencontainers.image.title="Zabbix agent 2 build base for Windows" ` - org.opencontainers.image.authors="Alexey Pustovalov " ` - org.opencontainers.image.vendor="Zabbix SIA" ` - org.opencontainers.image.url="https://zabbix.com/" ` - org.opencontainers.image.description="Zabbix build base image contains all required packages to build Zabbix agent 2 images" ` - org.opencontainers.image.licenses="AGPL v3.0" ` - org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" ` - org.opencontainers.image.version="${ZBX_VERSION}" - -SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] - -ADD --checksum=sha256:21c6f0523abfd37a2f5cc85879d0ff32723ab496347f0d20793df888ecec3957 $PCRE2_URL C:\pcre2.zip -ADD --checksum=sha256:2e8a40b01979afe8be0bbfb3de5dc1c6709fedb46d6c89c10da114ab5fc3d281 $OPENSSL_URL C:\openssl.tar.gz - -RUN Set-Location -Path $env:SystemDrive\.; ` - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; ` - ` - $env:PATH = $env:PATH + [string]::Format(';{0}\mingw64\bin;{0}\go\bin;{0}\msys64\usr\bin;{0}\msys64\{1}\bin', $env:SystemDrive, $env:MSYSTEM.ToLower()); ` - [Environment]::SetEnvironmentVariable('PATH', $env:PATH, [EnvironmentVariableTarget]::Machine); ` - ` - $env:BUILD_OUTPUT = [string]::Format('{0}\build_output', $env:SystemDrive); ` - [Environment]::SetEnvironmentVariable('BUILD_OUTPUT', $env:BUILD_OUTPUT, [EnvironmentVariableTarget]::Machine); ` - $env:BUILD_SRC = [string]::Format('{0}\build_src', $env:SystemDrive); ` - [Environment]::SetEnvironmentVariable('BUILD_SRC', $env:BUILD_SRC, [EnvironmentVariableTarget]::Machine); ` - ` - Write-Host ('Downloading {0} ...' -f $env:GOLANG_URL); ` - Invoke-WebRequest -OutFile $env:TEMP\go_lang.zip -Uri $env:GOLANG_URL; ` - ` - $sha256 = 'bc28fe3002cd65cec65d0e4f6000584dacb8c71bfaff8801dfb532855ca42513'; ` - $d_sha256 = (Get-FileHash $env:TEMP\go_lang.zip -Algorithm sha256).Hash; ` - Write-Host ('Verifying SHA256 ({0}) ...' -f $sha256); ` - if ($d_sha256 -ne $sha256) { ` - Write-Host ('Checksum Go Lang ({0}) failed!' -f $d_sha256); ` - exit 1; ` - }; ` - ` - Write-Host ('Downloading {0} ...' -f $env:MSYS2_URL); ` - Invoke-WebRequest -OutFile $env:TEMP\msys2.sfx.exe -Uri $(Invoke-RestMethod -UseBasicParsing $env:MSYS2_URL | ` - Select -ExpandProperty "assets" | ` - Select -ExpandProperty "browser_download_url" | ` - Select-String -Pattern '.sfx.exe$').ToString(); ` - ` - $sha256 = 'D96C53ECBFA4B9D81F6C58077965BB2E31472A8BDA4D4446EF8F45F9C601B11D'; ` - $d_sha256 = (Get-FileHash $env:TEMP\msys2.sfx.exe -Algorithm sha256).Hash; ` - Write-Host ('Verifying SHA256 ({0}) ...' -f $sha256); ` - if ($d_sha256 -ne $sha256) { ` - Write-Host ('Checksum MSYS2 ({0}) failed!' -f $d_sha256); ` -# exit 1; ` - }; ` - ` - Write-Host ('Downloading {0} ...' -f $env:MINGW_URL); ` - Invoke-WebRequest -OutFile $env:TEMP\mingw.7z -Uri $env:MINGW_URL; ` - ` - $sha256 = '32bf3d1337c89f1f0326b42f49fea96fc7eb115af29b765a69bc69be546fd2a1'; ` - $d_sha256 = (Get-FileHash $env:TEMP\mingw.7z -Algorithm sha256).Hash; ` - Write-Host ('Verifying SHA256 ({0}) ...' -f $sha256); ` - if ($d_sha256 -ne $sha256) { ` - Write-Host ('Checksum Mingw-w64 ({0}) failed!' -f $d_sha256); ` - exit 1; ` - }; ` - ` - Write-Host ('Downloading {0} ...' -f $env:VS_BUILDTOOLS_URL); ` - Invoke-WebRequest -OutFile $env:TEMP\vs_buildtools.exe $env:VS_BUILDTOOLS_URL; ` - ` - Write-Host 'Installing Go Lang...'; ` - Expand-Archive -Path $env:TEMP\go_lang.zip -DestinationPath $env:SystemDrive\; ` - ` - Write-Host 'Verifying install ("go version") ...'; ` - go version; ` - ` - Write-Host 'Installing MSYS2...'; ` - & $env:TEMP\msys2.sfx.exe -y -o"""$env:SystemDrive\""" | Out-Null; ` - bash -lc 'pacman --noprogressbar --noconfirm -Syuu'; ` - bash -lc 'pacman --noprogressbar --noconfirm -Syuu'; ` - bash -lc 'pacman --noprogressbar --sync --quiet --noconfirm mingw-w64-x86_64-cmake mingw-w64-x86_64-make mingw-w64-x86_64-7zip git'; ` - bash -lc 'pacman --noprogressbar --noconfirm -Scc'; ` - bash -lc 'rm -rf /usr/share/man/* /usr/share/doc/* /usr/share/locale/*'; ` - bash -lc 'rm -rf /$MSYSTEM/usr/share/man/* /$MSYSTEM/usr/share/doc/* /$MSYSTEM/usr/share/locale/*'; ` - bash -lc 'rm -rf /$MSYSTEM/share/man/* /$MSYSTEM/share/doc/* /$MSYSTEM/share/locale/*'; ` - bash -lc 'rm -rf /var/cache/pacman/pkg/*'; ` - taskkill /F /FI 'MODULES eq msys-2.0.dll' | Out-Null; ` - compact /c /i /s:$env:SystemDrive\msys64 | Out-Null; ` - ` - Write-Host 'Verifying install ("bash --version") ...'; ` - bash --version; ` - ` - Write-Host 'Installing Mingw-w64...'; ` - 7z x $env:TEMP\mingw.7z; ` - compact /c /i /s:$env:SystemDrive\mingw64 | Out-Null; ` - ` - Write-Host 'Verifying install ("gcc -v") ...'; ` - gcc -v; ` - ` - Write-Host ('{0} - Visual Studio components installing...' -f $(Get-Date -format 'u')); ` - cmd /C start /w $env:TEMP\vs_buildtools.exe ` - --quiet ` - --wait ` - --norestart ` - --nocache ` - --installPath """${env:ProgramFiles(x86)}\Microsoft Visual Studio\2022\BuildTools""" ` - --channelUri https://aka.ms/vs/17/release/channel ` - --installChannelUri https://aka.ms/vs/17/release/channel ` - --channelId VisualStudio.17.Release ` - # https://docs.microsoft.com/en-us/visualstudio/install/workload-component-id-vs-build-tools?view=vs-2022 - --add Microsoft.VisualStudio.Component.VC.Tools.x86.x64; ` - if ($err = dir $Env:TEMP -Filter dd_setup_*_errors.log | where Length -gt 0 | Get-Content) { ` - throw $err; ` - }; ` - Wait-Process -name msiexec; ` - Write-Host ('{0} - Visual Studio components installed' -f $(Get-Date -format 'u')); ` - ` - $env:VS_PATH = &(Join-Path ${env:ProgramFiles(x86)} """\Microsoft Visual Studio\Installer\vswhere.exe""") -latest -products Microsoft.VisualStudio.Product.BuildTools -property installationPath; ` - [Environment]::SetEnvironmentVariable('VS_PATH', $env:VS_PATH, [EnvironmentVariableTarget]::Machine); ` - ` - Write-Host 'Visual Studio components installation cleanup'; ` - Get-ChildItem -Path """${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer""" -Directory -Recurse | Remove-Item -Force -Recurse; ` - ` - Write-Host 'Removing downloaded...'; ` - Remove-Item -Force -Recurse $env:TEMP\*; ` - Write-Host 'Build environment is ready...'; ` - ` - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; ` - ` - New-Item -ItemType directory -Path $env:BUILD_OUTPUT -Force | Out-Null; ` - New-Item -ItemType directory -Path $env:BUILD_SRC -Force | Out-Null; ` - Set-Location -Path $env:BUILD_SRC; ` - ` - Write-Host 'Extracting PCRE2 archive ...'; ` - Expand-Archive -Path $env:SystemDrive\pcre2.zip -DestinationPath $env:BUILD_SRC; ` - Rename-Item -Path $env:BUILD_SRC\pcre2-$env:PCRE2_VERSION -NewName $env:BUILD_SRC\pcre2; ` - ` - Write-Host 'Extracting OpenSSL archive ...'; ` - $env:SystemDirectory = [Environment]::SystemDirectory; ` - tar -zxf "$env:SystemDrive\openssl.tar.gz"; ` - Rename-Item -Path $env:BUILD_SRC\openssl-$env:OPENSSL_VERSION -NewName $env:BUILD_SRC\openssl; ` - ` - Write-Host 'Building PCRE2 library ...'; ` - Set-Location -Path $env:BUILD_SRC\pcre2; ` - cmake --log-level=ERROR ` - -G 'MinGW Makefiles' ` - -DBUILD_SHARED_LIBS=OFF ` - -DBUILD_STATIC_LIBS=ON ` - -DPCRE2_DEBUG=OFF ` - -DPCRE2_BUILD_TESTS=OFF ` - -DINSTALL_MSVC_PDB=OFF ` - -DCMAKE_C_COMPILER=gcc ` - -DCMAKE_C_FLAGS='-O2 -g' ` - -DCMAKE_INSTALL_PREFIX="""$env:BUILD_OUTPUT\pcre2""" . ; ` - mingw32-make -s -j"""$env:NUMBER_OF_PROCESSORS"""; ` - mingw32-make -s -j"""$env:NUMBER_OF_PROCESSORS""" install; ` - mingw32-make -s clean | Out-Null; ` - Remove-Item -Path $env:BUILD_OUTPUT\pcre2\share -Force -Recurse; ` - Write-Host 'PCRE2 is ready...'; ` - ` - Write-Host 'Building OpenSSL library...'; ` - Set-Location -Path $env:BUILD_SRC\openssl; ` - perl Configure ` - mingw64 ` - no-shared ` - no-ui-console ` - no-tests ` - no-unit-test ` - no-capieng ` - --api=1.1.0 ` - --libdir=lib ` - --prefix=$env:BUILD_OUTPUT/openssl ` - --openssldir=$env:BUILD_OUTPUT/openssl_ssl; ` - mingw32-make -s -j"""$env:NUMBER_OF_PROCESSORS""" build_sw; ` - mingw32-make -s -j"""$env:NUMBER_OF_PROCESSORS""" install_dev; ` - mingw32-make -s clean | Out-Null; ` - Write-Host 'OpenSSL is ready...'; ` - ` - Write-Host 'Removing downloaded...'; ` - Remove-Item -Force -Recurse $env:TEMP\*; diff --git a/Dockerfiles/build-base/windows/Dockerfile_vcpkg.agent2 b/Dockerfiles/build-base/windows/Dockerfile_vcpkg.agent2 deleted file mode 100644 index b73026fb..00000000 --- a/Dockerfiles/build-base/windows/Dockerfile_vcpkg.agent2 +++ /dev/null @@ -1,140 +0,0 @@ -# syntax=docker/dockerfile:1 -# escape=` -ARG BUILD_BASE_IMAGE=mcr.microsoft.com/windows/servercore:ltsc2022 -FROM $BUILD_BASE_IMAGE as builder_base - -ARG GOLANG_VERSION=1.23.2 - -ARG BUILD_ARCH=x64 - -ARG MAJOR_VERSION=7.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.0 - -ARG GIT_URL=https://github.com/git-for-windows/git/releases/download/v2.47.1.windows.1/MinGit-2.47.1-busybox-64-bit.zip - -ARG VS_BUILDTOOLS_URL=https://aka.ms/vs/17/release/vs_buildtools.exe -ARG GOLANG_URL=https://go.dev/dl/go$GOLANG_VERSION.windows-amd64.zip -ARG LLVM_MINGW=https://github.com/mstorsjo/llvm-mingw/releases/download/20241030/llvm-mingw-20241030-ucrt-x86_64.zip -ARG VCPKG_GIT=https://github.com/microsoft/vcpkg.git - -ENV ZBX_VERSION=$ZBX_VERSION ` - BUILD_ARCH=$BUILD_ARCH ` - GIT_URL=$GIT_URL ` - GOLANG_VERSION=$GOLANG_VERSION LLVM_MINGW=$LLVM_MINGW VCPKG_GIT=$VCPKG_GIT ` - VCPKG_BINARY_SOURCES=clear VCPKG_DEFAULT_TRIPLET=$BUILD_ARCH-mingw-static-release - -LABEL org.opencontainers.image.title="Zabbix agent 2 build base for Windows" ` - org.opencontainers.image.authors="Alexey Pustovalov " ` - org.opencontainers.image.vendor="Zabbix SIA" ` - org.opencontainers.image.url="https://zabbix.com/" ` - org.opencontainers.image.description="Zabbix build base image contains all required packages to build Zabbix agent 2 images" ` - org.opencontainers.image.licenses="AGPL v3.0" ` - org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" ` - org.opencontainers.image.version="${ZBX_VERSION}" - -SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] - -RUN Set-Location -Path $env:SystemDrive\.; ` - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; ` - ` - $env:PATH = [string]::Format('{0}\vcpkg;{0}\llvm_mingw\bin;{0}\go\bin;{0}\git\cmd;{0}\git\mingw64\bin;{0}\git\usr\bin;', $env:SystemDrive, ${env:ProgramFiles}) + $env:PATH; ` - [Environment]::SetEnvironmentVariable('PATH', $env:PATH, [EnvironmentVariableTarget]::Machine); ` - ` - $env:BUILD_OUTPUT = [string]::Format('{0}\build_output', $env:SystemDrive); ` - [Environment]::SetEnvironmentVariable('BUILD_OUTPUT', $env:BUILD_OUTPUT, [EnvironmentVariableTarget]::Machine); ` - $env:BUILD_SRC = [string]::Format('{0}\build_src', $env:SystemDrive); ` - [Environment]::SetEnvironmentVariable('BUILD_SRC', $env:BUILD_SRC, [EnvironmentVariableTarget]::Machine); ` - ` - Write-Host ('Downloading {0} ...' -f $env:GIT_URL); ` - Invoke-WebRequest -OutFile $env:TEMP\git.zip -Uri $env:GIT_URL; ` - ` - $sha256 = '7b26cc61866c5c0ec050797f57837bf064eacd3aaa87ae316e96c6936235cf29'; ` - $d_sha256 = (Get-FileHash $env:TEMP\git.zip -Algorithm sha256).Hash; ` - Write-Host ('Verifying SHA256 ({0}) ...' -f $sha256); ` - if ($d_sha256 -ne $sha256) { ` - Write-Host ('Checksum GIT for Windows ({0}) failed!' -f $d_sha256); ` - exit 1; ` - }; ` - ` - Write-Host ('Downloading {0} ...' -f $env:GOLANG_URL); ` - Invoke-WebRequest -OutFile $env:TEMP\go_lang.zip -Uri $env:GOLANG_URL; ` - ` - $sha256 = 'bc28fe3002cd65cec65d0e4f6000584dacb8c71bfaff8801dfb532855ca42513'; ` - $d_sha256 = (Get-FileHash $env:TEMP\go_lang.zip -Algorithm sha256).Hash; ` - Write-Host ('Verifying SHA256 ({0}) ...' -f $sha256); ` - if ($d_sha256 -ne $sha256) { ` - Write-Host ('Checksum Go Lang ({0}) failed!' -f $d_sha256); ` - exit 1; ` - }; ` - ` - Write-Host ('Downloading {0} ...' -f $env:LLVM_MINGW); ` - Invoke-WebRequest -OutFile $env:TEMP\llvm_mingw.zip -Uri $env:LLVM_MINGW; ` - ` - $sha256 = '7dd9884c976bb20bcbcda9077aa3dd2e857cfd073012f39668cdeddb285d93f8'; ` - $d_sha256 = (Get-FileHash $env:TEMP\llvm_mingw.zip -Algorithm sha256).Hash; ` - Write-Host ('Verifying SHA256 ({0}) ...' -f $sha256); ` - if ((Get-FileHash $env:TEMP\llvm_mingw.zip -Algorithm sha256).Hash -ne $sha256) { ` - Write-Host ('Checksum LLVM MinGW ({0}) failed!' -f $d_sha256); ` - exit 1; ` - }; ` - ` - Write-Host ('Downloading {0} ...' -f $env:VS_BUILDTOOLS_URL); ` - Invoke-WebRequest -OutFile $env:TEMP\vs_buildtools.exe $env:VS_BUILDTOOLS_URL; ` - ` - Write-Host 'Installing GIT...'; ` - Expand-Archive ` - -Path $env:TEMP\git.zip ` - -DestinationPath $env:SystemDrive\git\.; ` - Write-Host 'Removing downloaded...'; ` - ` - Write-Host 'Verifying install ("git version") ...'; ` - git version; ` - ` - Write-Host 'Installing Go Lang...'; ` - Expand-Archive -Path $env:TEMP\go_lang.zip -DestinationPath $env:SystemDrive\; ` - Write-Host 'Verifying install ("go version") ...'; ` - go version; ` - ` - Write-Host 'Installing LLVM MinGW ...'; ` - Expand-Archive -Path $env:TEMP\llvm_mingw.zip -DestinationPath $env:SystemDrive\; ` - Move-Item -Path $env:SystemDrive\llvm-mingw-20241030-ucrt-x86_64\ -Destination $env:SystemDrive\llvm_mingw; ` - ` - Write-Host 'Verifying install ("gcc -v") ...'; ` - gcc -v; ` - ` - Write-Host ('{0} - Visual Studio components installing...' -f $(Get-Date -format 'u')); ` - cmd /C start /w $env:TEMP\vs_buildtools.exe ` - --quiet ` - --wait ` - --norestart ` - --nocache ` - --installPath """${env:ProgramFiles(x86)}\Microsoft Visual Studio\2022\BuildTools""" ` - --channelUri https://aka.ms/vs/17/release/channel ` - --installChannelUri https://aka.ms/vs/17/release/channel ` - --channelId VisualStudio.17.Release ` - # https://docs.microsoft.com/en-us/visualstudio/install/workload-component-id-vs-build-tools?view=vs-2022 - --add Microsoft.VisualStudio.Component.VC.Tools.x86.x64; ` - if ($err = dir $Env:TEMP -Filter dd_setup_*_errors.log | where Length -gt 0 | Get-Content) { ` - throw $err; ` - }; ` - Wait-Process -name msiexec; ` - Write-Host ('{0} - Visual Studio components installed' -f $(Get-Date -format 'u')); ` - ` - $env:VS_PATH = &(Join-Path ${env:ProgramFiles(x86)} """\Microsoft Visual Studio\Installer\vswhere.exe""") -latest -products Microsoft.VisualStudio.Product.BuildTools -property installationPath; ` - [Environment]::SetEnvironmentVariable('VS_PATH', $env:VS_PATH, [EnvironmentVariableTarget]::Machine); ` - ` - Write-Host 'Visual Studio components installation cleanup'; ` - Get-ChildItem -Path """${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer""" -Directory -Recurse | Remove-Item -Force -Recurse; ` - ` - Write-Host 'Installing Vcpkg ...'; ` - $env:VCPKG_DEFAULT_BINARY_CACHE = $env:TEMP; ` - git clone $env:VCPKG_GIT $env:SystemDrive\vcpkg; ` - & $env:SystemDrive\vcpkg\bootstrap-vcpkg.bat -disableMetrics; ` - Copy-Item $env:SystemDrive\vcpkg\triplets\community\$env:BUILD_ARCH-mingw-static.cmake -Destination $env:SystemDrive\vcpkg\triplets\community\$env:VCPKG_DEFAULT_TRIPLET.cmake; ` - Add-Content -Path $env:SystemDrive\vcpkg\triplets\community\$env:VCPKG_DEFAULT_TRIPLET.cmake -Value """set(VCPKG_BUILD_TYPE release)"""; ` - Write-Host 'Installing dependencies ...'; ` - vcpkg install libiconv pcre2 openssl; ` - ` - Write-Host 'Removing downloaded ...'; ` - Remove-Item -Force -Recurse $env:TEMP\*; ` - Write-Host 'Build environment is ready...'; diff --git a/Dockerfiles/build-base/windows/README.md b/Dockerfiles/build-base/windows/README.md deleted file mode 120000 index 32d46ee8..00000000 --- a/Dockerfiles/build-base/windows/README.md +++ /dev/null @@ -1 +0,0 @@ -../README.md \ No newline at end of file diff --git a/Dockerfiles/build-mysql/README.md b/Dockerfiles/build-mysql/README.md deleted file mode 100644 index 3804f1eb..00000000 --- a/Dockerfiles/build-mysql/README.md +++ /dev/null @@ -1,82 +0,0 @@ -![logo](https://assets.zabbix.com/img/logo/zabbix_logo_500x131.png) - -# What is Zabbix? - -Zabbix is an enterprise-class open source distributed monitoring solution. - -Zabbix is software that monitors numerous parameters of a network and the health and integrity of servers. Zabbix uses a flexible notification mechanism that allows users to configure e-mail based alerts for virtually any event. This allows a fast reaction to server problems. Zabbix offers excellent reporting and data visualisation features based on the stored data. This makes Zabbix ideal for capacity planning. - -For more information and related downloads for Zabbix components, please visit https://hub.docker.com/u/zabbix/ and https://zabbix.com - -# What is Zabbix build base (MySQL)? - -Zabbix build base (MySQL) image is used for building Zabbix components. It contains compiled Zabbix components. - -# Zabbix build base (MySQL) images - -These are the only official Zabbix build base (MySQL) Docker images. They are based on Alpine Linux v3.24, Ubuntu 26.04 (resolute), CentOS Stream 10 and Oracle Linux 10 images. The available versions of the image are: - - Zabbix build base 6.0 (tags: alpine-6.0-latest, ubuntu-6.0-latest, ol-6.0-latest) - Zabbix build base 6.0.* (tags: alpine-6.0.*, ubuntu-6.0.*, ol-6.0.*) - Zabbix build base 7.0 (tags: alpine-7.0-latest, ubuntu-7.0-latest, ol-7.0-latest) - Zabbix build base 7.0.* (tags: alpine-7.0.*, ubuntu-7.0.*, ol-7.0.*) - Zabbix build base 7.2 (tags: alpine-7.2-latest, ubuntu-7.2-latest, ol-7.2-latest) - Zabbix build base 7.2.* (tags: alpine-7.2.*, ubuntu-7.2.*, ol-7.2.*) - Zabbix build base 7.4 (tags: alpine-7.4-latest, ubuntu-7.4-latest, ol-7.4-latest, alpine-latest, ubuntu-latest, ol-latest, latest) - Zabbix build base 7.4.* (tags: alpine-7.4.*, ubuntu-7.4.*, ol-7.4.*) - Zabbix build base 8.0 (tags: alpine-trunk, ubuntu-trunk, ol-trunk) - -Images are updated when new releases are published. The image with ``latest`` tag is based on Alpine Linux. - -# How to use this image - -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/7.4/Dockerfiles/build-base) image with prepared build environment as base image and build / compile Zabbix components only. - -# The image variants - -The `zabbix-build-mysql` images come in many flavors, each designed for a specific use case. - -## `zabbix-build-mysql:alpine-` - -This image is based on the popular [Alpine Linux project](http://alpinelinux.org), available in [the `alpine` official image](https://hub.docker.com/_/alpine). Alpine Linux is much smaller than most distribution base images (~5MB), and thus leads to much slimmer images in general. - -This variant is highly recommended when final image size being as small as possible is desired. The main caveat to note is that it does use [musl libc](http://www.musl-libc.org) instead of [glibc and friends](http://www.etalabs.net/compare_libcs.html), so certain software might run into issues depending on the depth of their libc requirements. However, most software doesn't have an issue with this, so this variant is usually a very safe choice. See [this Hacker News comment thread](https://news.ycombinator.com/item?id=10782897) for more discussion of the issues that might arise and some pro/con comparisons of using Alpine-based images. - -To minimize image size, it's uncommon for additional related tools (such as `git` or `bash`) to be included in Alpine-based images. Using this image as a base, add the things you need in your own Dockerfile (see the [`alpine` image description](https://hub.docker.com/_/alpine/) for examples of how to install packages if you are unfamiliar). - -## `zabbix-build-mysql:ubuntu-` - -This is the defacto image. If you are unsure about what your needs are, you probably want to use this one. It is designed to be used both as a throw away container (mount your source code and start the container to start your app), as well as the base to build other images off of. - -## `zabbix-build-mysql:ol-` - -Oracle Linux is an open-source operating system available under the GNU General Public License (GPLv2). Suitable for general purpose or Oracle workloads, it benefits from rigorous testing of more than 128,000 hours per day with real-world workloads and includes unique innovations such as Ksplice for zero-downtime kernel patching, DTrace for real-time diagnostics, the powerful Btrfs file system, and more. - -# User Feedback - -## Documentation - -Documentation for this image is stored in the [`build-mysql/` directory](https://github.com/zabbix/zabbix-docker/tree/7.4/Dockerfiles/build-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.4/README.md) before attempting a pull request. - -## Issues - -If you have any problems with or questions about this image, please contact us through a [GitHub issue](https://github.com/zabbix/zabbix-docker/issues). - -### Known issues - -## Contributing - -You are invited to contribute new features, fixes, or updates, large or small; we are always thrilled to receive pull requests, and do our best to process them as fast as we can. - -Before you start to code, we recommend discussing your plans through a [GitHub issue](https://github.com/zabbix/zabbix-docker/issues), especially for more ambitious contributions. This gives other contributors a chance to point you in the right direction, give you feedback on your design, and help you find out if someone else is working on the same thing. - -## License - -Starting from Zabbix version 7.0, all subsequent Zabbix versions will be released under the GNU Affero General Public License version 3 (AGPLv3). -You can modify the relevant version and propagate such modified version under the terms of the AGPLv3 as published by the Free Software Foundation. -For additional details, including answers to common questions about the AGPLv3, see the generic FAQ from the [Free Software Foundation](http://www.fsf.org/licenses/gpl-faq.html). - -Zabbix is Open Source Software, however, if you use Zabbix in a commercial context we kindly ask you to support the development of Zabbix by purchasing some level of technical support. -All previous Zabbix software versions up to 6.4 are released under the GNU General Public License version 2 (GPLv2). The formal terms of the GPLv2 and AGPLv3 can be found at http://www.fsf.org/licenses/. diff --git a/Dockerfiles/build-mysql/alpine/.dockerignore b/Dockerfiles/build-mysql/alpine/.dockerignore deleted file mode 100644 index 88a84e55..00000000 --- a/Dockerfiles/build-mysql/alpine/.dockerignore +++ /dev/null @@ -1 +0,0 @@ -build.sh diff --git a/Dockerfiles/build-mysql/alpine/Dockerfile b/Dockerfiles/build-mysql/alpine/Dockerfile deleted file mode 100644 index 37a45684..00000000 --- a/Dockerfiles/build-mysql/alpine/Dockerfile +++ /dev/null @@ -1,212 +0,0 @@ -# syntax=docker/dockerfile:1.6 -ARG MAJOR_VERSION=7.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.12 -ARG BUILD_BASE_IMAGE=zabbix-build-base:alpine-${ZBX_VERSION} - -FROM ${BUILD_BASE_IMAGE} AS builder -ARG BUILD_JOBS - -ARG MAJOR_VERSION -ARG ZBX_VERSION -ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git -ARG GIT_BRANCH - -ARG ZBX_PLUGINS_VERSION=${GIT_BRANCH:-$ZBX_VERSION} -ARG CFLAGS -ARG LDFLAGS - -LABEL org.opencontainers.image.authors="Alexey Pustovalov " \ - org.opencontainers.image.description="Zabbix build base for MySQL based images" \ - org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ - org.opencontainers.image.licenses="AGPL v3.0" \ - org.opencontainers.image.source="${ZBX_SOURCES}" \ - org.opencontainers.image.title="Zabbix build base (MySQL)" \ - org.opencontainers.image.url="https://zabbix.com/" \ - org.opencontainers.image.vendor="Zabbix SIA" \ - org.opencontainers.image.version="${ZBX_VERSION}" - -ENV ZBX_SOURCES_DIR=/tmp/zabbix-${ZBX_VERSION} ZBX_OUTPUT_DIR=/tmp/zabbix-${ZBX_VERSION}-output \ - DB_TYPE=mysql \ - CFLAGS=${CFLAGS:-"-O2 -fPIE -fstack-protector-strong -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -pipe"} \ - LDFLAGS=${LDFLAGS:-"-pie -Wl,-z,relro,-z,now,-z,defs -Wl,--as-needed"} \ - MONGODB_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/mongodb.git MONGODB_PLUGIN_VERSION=${ZBX_PLUGINS_VERSION} \ - POSTGRESQL_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/postgresql.git POSTGRESQL_PLUGIN_VERSION=${ZBX_PLUGINS_VERSION} \ - MSSQL_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/mssql.git MSSQL_PLUGIN_VERSION=${ZBX_PLUGINS_VERSION} \ - EMBER_PLUS_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/ember-plus.git EMBER_PLUS_PLUGIN_VERSION=${ZBX_PLUGINS_VERSION} \ - NVIDIA_GPU_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/nvidia-gpu.git NVIDIA_GPU_PLUGIN_VERSION=${ZBX_PLUGINS_VERSION} - -RUN --mount=from=sources,target=/tmp/src,ro \ - --mount=type=bind,source=patches/,target=/tmp/patches,ro \ - set -eux && \ - mkdir -p \ - ${ZBX_OUTPUT_DIR}/agent/sbin \ - ${ZBX_OUTPUT_DIR}/agent/conf \ - ${ZBX_OUTPUT_DIR}/agent2/sbin \ - ${ZBX_OUTPUT_DIR}/agent2/conf \ - ${ZBX_OUTPUT_DIR}/agent2/conf/zabbix_agent2.d/plugins.d \ - ${ZBX_OUTPUT_DIR}/proxy/sbin \ - ${ZBX_OUTPUT_DIR}/proxy/conf \ - ${ZBX_OUTPUT_DIR}/proxy/database/${DB_TYPE} \ - ${ZBX_OUTPUT_DIR}/server/sbin \ - ${ZBX_OUTPUT_DIR}/server/conf \ - ${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE} \ - ${ZBX_OUTPUT_DIR}/java_gateway/sbin/bin \ - ${ZBX_OUTPUT_DIR}/java_gateway/sbin/lib \ - ${ZBX_OUTPUT_DIR}/java_gateway/conf \ - ${ZBX_OUTPUT_DIR}/web_service/sbin \ - ${ZBX_OUTPUT_DIR}/web_service/conf \ - ${ZBX_OUTPUT_DIR}/web/conf \ - ${ZBX_OUTPUT_DIR}/general/sbin \ - ${ZBX_OUTPUT_DIR}/general/bin \ - ${ZBX_OUTPUT_DIR}/general/conf && \ - if [ -f /tmp/src/bootstrap.sh ]; then \ - mkdir -p "${ZBX_SOURCES_DIR}" && \ - cp -a /tmp/src/. "${ZBX_SOURCES_DIR}/"; \ - else \ - git -c advice.detachedHead=false clone \ - "${ZBX_SOURCES}" \ - --branch "${GIT_BRANCH:-$ZBX_VERSION}" \ - --depth 1 \ - --single-branch \ - "${ZBX_SOURCES_DIR}"; \ - fi && \ - cd "${ZBX_SOURCES_DIR}" && \ - for patch_filename in /tmp/patches/*.patch; do \ - [ -f "$patch_filename" ] || continue; \ - patch -p1 < "$patch_filename"; \ - done && \ - if git rev-parse --short HEAD >/dev/null 2>&1; then \ - zabbix_revision="$(git rev-parse --short HEAD)"; \ - else \ - zabbix_revision="unknown"; \ - fi && \ - sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" include/version.h && \ - sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" src/go/pkg/version/version.go && \ - sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java - -WORKDIR ${ZBX_SOURCES_DIR} - -RUN --mount=type=cache,target=/root/.cache/go-build \ - --mount=type=cache,target=/root/go/pkg/mod \ - --mount=from=config_templates,target=/tmp/conf,ro \ - set -eux && \ - cd "${ZBX_SOURCES_DIR}" && \ - ./bootstrap.sh && \ - ./configure \ - --datadir=/usr/lib \ - --libdir=/usr/lib/zabbix \ - --prefix=/usr \ - --sysconfdir=/etc/zabbix \ - --enable-ipv6 \ - --enable-agent \ - --enable-agent2 \ - --enable-java \ - --enable-proxy \ - --enable-server \ - --enable-webservice \ - --with-ares \ - --with-ldap \ - --with-libcurl \ - --with-libmodbus \ - --with-libpcre2 \ - --with-libxml2 \ - --with-${DB_TYPE} \ - --with-net-snmp \ - --with-openipmi \ - --with-openssl \ - --with-ssh \ - --with-unixodbc \ - --silent && \ - jobs="${BUILD_JOBS:-$(nproc)}" && \ - make -j"${jobs}" -s dbschema && \ - make -j"${jobs}" -s && \ - make -j"${jobs}" -s gettext && \ - cat "database/${DB_TYPE}/schema.sql" > "database/${DB_TYPE}/create.sql" && \ - gzip -c "database/${DB_TYPE}/create.sql" > "${ZBX_OUTPUT_DIR}/proxy/database/${DB_TYPE}/create.sql.gz" && \ - cat "database/${DB_TYPE}/images.sql" >> "database/${DB_TYPE}/create.sql" && \ - cat "database/${DB_TYPE}/data.sql" >> "database/${DB_TYPE}/create.sql" && \ - gzip -c "database/${DB_TYPE}/create.sql" > "${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE}/create.sql.gz" && \ - rm -f "database/${DB_TYPE}/create.sql" && \ - strip src/zabbix_agent/zabbix_agentd && \ - strip src/zabbix_server/zabbix_server && \ - strip src/zabbix_proxy/zabbix_proxy && \ - strip src/zabbix_get/zabbix_get && \ - strip src/zabbix_sender/zabbix_sender && \ - strip src/go/bin/zabbix_agent2 || true && \ - strip src/go/bin/zabbix_web_service || true && \ - mv src/zabbix_agent/zabbix_agentd "${ZBX_OUTPUT_DIR}/agent/sbin/" && \ - cp conf/zabbix_agentd.conf "${ZBX_OUTPUT_DIR}/agent/conf/zabbix_agentd.conf.dist" && \ - cp -a conf/zabbix_agentd/. "${ZBX_OUTPUT_DIR}/agent/conf/" && \ - cp -a /tmp/conf/agent/. "${ZBX_OUTPUT_DIR}/agent/conf/" && \ - mv src/go/bin/zabbix_agent2 "${ZBX_OUTPUT_DIR}/agent2/sbin/" && \ - cp src/go/conf/zabbix_agent2.conf "${ZBX_OUTPUT_DIR}/agent2/conf/zabbix_agent2.conf.dist" && \ - cp -a src/go/conf/zabbix_agent2.d/. "${ZBX_OUTPUT_DIR}/agent2/conf/zabbix_agent2.d/" && \ - cp -a /tmp/conf/agent2/. "${ZBX_OUTPUT_DIR}/agent2/conf/" && \ - mv src/zabbix_server/zabbix_server "${ZBX_OUTPUT_DIR}/server/sbin/" && \ - cp conf/zabbix_server.conf "${ZBX_OUTPUT_DIR}/server/conf/zabbix_server.conf.dist" && \ - cp -a /tmp/conf/server/. "${ZBX_OUTPUT_DIR}/server/conf/" && \ - mv src/zabbix_proxy/zabbix_proxy "${ZBX_OUTPUT_DIR}/proxy/sbin/" && \ - cp conf/zabbix_proxy.conf "${ZBX_OUTPUT_DIR}/proxy/conf/zabbix_proxy.conf.dist" && \ - cp -a /tmp/conf/proxy/. "${ZBX_OUTPUT_DIR}/proxy/conf/" && \ - cp -a src/zabbix_java/bin/. "${ZBX_OUTPUT_DIR}/java_gateway/sbin/bin/" && \ - cp -a src/zabbix_java/lib/*.jar "${ZBX_OUTPUT_DIR}/java_gateway/sbin/lib/" && \ - cp src/zabbix_java/lib/logback.xml "${ZBX_OUTPUT_DIR}/java_gateway/conf/logback.xml.dist" && \ - cp src/zabbix_java/lib/logback-console.xml "${ZBX_OUTPUT_DIR}/java_gateway/conf/logback-console.xml.dist" && \ - cp -a /tmp/conf/java-gateway/. "${ZBX_OUTPUT_DIR}/java_gateway/conf/" && \ - mv src/go/bin/zabbix_web_service "${ZBX_OUTPUT_DIR}/web_service/sbin/" && \ - cp src/go/conf/zabbix_web_service.conf "${ZBX_OUTPUT_DIR}/web_service/conf/zabbix_web_service.conf.dist" && \ - cp -a /tmp/conf/web_service/. "${ZBX_OUTPUT_DIR}/web_service/conf/" && \ - mv src/zabbix_get/zabbix_get "${ZBX_OUTPUT_DIR}/general/bin/" && \ - mv src/zabbix_sender/zabbix_sender "${ZBX_OUTPUT_DIR}/general/bin/" && \ - cp -a /tmp/conf/web/. "${ZBX_OUTPUT_DIR}/web/conf/" && \ - make -s distclean - -RUN set -eux && \ - cd "${ZBX_SOURCES_DIR}" && \ - curl --retry 5 --retry-all-errors --retry-delay 2 --tlsv1.2 -sSf -L \ - "https://raw.githubusercontent.com/notofonts/noto-cjk/main/Sans/OTF/Japanese/NotoSansCJKjp-Regular.otf" \ - -o ui/assets/fonts/NotoSansCJKjp-Regular.otf && \ - curl --retry 5 --retry-all-errors --retry-delay 2 --tlsv1.2 -sSf -L \ - "https://raw.githubusercontent.com/notofonts/noto-cjk/main/Sans/LICENSE" \ - -o ui/assets/fonts/OFL.txt && \ - sed -i -r 's/(define\(.*_FONT_NAME.*)DejaVuSans/\1NotoSansCJKjp-Regular/' ui/include/defines.inc.php && \ - sed -i -r 's/\.ttf/\.otf/' ui/include/graphs.inc.php && \ - rm -f ui/assets/fonts/DejaVuSans.ttf && \ - chmod o+r ui/assets/fonts/* - -RUN --mount=type=cache,target=/root/.cache/go-build \ - --mount=type=cache,target=/root/go/pkg/mod \ - set -eux && \ - mkdir -p "${ZBX_OUTPUT_DIR}/agent2/sbin/zabbix-agent2-plugin" && \ - mkdir -p "${ZBX_OUTPUT_DIR}/agent2/conf/zabbix_agent2.d/plugins.d" && \ - build_plugin() { \ - name="$1"; \ - repo="$2"; \ - version="$3"; \ - binary="$4"; \ - conf="$5"; \ - outname="$6"; \ - workdir="/tmp/${name}-plugin-${version}"; \ - rm -rf "$workdir"; \ - git -c advice.detachedHead=false clone "$repo" \ - --branch "$version" \ - --depth 1 \ - --single-branch \ - "$workdir"; \ - cd "$workdir"; \ - make; \ - strip "$binary" || true; \ - mv "$binary" "${ZBX_OUTPUT_DIR}/agent2/sbin/zabbix-agent2-plugin/${outname}"; \ - cp "$conf" "${ZBX_OUTPUT_DIR}/agent2/conf/zabbix_agent2.d/plugins.d/"; \ - make clean; \ - }; \ - build_plugin mongodb "${MONGODB_PLUGIN_SOURCES}" "${MONGODB_PLUGIN_VERSION}" \ - zabbix-agent2-plugin-mongodb mongodb.conf mongodb && \ - build_plugin postgresql "${POSTGRESQL_PLUGIN_SOURCES}" "${POSTGRESQL_PLUGIN_VERSION}" \ - zabbix-agent2-plugin-postgresql postgresql.conf postgresql && \ - build_plugin mssql "${MSSQL_PLUGIN_SOURCES}" "${MSSQL_PLUGIN_VERSION}" \ - zabbix-agent2-plugin-mssql mssql.conf mssql && \ - build_plugin ember "${EMBER_PLUS_PLUGIN_SOURCES}" "${EMBER_PLUS_PLUGIN_VERSION}" \ - zabbix-agent2-plugin-ember-plus ember.conf ember-plus && \ - build_plugin nvidia-gpu "${NVIDIA_GPU_PLUGIN_SOURCES}" "${NVIDIA_GPU_PLUGIN_VERSION}" \ - zabbix-agent2-plugin-nvidia-gpu nvidia.conf nvidia-gpu diff --git a/Dockerfiles/build-mysql/alpine/README.md b/Dockerfiles/build-mysql/alpine/README.md deleted file mode 120000 index 32d46ee8..00000000 --- a/Dockerfiles/build-mysql/alpine/README.md +++ /dev/null @@ -1 +0,0 @@ -../README.md \ No newline at end of file diff --git a/Dockerfiles/build-mysql/alpine/build.sh b/Dockerfiles/build-mysql/alpine/build.sh deleted file mode 120000 index 46b20313..00000000 --- a/Dockerfiles/build-mysql/alpine/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../../build.sh \ No newline at end of file diff --git a/Dockerfiles/build-mysql/alpine/patches/chromedp_no_sandbox.patch b/Dockerfiles/build-mysql/alpine/patches/chromedp_no_sandbox.patch deleted file mode 100644 index c8a2e162..00000000 --- a/Dockerfiles/build-mysql/alpine/patches/chromedp_no_sandbox.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/src/go/cmd/zabbix_web_service/pdf_report_creator.go b/src/go/cmd/zabbix_web_service/pdf_report_creator.go -index afab41204d1..f1a9b859f34 100644 ---- a/src/go/cmd/zabbix_web_service/pdf_report_creator.go -+++ b/src/go/cmd/zabbix_web_service/pdf_report_creator.go -@@ -100,7 +100,11 @@ func (h *handler) report(w http.ResponseWriter, r *http.Request) { - return - } - -- opts := chromedp.DefaultExecAllocatorOptions[:] -+ opts := append(chromedp.DefaultExecAllocatorOptions[:], -+ chromedp.DisableGPU, -+ chromedp.NoSandbox, -+ chromedp.Flag("disable-setuid-sandbox", true), -+ ) - - if options.IgnoreURLCertErrors == 1 { - opts = append(opts, chromedp.Flag("ignore-certificate-errors", "1")) diff --git a/Dockerfiles/build-mysql/centos/.dockerignore b/Dockerfiles/build-mysql/centos/.dockerignore deleted file mode 100644 index 88a84e55..00000000 --- a/Dockerfiles/build-mysql/centos/.dockerignore +++ /dev/null @@ -1 +0,0 @@ -build.sh diff --git a/Dockerfiles/build-mysql/centos/Dockerfile b/Dockerfiles/build-mysql/centos/Dockerfile deleted file mode 100644 index 0ceb8d41..00000000 --- a/Dockerfiles/build-mysql/centos/Dockerfile +++ /dev/null @@ -1,212 +0,0 @@ -# syntax=docker/dockerfile:1.6 -ARG MAJOR_VERSION=7.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.12 -ARG BUILD_BASE_IMAGE=zabbix-build-base:centos-${ZBX_VERSION} - -FROM ${BUILD_BASE_IMAGE} AS builder -ARG BUILD_JOBS - -ARG MAJOR_VERSION -ARG ZBX_VERSION -ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git -ARG GIT_BRANCH - -ARG ZBX_PLUGINS_VERSION=${GIT_BRANCH:-$ZBX_VERSION} -ARG CFLAGS -ARG LDFLAGS - -LABEL org.opencontainers.image.authors="Alexey Pustovalov " \ - org.opencontainers.image.description="Zabbix build base for MySQL based images" \ - org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ - org.opencontainers.image.licenses="AGPL v3.0" \ - org.opencontainers.image.source="${ZBX_SOURCES}" \ - org.opencontainers.image.title="Zabbix build base (MySQL)" \ - org.opencontainers.image.url="https://zabbix.com/" \ - org.opencontainers.image.vendor="Zabbix SIA" \ - org.opencontainers.image.version="${ZBX_VERSION}" - -ENV ZBX_SOURCES_DIR=/tmp/zabbix-${ZBX_VERSION} ZBX_OUTPUT_DIR=/tmp/zabbix-${ZBX_VERSION}-output \ - DB_TYPE=mysql \ - CFLAGS=${CFLAGS:-"-O2 -fPIE -fstack-protector-strong -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -pipe"} \ - LDFLAGS=${LDFLAGS:-"-pie -Wl,-z,relro,-z,now,-z,defs -Wl,--as-needed"} \ - MONGODB_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/mongodb.git MONGODB_PLUGIN_VERSION=${ZBX_PLUGINS_VERSION} \ - POSTGRESQL_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/postgresql.git POSTGRESQL_PLUGIN_VERSION=${ZBX_PLUGINS_VERSION} \ - MSSQL_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/mssql.git MSSQL_PLUGIN_VERSION=${ZBX_PLUGINS_VERSION} \ - EMBER_PLUS_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/ember-plus.git EMBER_PLUS_PLUGIN_VERSION=${ZBX_PLUGINS_VERSION} \ - NVIDIA_GPU_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/nvidia-gpu.git NVIDIA_GPU_PLUGIN_VERSION=${ZBX_PLUGINS_VERSION} - -RUN --mount=from=sources,target=/tmp/src,ro \ - --mount=type=bind,source=patches/,target=/tmp/patches,ro \ - set -eux && \ - mkdir -p \ - ${ZBX_OUTPUT_DIR}/agent/sbin \ - ${ZBX_OUTPUT_DIR}/agent/conf \ - ${ZBX_OUTPUT_DIR}/agent2/sbin \ - ${ZBX_OUTPUT_DIR}/agent2/conf \ - ${ZBX_OUTPUT_DIR}/agent2/conf/zabbix_agent2.d/plugins.d \ - ${ZBX_OUTPUT_DIR}/proxy/sbin \ - ${ZBX_OUTPUT_DIR}/proxy/conf \ - ${ZBX_OUTPUT_DIR}/proxy/database/${DB_TYPE} \ - ${ZBX_OUTPUT_DIR}/server/sbin \ - ${ZBX_OUTPUT_DIR}/server/conf \ - ${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE} \ - ${ZBX_OUTPUT_DIR}/java_gateway/sbin/bin \ - ${ZBX_OUTPUT_DIR}/java_gateway/sbin/lib \ - ${ZBX_OUTPUT_DIR}/java_gateway/conf \ - ${ZBX_OUTPUT_DIR}/web_service/sbin \ - ${ZBX_OUTPUT_DIR}/web_service/conf \ - ${ZBX_OUTPUT_DIR}/web/conf \ - ${ZBX_OUTPUT_DIR}/general/sbin \ - ${ZBX_OUTPUT_DIR}/general/bin \ - ${ZBX_OUTPUT_DIR}/general/conf && \ - if [ -f /tmp/src/bootstrap.sh ]; then \ - mkdir -p "${ZBX_SOURCES_DIR}" && \ - cp -a /tmp/src/. "${ZBX_SOURCES_DIR}/"; \ - else \ - git -c advice.detachedHead=false clone \ - "${ZBX_SOURCES}" \ - --branch "${GIT_BRANCH:-$ZBX_VERSION}" \ - --depth 1 \ - --single-branch \ - "${ZBX_SOURCES_DIR}"; \ - fi && \ - cd "${ZBX_SOURCES_DIR}" && \ - for patch_filename in /tmp/patches/*.patch; do \ - [ -f "$patch_filename" ] || continue; \ - patch -p1 < "$patch_filename"; \ - done && \ - if git rev-parse --short HEAD >/dev/null 2>&1; then \ - zabbix_revision="$(git rev-parse --short HEAD)"; \ - else \ - zabbix_revision="unknown"; \ - fi && \ - sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" include/version.h && \ - sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" src/go/pkg/version/version.go && \ - sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java - -WORKDIR ${ZBX_SOURCES_DIR} - -RUN --mount=type=cache,target=/root/.cache/go-build \ - --mount=type=cache,target=/root/go/pkg/mod \ - --mount=from=config_templates,target=/tmp/conf,ro \ - set -eux && \ - cd "${ZBX_SOURCES_DIR}" && \ - ./bootstrap.sh && \ - ./configure \ - --datadir=/usr/lib \ - --libdir=/usr/lib/zabbix \ - --prefix=/usr \ - --sysconfdir=/etc/zabbix \ - --enable-ipv6 \ - --enable-agent \ - --enable-agent2 \ - --enable-java \ - --enable-proxy \ - --enable-server \ - --enable-webservice \ - --with-ares \ - --with-ldap \ - --with-libcurl \ - --with-libmodbus \ - --with-libpcre2 \ - --with-libxml2 \ - --with-${DB_TYPE} \ - --with-net-snmp \ - --with-openipmi \ - --with-openssl \ - --with-ssh \ - --with-unixodbc \ - --silent && \ - jobs="${BUILD_JOBS:-$(nproc)}" && \ - make -j"${jobs}" -s dbschema && \ - make -j"${jobs}" -s && \ - make -j"${jobs}" -s gettext && \ - cat "database/${DB_TYPE}/schema.sql" > "database/${DB_TYPE}/create.sql" && \ - gzip -c "database/${DB_TYPE}/create.sql" > "${ZBX_OUTPUT_DIR}/proxy/database/${DB_TYPE}/create.sql.gz" && \ - cat "database/${DB_TYPE}/images.sql" >> "database/${DB_TYPE}/create.sql" && \ - cat "database/${DB_TYPE}/data.sql" >> "database/${DB_TYPE}/create.sql" && \ - gzip -c "database/${DB_TYPE}/create.sql" > "${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE}/create.sql.gz" && \ - rm -f "database/${DB_TYPE}/create.sql" && \ - strip src/zabbix_agent/zabbix_agentd && \ - strip src/zabbix_server/zabbix_server && \ - strip src/zabbix_proxy/zabbix_proxy && \ - strip src/zabbix_get/zabbix_get && \ - strip src/zabbix_sender/zabbix_sender && \ - strip src/go/bin/zabbix_agent2 || true && \ - strip src/go/bin/zabbix_web_service || true && \ - mv src/zabbix_agent/zabbix_agentd "${ZBX_OUTPUT_DIR}/agent/sbin/" && \ - cp conf/zabbix_agentd.conf "${ZBX_OUTPUT_DIR}/agent/conf/zabbix_agentd.conf.dist" && \ - cp -a conf/zabbix_agentd/. "${ZBX_OUTPUT_DIR}/agent/conf/" && \ - cp -a /tmp/conf/agent/. "${ZBX_OUTPUT_DIR}/agent/conf/" && \ - mv src/go/bin/zabbix_agent2 "${ZBX_OUTPUT_DIR}/agent2/sbin/" && \ - cp src/go/conf/zabbix_agent2.conf "${ZBX_OUTPUT_DIR}/agent2/conf/zabbix_agent2.conf.dist" && \ - cp -a src/go/conf/zabbix_agent2.d/. "${ZBX_OUTPUT_DIR}/agent2/conf/zabbix_agent2.d/" && \ - cp -a /tmp/conf/agent2/. "${ZBX_OUTPUT_DIR}/agent2/conf/" && \ - mv src/zabbix_server/zabbix_server "${ZBX_OUTPUT_DIR}/server/sbin/" && \ - cp conf/zabbix_server.conf "${ZBX_OUTPUT_DIR}/server/conf/zabbix_server.conf.dist" && \ - cp -a /tmp/conf/server/. "${ZBX_OUTPUT_DIR}/server/conf/" && \ - mv src/zabbix_proxy/zabbix_proxy "${ZBX_OUTPUT_DIR}/proxy/sbin/" && \ - cp conf/zabbix_proxy.conf "${ZBX_OUTPUT_DIR}/proxy/conf/zabbix_proxy.conf.dist" && \ - cp -a /tmp/conf/proxy/. "${ZBX_OUTPUT_DIR}/proxy/conf/" && \ - cp -a src/zabbix_java/bin/. "${ZBX_OUTPUT_DIR}/java_gateway/sbin/bin/" && \ - cp -a src/zabbix_java/lib/*.jar "${ZBX_OUTPUT_DIR}/java_gateway/sbin/lib/" && \ - cp src/zabbix_java/lib/logback.xml "${ZBX_OUTPUT_DIR}/java_gateway/conf/logback.xml.dist" && \ - cp src/zabbix_java/lib/logback-console.xml "${ZBX_OUTPUT_DIR}/java_gateway/conf/logback-console.xml.dist" && \ - cp -a /tmp/conf/java-gateway/. "${ZBX_OUTPUT_DIR}/java_gateway/conf/" && \ - mv src/go/bin/zabbix_web_service "${ZBX_OUTPUT_DIR}/web_service/sbin/" && \ - cp src/go/conf/zabbix_web_service.conf "${ZBX_OUTPUT_DIR}/web_service/conf/zabbix_web_service.conf.dist" && \ - cp -a /tmp/conf/web_service/. "${ZBX_OUTPUT_DIR}/web_service/conf/" && \ - mv src/zabbix_get/zabbix_get "${ZBX_OUTPUT_DIR}/general/bin/" && \ - mv src/zabbix_sender/zabbix_sender "${ZBX_OUTPUT_DIR}/general/bin/" && \ - cp -a /tmp/conf/web/. "${ZBX_OUTPUT_DIR}/web/conf/" && \ - make -s distclean - -RUN set -eux && \ - cd "${ZBX_SOURCES_DIR}" && \ - curl --retry 5 --retry-all-errors --retry-delay 2 --tlsv1.2 -sSf -L \ - "https://raw.githubusercontent.com/notofonts/noto-cjk/main/Sans/OTF/Japanese/NotoSansCJKjp-Regular.otf" \ - -o ui/assets/fonts/NotoSansCJKjp-Regular.otf && \ - curl --retry 5 --retry-all-errors --retry-delay 2 --tlsv1.2 -sSf -L \ - "https://raw.githubusercontent.com/notofonts/noto-cjk/main/Sans/LICENSE" \ - -o ui/assets/fonts/OFL.txt && \ - sed -i -r 's/(define\(.*_FONT_NAME.*)DejaVuSans/\1NotoSansCJKjp-Regular/' ui/include/defines.inc.php && \ - sed -i -r 's/\.ttf/\.otf/' ui/include/graphs.inc.php && \ - rm -f ui/assets/fonts/DejaVuSans.ttf && \ - chmod o+r ui/assets/fonts/* - -RUN --mount=type=cache,target=/root/.cache/go-build \ - --mount=type=cache,target=/root/go/pkg/mod \ - set -eux && \ - mkdir -p "${ZBX_OUTPUT_DIR}/agent2/sbin/zabbix-agent2-plugin" && \ - mkdir -p "${ZBX_OUTPUT_DIR}/agent2/conf/zabbix_agent2.d/plugins.d" && \ - build_plugin() { \ - name="$1"; \ - repo="$2"; \ - version="$3"; \ - binary="$4"; \ - conf="$5"; \ - outname="$6"; \ - workdir="/tmp/${name}-plugin-${version}"; \ - rm -rf "$workdir"; \ - git -c advice.detachedHead=false clone "$repo" \ - --branch "$version" \ - --depth 1 \ - --single-branch \ - "$workdir"; \ - cd "$workdir"; \ - make; \ - strip "$binary" || true; \ - mv "$binary" "${ZBX_OUTPUT_DIR}/agent2/sbin/zabbix-agent2-plugin/${outname}"; \ - cp "$conf" "${ZBX_OUTPUT_DIR}/agent2/conf/zabbix_agent2.d/plugins.d/"; \ - make clean; \ - }; \ - build_plugin mongodb "${MONGODB_PLUGIN_SOURCES}" "${MONGODB_PLUGIN_VERSION}" \ - zabbix-agent2-plugin-mongodb mongodb.conf mongodb && \ - build_plugin postgresql "${POSTGRESQL_PLUGIN_SOURCES}" "${POSTGRESQL_PLUGIN_VERSION}" \ - zabbix-agent2-plugin-postgresql postgresql.conf postgresql && \ - build_plugin mssql "${MSSQL_PLUGIN_SOURCES}" "${MSSQL_PLUGIN_VERSION}" \ - zabbix-agent2-plugin-mssql mssql.conf mssql && \ - build_plugin ember "${EMBER_PLUS_PLUGIN_SOURCES}" "${EMBER_PLUS_PLUGIN_VERSION}" \ - zabbix-agent2-plugin-ember-plus ember.conf ember-plus && \ - build_plugin nvidia-gpu "${NVIDIA_GPU_PLUGIN_SOURCES}" "${NVIDIA_GPU_PLUGIN_VERSION}" \ - zabbix-agent2-plugin-nvidia-gpu nvidia.conf nvidia-gpu diff --git a/Dockerfiles/build-mysql/centos/README.md b/Dockerfiles/build-mysql/centos/README.md deleted file mode 120000 index 32d46ee8..00000000 --- a/Dockerfiles/build-mysql/centos/README.md +++ /dev/null @@ -1 +0,0 @@ -../README.md \ No newline at end of file diff --git a/Dockerfiles/build-mysql/centos/build.sh b/Dockerfiles/build-mysql/centos/build.sh deleted file mode 120000 index 46b20313..00000000 --- a/Dockerfiles/build-mysql/centos/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../../build.sh \ No newline at end of file diff --git a/Dockerfiles/build-mysql/centos/patches/chromedp_no_sandbox.patch b/Dockerfiles/build-mysql/centos/patches/chromedp_no_sandbox.patch deleted file mode 100644 index c8a2e162..00000000 --- a/Dockerfiles/build-mysql/centos/patches/chromedp_no_sandbox.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/src/go/cmd/zabbix_web_service/pdf_report_creator.go b/src/go/cmd/zabbix_web_service/pdf_report_creator.go -index afab41204d1..f1a9b859f34 100644 ---- a/src/go/cmd/zabbix_web_service/pdf_report_creator.go -+++ b/src/go/cmd/zabbix_web_service/pdf_report_creator.go -@@ -100,7 +100,11 @@ func (h *handler) report(w http.ResponseWriter, r *http.Request) { - return - } - -- opts := chromedp.DefaultExecAllocatorOptions[:] -+ opts := append(chromedp.DefaultExecAllocatorOptions[:], -+ chromedp.DisableGPU, -+ chromedp.NoSandbox, -+ chromedp.Flag("disable-setuid-sandbox", true), -+ ) - - if options.IgnoreURLCertErrors == 1 { - opts = append(opts, chromedp.Flag("ignore-certificate-errors", "1")) diff --git a/Dockerfiles/build-mysql/ol/.dockerignore b/Dockerfiles/build-mysql/ol/.dockerignore deleted file mode 100644 index 88a84e55..00000000 --- a/Dockerfiles/build-mysql/ol/.dockerignore +++ /dev/null @@ -1 +0,0 @@ -build.sh diff --git a/Dockerfiles/build-mysql/ol/Dockerfile b/Dockerfiles/build-mysql/ol/Dockerfile deleted file mode 100644 index 36b932c2..00000000 --- a/Dockerfiles/build-mysql/ol/Dockerfile +++ /dev/null @@ -1,212 +0,0 @@ -# syntax=docker/dockerfile:1.6 -ARG MAJOR_VERSION=7.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.12 -ARG BUILD_BASE_IMAGE=zabbix-build-base:ol-${ZBX_VERSION} - -FROM ${BUILD_BASE_IMAGE} AS builder -ARG BUILD_JOBS - -ARG MAJOR_VERSION -ARG ZBX_VERSION -ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git -ARG GIT_BRANCH - -ARG ZBX_PLUGINS_VERSION=${GIT_BRANCH:-$ZBX_VERSION} -ARG CFLAGS -ARG LDFLAGS - -LABEL org.opencontainers.image.authors="Alexey Pustovalov " \ - org.opencontainers.image.description="Zabbix build base for MySQL based images" \ - org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ - org.opencontainers.image.licenses="AGPL v3.0" \ - org.opencontainers.image.source="${ZBX_SOURCES}" \ - org.opencontainers.image.title="Zabbix build base (MySQL)" \ - org.opencontainers.image.url="https://zabbix.com/" \ - org.opencontainers.image.vendor="Zabbix SIA" \ - org.opencontainers.image.version="${ZBX_VERSION}" - -ENV ZBX_SOURCES_DIR=/tmp/zabbix-${ZBX_VERSION} ZBX_OUTPUT_DIR=/tmp/zabbix-${ZBX_VERSION}-output \ - DB_TYPE=mysql \ - CFLAGS=${CFLAGS:-"-O2 -fPIE -fstack-protector-strong -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -pipe"} \ - LDFLAGS=${LDFLAGS:-"-pie -Wl,-z,relro,-z,now,-z,defs -Wl,--as-needed"} \ - MONGODB_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/mongodb.git MONGODB_PLUGIN_VERSION=${ZBX_PLUGINS_VERSION} \ - POSTGRESQL_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/postgresql.git POSTGRESQL_PLUGIN_VERSION=${ZBX_PLUGINS_VERSION} \ - MSSQL_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/mssql.git MSSQL_PLUGIN_VERSION=${ZBX_PLUGINS_VERSION} \ - EMBER_PLUS_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/ember-plus.git EMBER_PLUS_PLUGIN_VERSION=${ZBX_PLUGINS_VERSION} \ - NVIDIA_GPU_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/nvidia-gpu.git NVIDIA_GPU_PLUGIN_VERSION=${ZBX_PLUGINS_VERSION} - -RUN --mount=from=sources,target=/tmp/src,ro \ - --mount=type=bind,source=patches/,target=/tmp/patches,ro \ - set -eux && \ - mkdir -p \ - ${ZBX_OUTPUT_DIR}/agent/sbin \ - ${ZBX_OUTPUT_DIR}/agent/conf \ - ${ZBX_OUTPUT_DIR}/agent2/sbin \ - ${ZBX_OUTPUT_DIR}/agent2/conf \ - ${ZBX_OUTPUT_DIR}/agent2/conf/zabbix_agent2.d/plugins.d \ - ${ZBX_OUTPUT_DIR}/proxy/sbin \ - ${ZBX_OUTPUT_DIR}/proxy/conf \ - ${ZBX_OUTPUT_DIR}/proxy/database/${DB_TYPE} \ - ${ZBX_OUTPUT_DIR}/server/sbin \ - ${ZBX_OUTPUT_DIR}/server/conf \ - ${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE} \ - ${ZBX_OUTPUT_DIR}/java_gateway/sbin/bin \ - ${ZBX_OUTPUT_DIR}/java_gateway/sbin/lib \ - ${ZBX_OUTPUT_DIR}/java_gateway/conf \ - ${ZBX_OUTPUT_DIR}/web_service/sbin \ - ${ZBX_OUTPUT_DIR}/web_service/conf \ - ${ZBX_OUTPUT_DIR}/web/conf \ - ${ZBX_OUTPUT_DIR}/general/sbin \ - ${ZBX_OUTPUT_DIR}/general/bin \ - ${ZBX_OUTPUT_DIR}/general/conf && \ - if [ -f /tmp/src/bootstrap.sh ]; then \ - mkdir -p "${ZBX_SOURCES_DIR}" && \ - cp -a /tmp/src/. "${ZBX_SOURCES_DIR}/"; \ - else \ - git -c advice.detachedHead=false clone \ - "${ZBX_SOURCES}" \ - --branch "${GIT_BRANCH:-$ZBX_VERSION}" \ - --depth 1 \ - --single-branch \ - "${ZBX_SOURCES_DIR}"; \ - fi && \ - cd "${ZBX_SOURCES_DIR}" && \ - for patch_filename in /tmp/patches/*.patch; do \ - [ -f "$patch_filename" ] || continue; \ - patch -p1 < "$patch_filename"; \ - done && \ - if git rev-parse --short HEAD >/dev/null 2>&1; then \ - zabbix_revision="$(git rev-parse --short HEAD)"; \ - else \ - zabbix_revision="unknown"; \ - fi && \ - sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" include/version.h && \ - sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" src/go/pkg/version/version.go && \ - sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java - -WORKDIR ${ZBX_SOURCES_DIR} - -RUN --mount=type=cache,target=/root/.cache/go-build \ - --mount=type=cache,target=/root/go/pkg/mod \ - --mount=from=config_templates,target=/tmp/conf,ro \ - set -eux && \ - cd "${ZBX_SOURCES_DIR}" && \ - ./bootstrap.sh && \ - ./configure \ - --datadir=/usr/lib \ - --libdir=/usr/lib/zabbix \ - --prefix=/usr \ - --sysconfdir=/etc/zabbix \ - --enable-ipv6 \ - --enable-agent \ - --enable-agent2 \ - --enable-java \ - --enable-proxy \ - --enable-server \ - --enable-webservice \ - --with-ares \ - --with-ldap \ - --with-libcurl \ - --with-libmodbus \ - --with-libpcre2 \ - --with-libxml2 \ - --with-${DB_TYPE} \ - --with-net-snmp \ - --with-openipmi \ - --with-openssl \ - --with-ssh \ - --with-unixodbc \ - --silent && \ - jobs="${BUILD_JOBS:-$(nproc)}" && \ - make -j"${jobs}" -s dbschema && \ - make -j"${jobs}" -s && \ - make -j"${jobs}" -s gettext && \ - cat "database/${DB_TYPE}/schema.sql" > "database/${DB_TYPE}/create.sql" && \ - gzip -c "database/${DB_TYPE}/create.sql" > "${ZBX_OUTPUT_DIR}/proxy/database/${DB_TYPE}/create.sql.gz" && \ - cat "database/${DB_TYPE}/images.sql" >> "database/${DB_TYPE}/create.sql" && \ - cat "database/${DB_TYPE}/data.sql" >> "database/${DB_TYPE}/create.sql" && \ - gzip -c "database/${DB_TYPE}/create.sql" > "${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE}/create.sql.gz" && \ - rm -f "database/${DB_TYPE}/create.sql" && \ - strip src/zabbix_agent/zabbix_agentd && \ - strip src/zabbix_server/zabbix_server && \ - strip src/zabbix_proxy/zabbix_proxy && \ - strip src/zabbix_get/zabbix_get && \ - strip src/zabbix_sender/zabbix_sender && \ - strip src/go/bin/zabbix_agent2 || true && \ - strip src/go/bin/zabbix_web_service || true && \ - mv src/zabbix_agent/zabbix_agentd "${ZBX_OUTPUT_DIR}/agent/sbin/" && \ - cp conf/zabbix_agentd.conf "${ZBX_OUTPUT_DIR}/agent/conf/zabbix_agentd.conf.dist" && \ - cp -a conf/zabbix_agentd/. "${ZBX_OUTPUT_DIR}/agent/conf/" && \ - cp -a /tmp/conf/agent/. "${ZBX_OUTPUT_DIR}/agent/conf/" && \ - mv src/go/bin/zabbix_agent2 "${ZBX_OUTPUT_DIR}/agent2/sbin/" && \ - cp src/go/conf/zabbix_agent2.conf "${ZBX_OUTPUT_DIR}/agent2/conf/zabbix_agent2.conf.dist" && \ - cp -a src/go/conf/zabbix_agent2.d/. "${ZBX_OUTPUT_DIR}/agent2/conf/zabbix_agent2.d/" && \ - cp -a /tmp/conf/agent2/. "${ZBX_OUTPUT_DIR}/agent2/conf/" && \ - mv src/zabbix_server/zabbix_server "${ZBX_OUTPUT_DIR}/server/sbin/" && \ - cp conf/zabbix_server.conf "${ZBX_OUTPUT_DIR}/server/conf/zabbix_server.conf.dist" && \ - cp -a /tmp/conf/server/. "${ZBX_OUTPUT_DIR}/server/conf/" && \ - mv src/zabbix_proxy/zabbix_proxy "${ZBX_OUTPUT_DIR}/proxy/sbin/" && \ - cp conf/zabbix_proxy.conf "${ZBX_OUTPUT_DIR}/proxy/conf/zabbix_proxy.conf.dist" && \ - cp -a /tmp/conf/proxy/. "${ZBX_OUTPUT_DIR}/proxy/conf/" && \ - cp -a src/zabbix_java/bin/. "${ZBX_OUTPUT_DIR}/java_gateway/sbin/bin/" && \ - cp -a src/zabbix_java/lib/*.jar "${ZBX_OUTPUT_DIR}/java_gateway/sbin/lib/" && \ - cp src/zabbix_java/lib/logback.xml "${ZBX_OUTPUT_DIR}/java_gateway/conf/logback.xml.dist" && \ - cp src/zabbix_java/lib/logback-console.xml "${ZBX_OUTPUT_DIR}/java_gateway/conf/logback-console.xml.dist" && \ - cp -a /tmp/conf/java-gateway/. "${ZBX_OUTPUT_DIR}/java_gateway/conf/" && \ - mv src/go/bin/zabbix_web_service "${ZBX_OUTPUT_DIR}/web_service/sbin/" && \ - cp src/go/conf/zabbix_web_service.conf "${ZBX_OUTPUT_DIR}/web_service/conf/zabbix_web_service.conf.dist" && \ - cp -a /tmp/conf/web_service/. "${ZBX_OUTPUT_DIR}/web_service/conf/" && \ - mv src/zabbix_get/zabbix_get "${ZBX_OUTPUT_DIR}/general/bin/" && \ - mv src/zabbix_sender/zabbix_sender "${ZBX_OUTPUT_DIR}/general/bin/" && \ - cp -a /tmp/conf/web/. "${ZBX_OUTPUT_DIR}/web/conf/" && \ - make -s distclean - -RUN set -eux && \ - cd "${ZBX_SOURCES_DIR}" && \ - curl --retry 5 --retry-all-errors --retry-delay 2 --tlsv1.2 -sSf -L \ - "https://raw.githubusercontent.com/notofonts/noto-cjk/main/Sans/OTF/Japanese/NotoSansCJKjp-Regular.otf" \ - -o ui/assets/fonts/NotoSansCJKjp-Regular.otf && \ - curl --retry 5 --retry-all-errors --retry-delay 2 --tlsv1.2 -sSf -L \ - "https://raw.githubusercontent.com/notofonts/noto-cjk/main/Sans/LICENSE" \ - -o ui/assets/fonts/OFL.txt && \ - sed -i -r 's/(define\(.*_FONT_NAME.*)DejaVuSans/\1NotoSansCJKjp-Regular/' ui/include/defines.inc.php && \ - sed -i -r 's/\.ttf/\.otf/' ui/include/graphs.inc.php && \ - rm -f ui/assets/fonts/DejaVuSans.ttf && \ - chmod o+r ui/assets/fonts/* - -RUN --mount=type=cache,target=/root/.cache/go-build \ - --mount=type=cache,target=/root/go/pkg/mod \ - set -eux && \ - mkdir -p "${ZBX_OUTPUT_DIR}/agent2/sbin/zabbix-agent2-plugin" && \ - mkdir -p "${ZBX_OUTPUT_DIR}/agent2/conf/zabbix_agent2.d/plugins.d" && \ - build_plugin() { \ - name="$1"; \ - repo="$2"; \ - version="$3"; \ - binary="$4"; \ - conf="$5"; \ - outname="$6"; \ - workdir="/tmp/${name}-plugin-${version}"; \ - rm -rf "$workdir"; \ - git -c advice.detachedHead=false clone "$repo" \ - --branch "$version" \ - --depth 1 \ - --single-branch \ - "$workdir"; \ - cd "$workdir"; \ - make; \ - strip "$binary" || true; \ - mv "$binary" "${ZBX_OUTPUT_DIR}/agent2/sbin/zabbix-agent2-plugin/${outname}"; \ - cp "$conf" "${ZBX_OUTPUT_DIR}/agent2/conf/zabbix_agent2.d/plugins.d/"; \ - make clean; \ - }; \ - build_plugin mongodb "${MONGODB_PLUGIN_SOURCES}" "${MONGODB_PLUGIN_VERSION}" \ - zabbix-agent2-plugin-mongodb mongodb.conf mongodb && \ - build_plugin postgresql "${POSTGRESQL_PLUGIN_SOURCES}" "${POSTGRESQL_PLUGIN_VERSION}" \ - zabbix-agent2-plugin-postgresql postgresql.conf postgresql && \ - build_plugin mssql "${MSSQL_PLUGIN_SOURCES}" "${MSSQL_PLUGIN_VERSION}" \ - zabbix-agent2-plugin-mssql mssql.conf mssql && \ - build_plugin ember "${EMBER_PLUS_PLUGIN_SOURCES}" "${EMBER_PLUS_PLUGIN_VERSION}" \ - zabbix-agent2-plugin-ember-plus ember.conf ember-plus && \ - build_plugin nvidia-gpu "${NVIDIA_GPU_PLUGIN_SOURCES}" "${NVIDIA_GPU_PLUGIN_VERSION}" \ - zabbix-agent2-plugin-nvidia-gpu nvidia.conf nvidia-gpu diff --git a/Dockerfiles/build-mysql/ol/README.md b/Dockerfiles/build-mysql/ol/README.md deleted file mode 120000 index 32d46ee8..00000000 --- a/Dockerfiles/build-mysql/ol/README.md +++ /dev/null @@ -1 +0,0 @@ -../README.md \ No newline at end of file diff --git a/Dockerfiles/build-mysql/ol/build.sh b/Dockerfiles/build-mysql/ol/build.sh deleted file mode 120000 index 46b20313..00000000 --- a/Dockerfiles/build-mysql/ol/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../../build.sh \ No newline at end of file diff --git a/Dockerfiles/build-mysql/ol/patches/chromedp_no_sandbox.patch b/Dockerfiles/build-mysql/ol/patches/chromedp_no_sandbox.patch deleted file mode 100644 index c8a2e162..00000000 --- a/Dockerfiles/build-mysql/ol/patches/chromedp_no_sandbox.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/src/go/cmd/zabbix_web_service/pdf_report_creator.go b/src/go/cmd/zabbix_web_service/pdf_report_creator.go -index afab41204d1..f1a9b859f34 100644 ---- a/src/go/cmd/zabbix_web_service/pdf_report_creator.go -+++ b/src/go/cmd/zabbix_web_service/pdf_report_creator.go -@@ -100,7 +100,11 @@ func (h *handler) report(w http.ResponseWriter, r *http.Request) { - return - } - -- opts := chromedp.DefaultExecAllocatorOptions[:] -+ opts := append(chromedp.DefaultExecAllocatorOptions[:], -+ chromedp.DisableGPU, -+ chromedp.NoSandbox, -+ chromedp.Flag("disable-setuid-sandbox", true), -+ ) - - if options.IgnoreURLCertErrors == 1 { - opts = append(opts, chromedp.Flag("ignore-certificate-errors", "1")) diff --git a/Dockerfiles/build-mysql/rhel/.dockerignore b/Dockerfiles/build-mysql/rhel/.dockerignore deleted file mode 100644 index 88a84e55..00000000 --- a/Dockerfiles/build-mysql/rhel/.dockerignore +++ /dev/null @@ -1 +0,0 @@ -build.sh diff --git a/Dockerfiles/build-mysql/rhel/Dockerfile b/Dockerfiles/build-mysql/rhel/Dockerfile deleted file mode 100644 index b629001a..00000000 --- a/Dockerfiles/build-mysql/rhel/Dockerfile +++ /dev/null @@ -1,222 +0,0 @@ -# syntax=docker/dockerfile:1.6 -ARG MAJOR_VERSION=7.4 -ARG RELEASE=12 -ARG ZBX_VERSION=${MAJOR_VERSION}.12 -ARG BUILD_BASE_IMAGE=zabbix-build-base:rhel-${ZBX_VERSION} - -FROM ${BUILD_BASE_IMAGE} AS builder -ARG BUILD_JOBS - -ARG MAJOR_VERSION -ARG RELEASE -ARG ZBX_VERSION -ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git -ARG GIT_BRANCH - -ARG ZBX_PLUGINS_VERSION=${GIT_BRANCH:-$ZBX_VERSION} -ARG CFLAGS -ARG LDFLAGS - -LABEL description="Zabbix build base for MySQL based images" \ - maintainer="alexey.pustovalov@zabbix.com" \ - name="zabbix/zabbix-build-mysql-74" \ - release="${RELEASE}" \ - summary="Zabbix build base (MySQL)" \ - url="https://www.zabbix.com/" \ - vendor="Zabbix SIA" \ - version="${MAJOR_VERSION}" \ - io.k8s.description="Zabbix build base for MySQL based images" \ - io.k8s.display-name="Zabbix build base (MySQL)" \ - io.openshift.expose-services="" \ - io.openshift.tags="zabbix,build,mysql" \ - org.label-schema.description="Zabbix build base for MySQL based images" \ - org.label-schema.license="AGPL v3.0" \ - org.label-schema.name="zabbix-build-mysql-rhel" \ - org.label-schema.url="https://zabbix.com/" \ - org.label-schema.vcs-ref="${VCS_REF}" \ - org.label-schema.vendor="Zabbix SIA" - -ENV ZBX_SOURCES_DIR=/tmp/zabbix-${ZBX_VERSION} ZBX_OUTPUT_DIR=/tmp/zabbix-${ZBX_VERSION}-output \ - DB_TYPE=mysql \ - CFLAGS=${CFLAGS:-"-O2 -fPIE -fstack-protector-strong -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -pipe"} \ - LDFLAGS=${LDFLAGS:-"-pie -Wl,-z,relro,-z,now,-z,defs -Wl,--as-needed"} \ - MONGODB_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/mongodb.git MONGODB_PLUGIN_VERSION=${ZBX_PLUGINS_VERSION} \ - POSTGRESQL_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/postgresql.git POSTGRESQL_PLUGIN_VERSION=${ZBX_PLUGINS_VERSION} \ - MSSQL_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/mssql.git MSSQL_PLUGIN_VERSION=${ZBX_PLUGINS_VERSION} \ - EMBER_PLUS_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/ember-plus.git EMBER_PLUS_PLUGIN_VERSION=${ZBX_PLUGINS_VERSION} \ - NVIDIA_GPU_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/nvidia-gpu.git NVIDIA_GPU_PLUGIN_VERSION=${ZBX_PLUGINS_VERSION} - -RUN --mount=from=sources,target=/tmp/src,z \ - --mount=type=bind,source=patches/,target=/tmp/patches,z \ - set -eux && \ - mkdir -p \ - ${ZBX_OUTPUT_DIR}/agent/sbin \ - ${ZBX_OUTPUT_DIR}/agent/conf \ - ${ZBX_OUTPUT_DIR}/agent2/sbin \ - ${ZBX_OUTPUT_DIR}/agent2/conf \ - ${ZBX_OUTPUT_DIR}/agent2/conf/zabbix_agent2.d/plugins.d \ - ${ZBX_OUTPUT_DIR}/proxy/sbin \ - ${ZBX_OUTPUT_DIR}/proxy/conf \ - ${ZBX_OUTPUT_DIR}/proxy/database/${DB_TYPE} \ - ${ZBX_OUTPUT_DIR}/server/sbin \ - ${ZBX_OUTPUT_DIR}/server/conf \ - ${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE} \ - ${ZBX_OUTPUT_DIR}/java_gateway/sbin/bin \ - ${ZBX_OUTPUT_DIR}/java_gateway/sbin/lib \ - ${ZBX_OUTPUT_DIR}/java_gateway/conf \ - ${ZBX_OUTPUT_DIR}/web_service/sbin \ - ${ZBX_OUTPUT_DIR}/web_service/conf \ - ${ZBX_OUTPUT_DIR}/web/conf \ - ${ZBX_OUTPUT_DIR}/general/sbin \ - ${ZBX_OUTPUT_DIR}/general/bin \ - ${ZBX_OUTPUT_DIR}/general/conf && \ - if [ -f /tmp/src/bootstrap.sh ]; then \ - mkdir -p "${ZBX_SOURCES_DIR}" && \ - cp -a /tmp/src/. "${ZBX_SOURCES_DIR}/"; \ - else \ - git -c advice.detachedHead=false clone \ - "${ZBX_SOURCES}" \ - --branch "${GIT_BRANCH:-$ZBX_VERSION}" \ - --depth 1 \ - --single-branch \ - "${ZBX_SOURCES_DIR}"; \ - fi && \ - cd "${ZBX_SOURCES_DIR}" && \ - for patch_filename in /tmp/patches/*.patch; do \ - [ -f "$patch_filename" ] || continue; \ - patch -p1 < "$patch_filename"; \ - done && \ - if git rev-parse --short HEAD >/dev/null 2>&1; then \ - zabbix_revision="$(git rev-parse --short HEAD)"; \ - else \ - zabbix_revision="unknown"; \ - fi && \ - sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" include/version.h && \ - sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" src/go/pkg/version/version.go && \ - sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java - -WORKDIR ${ZBX_SOURCES_DIR} - -RUN --mount=type=cache,target=/root/.cache/go-build \ - --mount=type=cache,target=/root/go/pkg/mod \ - --mount=from=config_templates,target=/tmp/conf,z \ - set -eux && \ - cd "${ZBX_SOURCES_DIR}" && \ - ./bootstrap.sh && \ - ./configure \ - --datadir=/usr/lib \ - --libdir=/usr/lib/zabbix \ - --prefix=/usr \ - --sysconfdir=/etc/zabbix \ - --enable-ipv6 \ - --enable-agent \ - --enable-agent2 \ - --enable-java \ - --enable-proxy \ - --enable-server \ - --enable-webservice \ - --with-ares \ - --with-ldap \ - --with-libcurl \ - --with-libpcre2 \ - --with-libxml2 \ - --with-${DB_TYPE} \ - --with-net-snmp \ - --with-openipmi \ - --with-openssl \ - --with-ssh \ - --with-unixodbc \ - --silent && \ - jobs="${BUILD_JOBS:-$(nproc)}" && \ - make -j"${jobs}" -s dbschema && \ - make -j"${jobs}" -s && \ - make -j"${jobs}" -s gettext && \ - cat "database/${DB_TYPE}/schema.sql" > "database/${DB_TYPE}/create.sql" && \ - gzip -c "database/${DB_TYPE}/create.sql" > "${ZBX_OUTPUT_DIR}/proxy/database/${DB_TYPE}/create.sql.gz" && \ - cat "database/${DB_TYPE}/images.sql" >> "database/${DB_TYPE}/create.sql" && \ - cat "database/${DB_TYPE}/data.sql" >> "database/${DB_TYPE}/create.sql" && \ - gzip -c "database/${DB_TYPE}/create.sql" > "${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE}/create.sql.gz" && \ - rm -f "database/${DB_TYPE}/create.sql" && \ - strip src/zabbix_agent/zabbix_agentd && \ - strip src/zabbix_server/zabbix_server && \ - strip src/zabbix_proxy/zabbix_proxy && \ - strip src/zabbix_get/zabbix_get && \ - strip src/zabbix_sender/zabbix_sender && \ - strip src/go/bin/zabbix_agent2 || true && \ - strip src/go/bin/zabbix_web_service || true && \ - mv src/zabbix_agent/zabbix_agentd "${ZBX_OUTPUT_DIR}/agent/sbin/" && \ - cp conf/zabbix_agentd.conf "${ZBX_OUTPUT_DIR}/agent/conf/zabbix_agentd.conf.dist" && \ - cp -a conf/zabbix_agentd/. "${ZBX_OUTPUT_DIR}/agent/conf/" && \ - cp -a /tmp/conf/agent/. "${ZBX_OUTPUT_DIR}/agent/conf/" && \ - mv src/go/bin/zabbix_agent2 "${ZBX_OUTPUT_DIR}/agent2/sbin/" && \ - cp src/go/conf/zabbix_agent2.conf "${ZBX_OUTPUT_DIR}/agent2/conf/zabbix_agent2.conf.dist" && \ - cp -a src/go/conf/zabbix_agent2.d/. "${ZBX_OUTPUT_DIR}/agent2/conf/zabbix_agent2.d/" && \ - cp -a /tmp/conf/agent2/. "${ZBX_OUTPUT_DIR}/agent2/conf/" && \ - mv src/zabbix_server/zabbix_server "${ZBX_OUTPUT_DIR}/server/sbin/" && \ - cp conf/zabbix_server.conf "${ZBX_OUTPUT_DIR}/server/conf/zabbix_server.conf.dist" && \ - cp -a /tmp/conf/server/. "${ZBX_OUTPUT_DIR}/server/conf/" && \ - mv src/zabbix_proxy/zabbix_proxy "${ZBX_OUTPUT_DIR}/proxy/sbin/" && \ - cp conf/zabbix_proxy.conf "${ZBX_OUTPUT_DIR}/proxy/conf/zabbix_proxy.conf.dist" && \ - cp -a /tmp/conf/proxy/. "${ZBX_OUTPUT_DIR}/proxy/conf/" && \ - cp -a src/zabbix_java/bin/. "${ZBX_OUTPUT_DIR}/java_gateway/sbin/bin/" && \ - cp -a src/zabbix_java/lib/*.jar "${ZBX_OUTPUT_DIR}/java_gateway/sbin/lib/" && \ - cp src/zabbix_java/lib/logback.xml "${ZBX_OUTPUT_DIR}/java_gateway/conf/logback.xml.dist" && \ - cp src/zabbix_java/lib/logback-console.xml "${ZBX_OUTPUT_DIR}/java_gateway/conf/logback-console.xml.dist" && \ - cp -a /tmp/conf/java-gateway/. "${ZBX_OUTPUT_DIR}/java_gateway/conf/" && \ - mv src/go/bin/zabbix_web_service "${ZBX_OUTPUT_DIR}/web_service/sbin/" && \ - cp src/go/conf/zabbix_web_service.conf "${ZBX_OUTPUT_DIR}/web_service/conf/zabbix_web_service.conf.dist" && \ - cp -a /tmp/conf/web_service/. "${ZBX_OUTPUT_DIR}/web_service/conf/" && \ - mv src/zabbix_get/zabbix_get "${ZBX_OUTPUT_DIR}/general/bin/" && \ - mv src/zabbix_sender/zabbix_sender "${ZBX_OUTPUT_DIR}/general/bin/" && \ - cp -a /tmp/conf/web/. "${ZBX_OUTPUT_DIR}/web/conf/" && \ - make -s distclean - -RUN set -eux && \ - cd "${ZBX_SOURCES_DIR}" && \ - curl --retry 5 --retry-all-errors --retry-delay 2 --tlsv1.2 -sSf -L \ - "https://raw.githubusercontent.com/notofonts/noto-cjk/main/Sans/OTF/Japanese/NotoSansCJKjp-Regular.otf" \ - -o ui/assets/fonts/NotoSansCJKjp-Regular.otf && \ - curl --retry 5 --retry-all-errors --retry-delay 2 --tlsv1.2 -sSf -L \ - "https://raw.githubusercontent.com/notofonts/noto-cjk/main/Sans/LICENSE" \ - -o ui/assets/fonts/OFL.txt && \ - sed -i -r 's/(define\(.*_FONT_NAME.*)DejaVuSans/\1NotoSansCJKjp-Regular/' ui/include/defines.inc.php && \ - sed -i -r 's/\.ttf/\.otf/' ui/include/graphs.inc.php && \ - rm -f ui/assets/fonts/DejaVuSans.ttf && \ - chmod o+r ui/assets/fonts/* - -RUN --mount=type=cache,target=/root/.cache/go-build \ - --mount=type=cache,target=/root/go/pkg/mod \ - set -eux && \ - mkdir -p "${ZBX_OUTPUT_DIR}/agent2/sbin/zabbix-agent2-plugin" && \ - mkdir -p "${ZBX_OUTPUT_DIR}/agent2/conf/zabbix_agent2.d/plugins.d" && \ - build_plugin() { \ - name="$1"; \ - repo="$2"; \ - version="$3"; \ - binary="$4"; \ - conf="$5"; \ - outname="$6"; \ - workdir="/tmp/${name}-plugin-${version}"; \ - rm -rf "$workdir"; \ - git -c advice.detachedHead=false clone "$repo" \ - --branch "$version" \ - --depth 1 \ - --single-branch \ - "$workdir"; \ - cd "$workdir"; \ - make; \ - strip "$binary" || true; \ - mv "$binary" "${ZBX_OUTPUT_DIR}/agent2/sbin/zabbix-agent2-plugin/${outname}"; \ - cp "$conf" "${ZBX_OUTPUT_DIR}/agent2/conf/zabbix_agent2.d/plugins.d/"; \ - make clean; \ - }; \ - build_plugin mongodb "${MONGODB_PLUGIN_SOURCES}" "${MONGODB_PLUGIN_VERSION}" \ - zabbix-agent2-plugin-mongodb mongodb.conf mongodb && \ - build_plugin postgresql "${POSTGRESQL_PLUGIN_SOURCES}" "${POSTGRESQL_PLUGIN_VERSION}" \ - zabbix-agent2-plugin-postgresql postgresql.conf postgresql && \ - build_plugin mssql "${MSSQL_PLUGIN_SOURCES}" "${MSSQL_PLUGIN_VERSION}" \ - zabbix-agent2-plugin-mssql mssql.conf mssql && \ - build_plugin ember "${EMBER_PLUS_PLUGIN_SOURCES}" "${EMBER_PLUS_PLUGIN_VERSION}" \ - zabbix-agent2-plugin-ember-plus ember.conf ember-plus && \ - build_plugin nvidia-gpu "${NVIDIA_GPU_PLUGIN_SOURCES}" "${NVIDIA_GPU_PLUGIN_VERSION}" \ - zabbix-agent2-plugin-nvidia-gpu nvidia.conf nvidia-gpu diff --git a/Dockerfiles/build-mysql/rhel/README.md b/Dockerfiles/build-mysql/rhel/README.md deleted file mode 120000 index 32d46ee8..00000000 --- a/Dockerfiles/build-mysql/rhel/README.md +++ /dev/null @@ -1 +0,0 @@ -../README.md \ No newline at end of file diff --git a/Dockerfiles/build-mysql/rhel/build.sh b/Dockerfiles/build-mysql/rhel/build.sh deleted file mode 120000 index 46b20313..00000000 --- a/Dockerfiles/build-mysql/rhel/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../../build.sh \ No newline at end of file diff --git a/Dockerfiles/build-mysql/rhel/patches/chromedp_no_sandbox.patch b/Dockerfiles/build-mysql/rhel/patches/chromedp_no_sandbox.patch deleted file mode 100644 index c8a2e162..00000000 --- a/Dockerfiles/build-mysql/rhel/patches/chromedp_no_sandbox.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/src/go/cmd/zabbix_web_service/pdf_report_creator.go b/src/go/cmd/zabbix_web_service/pdf_report_creator.go -index afab41204d1..f1a9b859f34 100644 ---- a/src/go/cmd/zabbix_web_service/pdf_report_creator.go -+++ b/src/go/cmd/zabbix_web_service/pdf_report_creator.go -@@ -100,7 +100,11 @@ func (h *handler) report(w http.ResponseWriter, r *http.Request) { - return - } - -- opts := chromedp.DefaultExecAllocatorOptions[:] -+ opts := append(chromedp.DefaultExecAllocatorOptions[:], -+ chromedp.DisableGPU, -+ chromedp.NoSandbox, -+ chromedp.Flag("disable-setuid-sandbox", true), -+ ) - - if options.IgnoreURLCertErrors == 1 { - opts = append(opts, chromedp.Flag("ignore-certificate-errors", "1")) diff --git a/Dockerfiles/build-mysql/ubuntu/.dockerignore b/Dockerfiles/build-mysql/ubuntu/.dockerignore deleted file mode 100644 index 88a84e55..00000000 --- a/Dockerfiles/build-mysql/ubuntu/.dockerignore +++ /dev/null @@ -1 +0,0 @@ -build.sh diff --git a/Dockerfiles/build-mysql/ubuntu/Dockerfile b/Dockerfiles/build-mysql/ubuntu/Dockerfile deleted file mode 100644 index 4eead9bd..00000000 --- a/Dockerfiles/build-mysql/ubuntu/Dockerfile +++ /dev/null @@ -1,212 +0,0 @@ -# syntax=docker/dockerfile:1.6 -ARG MAJOR_VERSION=7.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.12 -ARG BUILD_BASE_IMAGE=zabbix-build-base:ubuntu-${ZBX_VERSION} - -FROM ${BUILD_BASE_IMAGE} AS builder -ARG BUILD_JOBS - -ARG MAJOR_VERSION -ARG ZBX_VERSION -ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git -ARG GIT_BRANCH - -ARG ZBX_PLUGINS_VERSION=${GIT_BRANCH:-$ZBX_VERSION} -ARG CFLAGS -ARG LDFLAGS - -LABEL org.opencontainers.image.authors="Alexey Pustovalov " \ - org.opencontainers.image.description="Zabbix build base for MySQL based images" \ - org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ - org.opencontainers.image.licenses="AGPL v3.0" \ - org.opencontainers.image.source="${ZBX_SOURCES}" \ - org.opencontainers.image.title="Zabbix build base (MySQL)" \ - org.opencontainers.image.url="https://zabbix.com/" \ - org.opencontainers.image.vendor="Zabbix SIA" \ - org.opencontainers.image.version="${ZBX_VERSION}" - -ENV ZBX_SOURCES_DIR=/tmp/zabbix-${ZBX_VERSION} ZBX_OUTPUT_DIR=/tmp/zabbix-${ZBX_VERSION}-output \ - DB_TYPE=mysql \ - CFLAGS=${CFLAGS:-"-O2 -fPIE -fstack-protector-strong -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -pipe"} \ - LDFLAGS=${LDFLAGS:-"-pie -Wl,-z,relro,-z,now,-z,defs -Wl,--as-needed"} \ - MONGODB_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/mongodb.git MONGODB_PLUGIN_VERSION=${ZBX_PLUGINS_VERSION} \ - POSTGRESQL_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/postgresql.git POSTGRESQL_PLUGIN_VERSION=${ZBX_PLUGINS_VERSION} \ - MSSQL_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/mssql.git MSSQL_PLUGIN_VERSION=${ZBX_PLUGINS_VERSION} \ - EMBER_PLUS_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/ember-plus.git EMBER_PLUS_PLUGIN_VERSION=${ZBX_PLUGINS_VERSION} \ - NVIDIA_GPU_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/nvidia-gpu.git NVIDIA_GPU_PLUGIN_VERSION=${ZBX_PLUGINS_VERSION} - -RUN --mount=from=sources,target=/tmp/src,ro \ - --mount=type=bind,source=patches/,target=/tmp/patches,ro \ - set -eux && \ - mkdir -p \ - ${ZBX_OUTPUT_DIR}/agent/sbin \ - ${ZBX_OUTPUT_DIR}/agent/conf \ - ${ZBX_OUTPUT_DIR}/agent2/sbin \ - ${ZBX_OUTPUT_DIR}/agent2/conf \ - ${ZBX_OUTPUT_DIR}/agent2/conf/zabbix_agent2.d/plugins.d \ - ${ZBX_OUTPUT_DIR}/proxy/sbin \ - ${ZBX_OUTPUT_DIR}/proxy/conf \ - ${ZBX_OUTPUT_DIR}/proxy/database/${DB_TYPE} \ - ${ZBX_OUTPUT_DIR}/server/sbin \ - ${ZBX_OUTPUT_DIR}/server/conf \ - ${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE} \ - ${ZBX_OUTPUT_DIR}/java_gateway/sbin/bin \ - ${ZBX_OUTPUT_DIR}/java_gateway/sbin/lib \ - ${ZBX_OUTPUT_DIR}/java_gateway/conf \ - ${ZBX_OUTPUT_DIR}/web_service/sbin \ - ${ZBX_OUTPUT_DIR}/web_service/conf \ - ${ZBX_OUTPUT_DIR}/web/conf \ - ${ZBX_OUTPUT_DIR}/general/sbin \ - ${ZBX_OUTPUT_DIR}/general/bin \ - ${ZBX_OUTPUT_DIR}/general/conf && \ - if [ -f /tmp/src/bootstrap.sh ]; then \ - mkdir -p "${ZBX_SOURCES_DIR}" && \ - cp -a /tmp/src/. "${ZBX_SOURCES_DIR}/"; \ - else \ - git -c advice.detachedHead=false clone \ - "${ZBX_SOURCES}" \ - --branch "${GIT_BRANCH:-$ZBX_VERSION}" \ - --depth 1 \ - --single-branch \ - "${ZBX_SOURCES_DIR}"; \ - fi && \ - cd "${ZBX_SOURCES_DIR}" && \ - for patch_filename in /tmp/patches/*.patch; do \ - [ -f "$patch_filename" ] || continue; \ - patch -p1 < "$patch_filename"; \ - done && \ - if git rev-parse --short HEAD >/dev/null 2>&1; then \ - zabbix_revision="$(git rev-parse --short HEAD)"; \ - else \ - zabbix_revision="unknown"; \ - fi && \ - sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" include/version.h && \ - sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" src/go/pkg/version/version.go && \ - sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java - -WORKDIR ${ZBX_SOURCES_DIR} - -RUN --mount=type=cache,target=/root/.cache/go-build \ - --mount=type=cache,target=/root/go/pkg/mod \ - --mount=from=config_templates,target=/tmp/conf,ro \ - set -eux && \ - cd "${ZBX_SOURCES_DIR}" && \ - ./bootstrap.sh && \ - ./configure \ - --datadir=/usr/lib \ - --libdir=/usr/lib/zabbix \ - --prefix=/usr \ - --sysconfdir=/etc/zabbix \ - --enable-ipv6 \ - --enable-agent \ - --enable-agent2 \ - --enable-java \ - --enable-proxy \ - --enable-server \ - --enable-webservice \ - --with-ares \ - --with-ldap \ - --with-libcurl \ - --with-libmodbus \ - --with-libpcre2 \ - --with-libxml2 \ - --with-${DB_TYPE} \ - --with-net-snmp \ - --with-openipmi \ - --with-openssl \ - --with-ssh \ - --with-unixodbc \ - --silent && \ - jobs="${BUILD_JOBS:-$(nproc)}" && \ - make -j"${jobs}" -s dbschema && \ - make -j"${jobs}" -s && \ - make -j"${jobs}" -s gettext && \ - cat "database/${DB_TYPE}/schema.sql" > "database/${DB_TYPE}/create.sql" && \ - gzip -c "database/${DB_TYPE}/create.sql" > "${ZBX_OUTPUT_DIR}/proxy/database/${DB_TYPE}/create.sql.gz" && \ - cat "database/${DB_TYPE}/images.sql" >> "database/${DB_TYPE}/create.sql" && \ - cat "database/${DB_TYPE}/data.sql" >> "database/${DB_TYPE}/create.sql" && \ - gzip -c "database/${DB_TYPE}/create.sql" > "${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE}/create.sql.gz" && \ - rm -f "database/${DB_TYPE}/create.sql" && \ - strip src/zabbix_agent/zabbix_agentd && \ - strip src/zabbix_server/zabbix_server && \ - strip src/zabbix_proxy/zabbix_proxy && \ - strip src/zabbix_get/zabbix_get && \ - strip src/zabbix_sender/zabbix_sender && \ - strip src/go/bin/zabbix_agent2 || true && \ - strip src/go/bin/zabbix_web_service || true && \ - mv src/zabbix_agent/zabbix_agentd "${ZBX_OUTPUT_DIR}/agent/sbin/" && \ - cp conf/zabbix_agentd.conf "${ZBX_OUTPUT_DIR}/agent/conf/zabbix_agentd.conf.dist" && \ - cp -a conf/zabbix_agentd/. "${ZBX_OUTPUT_DIR}/agent/conf/" && \ - cp -a /tmp/conf/agent/. "${ZBX_OUTPUT_DIR}/agent/conf/" && \ - mv src/go/bin/zabbix_agent2 "${ZBX_OUTPUT_DIR}/agent2/sbin/" && \ - cp src/go/conf/zabbix_agent2.conf "${ZBX_OUTPUT_DIR}/agent2/conf/zabbix_agent2.conf.dist" && \ - cp -a src/go/conf/zabbix_agent2.d/. "${ZBX_OUTPUT_DIR}/agent2/conf/zabbix_agent2.d/" && \ - cp -a /tmp/conf/agent2/. "${ZBX_OUTPUT_DIR}/agent2/conf/" && \ - mv src/zabbix_server/zabbix_server "${ZBX_OUTPUT_DIR}/server/sbin/" && \ - cp conf/zabbix_server.conf "${ZBX_OUTPUT_DIR}/server/conf/zabbix_server.conf.dist" && \ - cp -a /tmp/conf/server/. "${ZBX_OUTPUT_DIR}/server/conf/" && \ - mv src/zabbix_proxy/zabbix_proxy "${ZBX_OUTPUT_DIR}/proxy/sbin/" && \ - cp conf/zabbix_proxy.conf "${ZBX_OUTPUT_DIR}/proxy/conf/zabbix_proxy.conf.dist" && \ - cp -a /tmp/conf/proxy/. "${ZBX_OUTPUT_DIR}/proxy/conf/" && \ - cp -a src/zabbix_java/bin/. "${ZBX_OUTPUT_DIR}/java_gateway/sbin/bin/" && \ - cp -a src/zabbix_java/lib/*.jar "${ZBX_OUTPUT_DIR}/java_gateway/sbin/lib/" && \ - cp src/zabbix_java/lib/logback.xml "${ZBX_OUTPUT_DIR}/java_gateway/conf/logback.xml.dist" && \ - cp src/zabbix_java/lib/logback-console.xml "${ZBX_OUTPUT_DIR}/java_gateway/conf/logback-console.xml.dist" && \ - cp -a /tmp/conf/java-gateway/. "${ZBX_OUTPUT_DIR}/java_gateway/conf/" && \ - mv src/go/bin/zabbix_web_service "${ZBX_OUTPUT_DIR}/web_service/sbin/" && \ - cp src/go/conf/zabbix_web_service.conf "${ZBX_OUTPUT_DIR}/web_service/conf/zabbix_web_service.conf.dist" && \ - cp -a /tmp/conf/web_service/. "${ZBX_OUTPUT_DIR}/web_service/conf/" && \ - mv src/zabbix_get/zabbix_get "${ZBX_OUTPUT_DIR}/general/bin/" && \ - mv src/zabbix_sender/zabbix_sender "${ZBX_OUTPUT_DIR}/general/bin/" && \ - cp -a /tmp/conf/web/. "${ZBX_OUTPUT_DIR}/web/conf/" && \ - make -s distclean - -RUN set -eux && \ - cd "${ZBX_SOURCES_DIR}" && \ - curl --retry 5 --retry-all-errors --retry-delay 2 --tlsv1.2 -sSf -L \ - "https://raw.githubusercontent.com/notofonts/noto-cjk/main/Sans/OTF/Japanese/NotoSansCJKjp-Regular.otf" \ - -o ui/assets/fonts/NotoSansCJKjp-Regular.otf && \ - curl --retry 5 --retry-all-errors --retry-delay 2 --tlsv1.2 -sSf -L \ - "https://raw.githubusercontent.com/notofonts/noto-cjk/main/Sans/LICENSE" \ - -o ui/assets/fonts/OFL.txt && \ - sed -i -r 's/(define\(.*_FONT_NAME.*)DejaVuSans/\1NotoSansCJKjp-Regular/' ui/include/defines.inc.php && \ - sed -i -r 's/\.ttf/\.otf/' ui/include/graphs.inc.php && \ - rm -f ui/assets/fonts/DejaVuSans.ttf && \ - chmod o+r ui/assets/fonts/* - -RUN --mount=type=cache,target=/root/.cache/go-build \ - --mount=type=cache,target=/root/go/pkg/mod \ - set -eux && \ - mkdir -p "${ZBX_OUTPUT_DIR}/agent2/sbin/zabbix-agent2-plugin" && \ - mkdir -p "${ZBX_OUTPUT_DIR}/agent2/conf/zabbix_agent2.d/plugins.d" && \ - build_plugin() { \ - name="$1"; \ - repo="$2"; \ - version="$3"; \ - binary="$4"; \ - conf="$5"; \ - outname="$6"; \ - workdir="/tmp/${name}-plugin-${version}"; \ - rm -rf "$workdir"; \ - git -c advice.detachedHead=false clone "$repo" \ - --branch "$version" \ - --depth 1 \ - --single-branch \ - "$workdir"; \ - cd "$workdir"; \ - make; \ - strip "$binary" || true; \ - mv "$binary" "${ZBX_OUTPUT_DIR}/agent2/sbin/zabbix-agent2-plugin/${outname}"; \ - cp "$conf" "${ZBX_OUTPUT_DIR}/agent2/conf/zabbix_agent2.d/plugins.d/"; \ - make clean; \ - }; \ - build_plugin mongodb "${MONGODB_PLUGIN_SOURCES}" "${MONGODB_PLUGIN_VERSION}" \ - zabbix-agent2-plugin-mongodb mongodb.conf mongodb && \ - build_plugin postgresql "${POSTGRESQL_PLUGIN_SOURCES}" "${POSTGRESQL_PLUGIN_VERSION}" \ - zabbix-agent2-plugin-postgresql postgresql.conf postgresql && \ - build_plugin mssql "${MSSQL_PLUGIN_SOURCES}" "${MSSQL_PLUGIN_VERSION}" \ - zabbix-agent2-plugin-mssql mssql.conf mssql && \ - build_plugin ember "${EMBER_PLUS_PLUGIN_SOURCES}" "${EMBER_PLUS_PLUGIN_VERSION}" \ - zabbix-agent2-plugin-ember-plus ember.conf ember-plus && \ - build_plugin nvidia-gpu "${NVIDIA_GPU_PLUGIN_SOURCES}" "${NVIDIA_GPU_PLUGIN_VERSION}" \ - zabbix-agent2-plugin-nvidia-gpu nvidia.conf nvidia-gpu diff --git a/Dockerfiles/build-mysql/ubuntu/README.md b/Dockerfiles/build-mysql/ubuntu/README.md deleted file mode 120000 index 32d46ee8..00000000 --- a/Dockerfiles/build-mysql/ubuntu/README.md +++ /dev/null @@ -1 +0,0 @@ -../README.md \ No newline at end of file diff --git a/Dockerfiles/build-mysql/ubuntu/build.sh b/Dockerfiles/build-mysql/ubuntu/build.sh deleted file mode 120000 index 46b20313..00000000 --- a/Dockerfiles/build-mysql/ubuntu/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../../build.sh \ No newline at end of file diff --git a/Dockerfiles/build-mysql/ubuntu/patches/chromedp_no_sandbox.patch b/Dockerfiles/build-mysql/ubuntu/patches/chromedp_no_sandbox.patch deleted file mode 100644 index c8a2e162..00000000 --- a/Dockerfiles/build-mysql/ubuntu/patches/chromedp_no_sandbox.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/src/go/cmd/zabbix_web_service/pdf_report_creator.go b/src/go/cmd/zabbix_web_service/pdf_report_creator.go -index afab41204d1..f1a9b859f34 100644 ---- a/src/go/cmd/zabbix_web_service/pdf_report_creator.go -+++ b/src/go/cmd/zabbix_web_service/pdf_report_creator.go -@@ -100,7 +100,11 @@ func (h *handler) report(w http.ResponseWriter, r *http.Request) { - return - } - -- opts := chromedp.DefaultExecAllocatorOptions[:] -+ opts := append(chromedp.DefaultExecAllocatorOptions[:], -+ chromedp.DisableGPU, -+ chromedp.NoSandbox, -+ chromedp.Flag("disable-setuid-sandbox", true), -+ ) - - if options.IgnoreURLCertErrors == 1 { - opts = append(opts, chromedp.Flag("ignore-certificate-errors", "1")) diff --git a/Dockerfiles/build-mysql/windows/Dockerfile.agent b/Dockerfiles/build-mysql/windows/Dockerfile.agent deleted file mode 100644 index 1cee9f02..00000000 --- a/Dockerfiles/build-mysql/windows/Dockerfile.agent +++ /dev/null @@ -1,81 +0,0 @@ -# syntax=docker/dockerfile:1.6 -# escape=` -ARG MAJOR_VERSION=7.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.12 -ARG BUILD_BASE_IMAGE=zabbix-build-base:ltsc2022-agent-${ZBX_VERSION} - -FROM ${BUILD_BASE_IMAGE} AS builder - -ARG MAJOR_VERSION -ARG ZBX_VERSION -ARG ZABBIX_VERSION_RC_NUM=2400 - -ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git -ARG GIT_BRANCH - -ENV ZBX_SOURCES=$ZBX_SOURCES MAJOR_VERSION=$MAJOR_VERSION ZBX_VERSION=$ZBX_VERSION GIT_BRANCH=${GIT_BRANCH:-$ZBX_VERSION} ` - ZABBIX_VERSION_RC_NUM=$ZABBIX_VERSION_RC_NUM ` - ZBX_SOURCES_DIR=C:\\zabbix-${ZBX_VERSION} ZBX_OUTPUT_DIR=C:\\zabbix-${ZBX_VERSION}-output - -LABEL org.opencontainers.image.title="Zabbix agent build (Windows)" ` - org.opencontainers.image.authors="Alexey Pustovalov " ` - org.opencontainers.image.vendor="Zabbix SIA" ` - org.opencontainers.image.url="https://zabbix.com/" ` - org.opencontainers.image.description="Zabbix build for agent images based on Windows" ` - org.opencontainers.image.licenses="AGPL v3.0" ` - org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" ` - org.opencontainers.image.version="${ZBX_VERSION}" ` - org.opencontainers.image.source="${ZBX_SOURCES}" - -SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] - -RUN Set-Location -Path $env:SystemDrive\.; ` - ` - New-Item -ItemType directory -Path $env:SystemDrive\zabbix_src | Out-Null; ` - New-Item -ItemType directory -Path $env:ZBX_OUTPUT_DIR | Out-Null; ` - New-Item -ItemType directory -Path $env:ZBX_OUTPUT_DIR\sbin | Out-Null; ` - New-Item -ItemType directory -Path $env:ZBX_OUTPUT_DIR\bin | Out-Null; ` - New-Item -ItemType directory -Path $env:ZBX_OUTPUT_DIR\conf | Out-Null; ` - ` - Import-Module $env:VS_DEVSHELL; ` - Enter-VsDevShell -VsInstallPath $env:VS_PATH -SkipAutomaticLocation -DevCmdArguments """-arch=x64"""; ` - ` - Write-Host ('Checkout GIT {0} ({1}) repository ...' -f $env:ZBX_SOURCES, $env:GIT_BRANCH); ` - git -c advice.detachedHead=false clone $env:ZBX_SOURCES --branch $env:GIT_BRANCH --depth 1 --single-branch $env:ZBX_SOURCES_DIR; ` - Remove-Item -Recurse -Force $env:ZBX_SOURCES_DIR\ui -ErrorAction SilentlyContinue; ` - Remove-Item -Recurse -Force $env:ZBX_SOURCES_DIR\templates -ErrorAction SilentlyContinue; ` - Remove-Item -Recurse -Force $env:ZBX_SOURCES_DIR\database -ErrorAction SilentlyContinue; ` - Remove-Item -Recurse -Force $env:ZBX_SOURCES_DIR\create -ErrorAction SilentlyContinue; ` - ` - Write-Host ('Building Zabbix agent {0} version ...' -f $env:ZBX_VERSION); ` - Set-Location -Path $env:ZBX_SOURCES_DIR; ` - $ZbxRevision=(git rev-parse --short HEAD); ` - (Get-Content include/version.h).replace('{ZABBIX_REVISION}', $ZbxRevision) | Set-Content include/version.h; ` - Set-Location -Path $env:ZBX_SOURCES_DIR\build\win32\project; ` - $env:CL = """$env:CL /MP /MT"""; ` - nmake /S -f Makefile ` - CPU=$env:CPU_MODEL ` - CFLAGS="""/D CURL_STATICLIB /D HAVE_LIBCURL /I "$env:BUILD_OUTPUT\curl\include" /D ZABBIX_VERSION_REVISION=$ZbxRevision /D HAVE_LIBMODBUS_STATIC /D DEFAULT_CONFIG_FILE=$env:SystemDrive\zabbix\conf\zabbix_agentd.conf""" ` - PCRE2INCDIR=$env:SystemDrive\build_output\pcre2\include ` - PCRE2LIBDIR=$env:SystemDrive\build_output\pcre2\lib TLS=openssl ` - RFLAGS="""/D ZABBIX_VERSION_REVISION=$ZbxRevision /D ZABBIX_VERSION_RC_NUM=$env:ZABBIX_VERSION_RC_NUM""" ` - TLSINCDIR=$env:BUILD_OUTPUT\openssl\include ` - TLSLIBDIR=$env:BUILD_OUTPUT\openssl\lib ` - MODBINCDIR=$env:BUILD_OUTPUT\libmodbus\include ` - MODBLIBDIR=$env:BUILD_OUTPUT\libmodbus\lib ` - LIBS="""$env:LIBS Crypt32.lib bcrypt.lib $env:BUILD_OUTPUT\curl\lib\libcurl.lib $env:BUILD_OUTPUT\zlib\lib\zs.lib""" ` - all; ` - ` - Write-Host 'Verifying build ("zabbix_agentd.exe -V") ...'; ` - & $env:ZBX_SOURCES_DIR\bin\win64\zabbix_agentd.exe -V; ` - dumpbin /dependents $env:ZBX_SOURCES_DIR\bin\win64\zabbix_agentd.exe; ` - ` - Copy-Item -Path $env:ZBX_SOURCES_DIR\bin\win64\zabbix_agentd.exe $env:ZBX_OUTPUT_DIR\sbin; ` - Copy-Item -Path $env:ZBX_SOURCES_DIR\bin\win64\zabbix_get.exe $env:ZBX_OUTPUT_DIR\bin; ` - Copy-Item -Path $env:ZBX_SOURCES_DIR\bin\win64\zabbix_sender.exe $env:ZBX_OUTPUT_DIR\bin; ` - Copy-Item -Path $env:ZBX_SOURCES_DIR\conf\zabbix_agentd.win.conf $env:ZBX_OUTPUT_DIR\conf\zabbix_agentd.conf_template; ` - nmake /S -f Makefile ` - PCRE2INCDIR=$env:SystemDrive\build_output\pcre2\include ` - PCRE2LIBDIR=$env:SystemDrive\build_output\pcre2\lib ` - clean; ` - Write-Host 'Zabbix binaries are compiled...'; diff --git a/Dockerfiles/build-mysql/windows/Dockerfile.agent2 b/Dockerfiles/build-mysql/windows/Dockerfile.agent2 deleted file mode 100644 index 26d890d5..00000000 --- a/Dockerfiles/build-mysql/windows/Dockerfile.agent2 +++ /dev/null @@ -1,121 +0,0 @@ -# syntax=docker/dockerfile:1.6 -# escape=` -ARG MAJOR_VERSION=7.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.12 -ARG BUILD_BASE_IMAGE=zabbix-build-base:ltsc2022-agent2-${ZBX_VERSION} - -FROM ${BUILD_BASE_IMAGE} AS builder - -ARG MAJOR_VERSION -ARG ZBX_VERSION -ARG ZABBIX_VERSION_RC_NUM=2400 - -ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git -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 NVIDIA_GPU_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/nvidia-gpu.git -ARG GIT_BRANCH - -ARG ZBX_PLUGINS_VERSION=${GIT_BRANCH:-$ZBX_VERSION} - -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=${ZBX_PLUGINS_VERSION} ` - POSTGRESQL_PLUGIN_SOURCES=$POSTGRESQL_PLUGIN_SOURCES POSTGRESQL_PLUGIN_VERSION=${ZBX_PLUGINS_VERSION} ` - MSSQL_PLUGIN_SOURCES=$MSSQL_PLUGIN_SOURCES MSSQL_PLUGIN_VERSION=${ZBX_PLUGINS_VERSION} ` - EMBER_PLUS_PLUGIN_SOURCES=$EMBER_PLUS_PLUGIN_SOURCES EMBER_PLUS_PLUGIN_VERSION=${ZBX_PLUGINS_VERSION} ` - NVIDIA_GPU_PLUGIN_SOURCES=$NVIDIA_GPU_PLUGIN_SOURCES NVIDIA_GPU_PLUGIN_VERSION=${ZBX_PLUGINS_VERSION} ` - ZABBIX_VERSION_RC_NUM=$ZABBIX_VERSION_RC_NUM ` - ZBX_SOURCES_DIR=C:\\zabbix-${ZBX_VERSION} ZBX_OUTPUT_DIR=C:\\zabbix-${ZBX_VERSION}-output - -LABEL org.opencontainers.image.title="Zabbix agent 2 build (Windows)" ` - org.opencontainers.image.authors="Alexey Pustovalov " ` - org.opencontainers.image.vendor="Zabbix SIA" ` - org.opencontainers.image.url="https://zabbix.com/" ` - org.opencontainers.image.description="Zabbix build for agent 2 images based on Windows" ` - org.opencontainers.image.licenses="AGPL v3.0" ` - org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" ` - org.opencontainers.image.version="${ZBX_VERSION}" ` - org.opencontainers.image.source="${ZBX_SOURCES}" - -SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] - -RUN Set-Location -Path $env:SystemDrive\.; ` - ` - New-Item -ItemType directory -Path $env:ZBX_SOURCES_DIR | Out-Null; ` - New-Item -ItemType directory -Path $env:ZBX_OUTPUT_DIR | Out-Null; ` - New-Item -ItemType directory -Path $env:ZBX_OUTPUT_DIR\sbin | Out-Null; ` - New-Item -ItemType directory -Path $env:ZBX_OUTPUT_DIR\conf | Out-Null; ` - New-Item -ItemType directory -Path $env:ZBX_OUTPUT_DIR\conf\zabbix_agentd.d | Out-Null; ` - New-Item -ItemType directory -Path $env:ZBX_OUTPUT_DIR\zabbix-agent2-plugin | Out-Null; ` - ` - Write-Host ('Checkout GIT {0} ({1}) repository ...' -f $env:ZBX_SOURCES, $env:GIT_BRANCH); ` - git -c advice.detachedHead=false clone $env:ZBX_SOURCES --branch $env:GIT_BRANCH --depth 1 --single-branch $env:ZBX_SOURCES_DIR; ` - Remove-Item -Recurse -Force $env:ZBX_SOURCES_DIR\ui -ErrorAction SilentlyContinue; ` - Remove-Item -Recurse -Force $env:ZBX_SOURCES_DIR\templates -ErrorAction SilentlyContinue; ` - Remove-Item -Recurse -Force $env:ZBX_SOURCES_DIR\database -ErrorAction SilentlyContinue; ` - Remove-Item -Recurse -Force $env:ZBX_SOURCES_DIR\create -ErrorAction SilentlyContinue; ` - ` - Write-Host ('Building Zabbix agent 2 {0} version ...' -f $env:ZBX_VERSION); ` - Set-Location -Path $env:ZBX_SOURCES_DIR; ` - $ZbxRevision=(git rev-parse --short HEAD); ` - (Get-Content include\version.h).replace('{ZABBIX_REVISION}', $ZbxRevision) | Set-Content include\version.h; ` - (Get-Content src\go\pkg\version\version.go).replace('{ZABBIX_REVISION}', $ZbxRevision) | Set-Content src\go\pkg\version\version.go; ` - Set-Location -Path $env:ZBX_SOURCES_DIR\build\mingw; ` - mingw32-make -j"""$env:NUMBER_OF_PROCESSORS""" ` - CGO_LDFLAGS="""-lcrypt32 -L$env:BUILD_OUTPUT\openssl\lib -L$env:BUILD_OUTPUT\pcre2\lib""" ` - PCRE2=$env:BUILD_OUTPUT\pcre2 ` - OPENSSL=$env:BUILD_OUTPUT\openssl ` - RFLAGS="""-DZABBIX_VERSION_RC_NUM=$env:ZABBIX_VERSION_RC_NUM"""; ` - ` - Write-Host 'Verifying build ("zabbix_agent2.exe -V") ...'; ` - & $env:ZBX_SOURCES_DIR\bin\win64\zabbix_agent2.exe -V; ` - ldd $env:ZBX_SOURCES_DIR\bin\win64\zabbix_agent2.exe; ` - ` - Copy-Item -Path $env:ZBX_SOURCES_DIR\bin\win64\zabbix_agent2.exe $env:ZBX_OUTPUT_DIR\sbin; ` - Copy-Item -Path $env:ZBX_SOURCES_DIR\src\go\conf\zabbix_agent2.win.conf $env:ZBX_OUTPUT_DIR\conf\zabbix_agent2.conf_template; ` - Copy-Item -Recurse -Path $env:ZBX_SOURCES_DIR\src\go\conf\zabbix_agent2.d $env:ZBX_OUTPUT_DIR\conf\zabbix_agent2.d; ` - mingw32-make -s clean; - -RUN function Build-Plugin { ` - param( ` - [Parameter(Mandatory)] [string] $Name, ` - [Parameter(Mandatory)] [string] $Repo, ` - [Parameter(Mandatory)] [string] $Version, ` - [Parameter(Mandatory)] [string] $Binary, ` - [Parameter(Mandatory)] [string] $Conf, ` - [Parameter(Mandatory)] [string] $OutName ` - ); ` - ` - $workDir = Join-Path $env:SystemDrive "$Name-plugin-$Version"; ` - $outBinDir = Join-Path $env:ZBX_OUTPUT_DIR 'zabbix-agent2-plugin'; ` - $outConfDir = Join-Path $env:ZBX_OUTPUT_DIR 'conf\zabbix_agent2.d\plugins.d'; ` - $binaryPath = Join-Path $workDir """$Binary.exe"""; ` - ` - Remove-Item -Recurse -Force $workDir -ErrorAction SilentlyContinue; ` - ` - Write-Host ('Building {0} plugin {1} version ...' -f $Name, $Version); ` - git -c advice.detachedHead=false clone $Repo --branch $Version --depth 1 --single-branch $workDir; ` - ` - Set-Location -Path $workDir; ` - mingw32-make; ` - ` - Write-Host ('Verifying {0} plugin ({1}.exe -V) ...' -f $Name, $Binary); ` - & $binaryPath -V; ` - ` - Copy-Item -Path $binaryPath -Destination (Join-Path $outBinDir """$OutName.exe""") -Force; ` - Copy-Item -Path (Join-Path $workDir $Conf) -Destination $outConfDir -Force; ` - ` - mingw32-make -s clean; ` - }; ` - ` - New-Item -ItemType Directory -Force -Path (Join-Path $env:ZBX_OUTPUT_DIR 'zabbix-agent2-plugin') | Out-Null; ` - New-Item -ItemType Directory -Force -Path (Join-Path $env:ZBX_OUTPUT_DIR 'conf\zabbix_agent2.d\plugins.d') | Out-Null; ` - ` - Build-Plugin mongodb $env:MONGODB_PLUGIN_SOURCES $env:MONGODB_PLUGIN_VERSION zabbix-agent2-plugin-mongodb mongodb.conf mongodb; ` - Build-Plugin postgresql $env:POSTGRESQL_PLUGIN_SOURCES $env:POSTGRESQL_PLUGIN_VERSION zabbix-agent2-plugin-postgresql postgresql.conf postgresql; ` - Build-Plugin mssql $env:MSSQL_PLUGIN_SOURCES $env:MSSQL_PLUGIN_VERSION zabbix-agent2-plugin-mssql mssql.conf mssql; ` - $env:PATH = $env:PATH + [string]::Format(';{0}', $env:MSYS_BIN); ` - Build-Plugin ember $env:EMBER_PLUS_PLUGIN_SOURCES $env:EMBER_PLUS_PLUGIN_VERSION zabbix-agent2-plugin-ember-plus ember.conf ember-plus; ` - Build-Plugin nvidia-gpu $env:NVIDIA_GPU_PLUGIN_SOURCES $env:NVIDIA_GPU_PLUGIN_VERSION zabbix-agent2-plugin-nvidia-gpu nvidia.conf nvidia-gpu; diff --git a/Dockerfiles/build-mysql/windows/Dockerfile_llvm_clang.agent2 b/Dockerfiles/build-mysql/windows/Dockerfile_llvm_clang.agent2 deleted file mode 100644 index 53c9c5be..00000000 --- a/Dockerfiles/build-mysql/windows/Dockerfile_llvm_clang.agent2 +++ /dev/null @@ -1,124 +0,0 @@ -# syntax=docker/dockerfile:1 -# escape=` -ARG MAJOR_VERSION=7.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.0 -ARG BUILD_BASE_IMAGE=zabbix-build-base:ltsc2022-agent2-${ZBX_VERSION} - -FROM ${BUILD_BASE_IMAGE} AS builder - -SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] - -ARG MAJOR_VERSION=7.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.0 -ARG ZABBIX_VERSION_RC_NUM=2400 -ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git -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 - -ARG ZBX_PLUGINS_VERSION=${GIT_BRANCH:-$ZBX_VERSION} - -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=${ZBX_PLUGINS_VERSION} ` - POSTGRESQL_PLUGIN_SOURCES=$POSTGRESQL_PLUGIN_SOURCES POSTGRESQL_PLUGIN_VERSION=${ZBX_PLUGINS_VERSION} ` - MSSQL_PLUGIN_SOURCES=$MSSQL_PLUGIN_SOURCES MSSQL_PLUGIN_VERSION=${ZBX_PLUGINS_VERSION} ` - EMBER_PLUS_PLUGIN_SOURCES=$EMBER_PLUS_PLUGIN_SOURCES EMBER_PLUS_PLUGIN_VERSION=${ZBX_PLUGINS_VERSION} ` - ZABBIX_VERSION_RC_NUM=$ZABBIX_VERSION_RC_NUM ` - ZBX_SOURCES_DIR=C:\\zabbix-${ZBX_VERSION} ZBX_OUTPUT_DIR=C:\\zabbix-${ZBX_VERSION}-output - -LABEL org.opencontainers.image.title="Zabbix agent 2 build (Windows)" ` - org.opencontainers.image.authors="Alexey Pustovalov " ` - org.opencontainers.image.vendor="Zabbix SIA" ` - org.opencontainers.image.url="https://zabbix.com/" ` - org.opencontainers.image.description="Zabbix build for agent 2 images based on Windows" ` - org.opencontainers.image.licenses="AGPL v3.0" ` - org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" ` - org.opencontainers.image.version="${ZBX_VERSION}" ` - org.opencontainers.image.source="${ZBX_SOURCES}" - -RUN Set-Location -Path $env:SystemDrive\.; ` - ` - New-Item -ItemType directory -Path $env:ZBX_SOURCES_DIR | Out-Null; ` - New-Item -ItemType directory -Path $env:ZBX_OUTPUT_DIR | Out-Null; ` - New-Item -ItemType directory -Path $env:ZBX_OUTPUT_DIR\sbin | Out-Null; ` - New-Item -ItemType directory -Path $env:ZBX_OUTPUT_DIR\conf | Out-Null; ` - New-Item -ItemType directory -Path $env:ZBX_OUTPUT_DIR\conf\zabbix_agentd.d | Out-Null; ` - New-Item -ItemType directory -Path $env:ZBX_OUTPUT_DIR\zabbix-agent2-plugin | Out-Null; ` - ` - Import-Module (Get-ChildItem $env:VS_PATH -Recurse -File -Filter Microsoft.VisualStudio.DevShell.dll).FullName; ` - Enter-VsDevShell -VsInstallPath $env:VS_PATH -SkipAutomaticLocation -DevCmdArguments """-arch=$env:BUILD_ARCH"""; ` - ` - Write-Host ('Checkout GIT {0} ({1}) repository ...' -f $env:ZBX_SOURCES, $env:GIT_BRANCH); ` - git -c advice.detachedHead=false clone $env:ZBX_SOURCES --branch $env:GIT_BRANCH --depth 1 --single-branch $env:ZBX_SOURCES_DIR; ` - ` - Write-Host ('Building Zabbix {0} version ...' -f $env:ZBX_VERSION); ` - Set-Location -Path $env:ZBX_SOURCES_DIR; ` - $ZbxRevision=(git rev-parse --short HEAD); ` - (Get-Content include\version.h).replace('{ZABBIX_REVISION}', $ZbxRevision) | Set-Content include\version.h; ` - (Get-Content src\go\pkg\version\version.go).replace('{ZABBIX_REVISION}', $ZbxRevision) | Set-Content src\go\pkg\version\version.go; ` - Set-Location -Path $env:ZBX_SOURCES_DIR\build\mingw; ` - mingw32-make -j"""$env:NUMBER_OF_PROCESSORS""" ` - CGO_LDFLAGS="""-l:libiconv.a -lcrypt32 -L$env:BUILD_OUTPUT\openssl\lib -L$env:BUILD_OUTPUT\pcre2\lib""" ` - PCRE2=$env:BUILD_OUTPUT\pcre2 ` - OPENSSL=$env:BUILD_OUTPUT\openssl ` - RFLAGS="""-DZABBIX_VERSION_RC_NUM=$env:ZABBIX_VERSION_RC_NUM"""; ` - ` - Write-Host 'Verifying build ("zabbix_agent2.exe -V") ...'; ` - & $env:ZBX_SOURCES_DIR\bin\win64\zabbix_agent2.exe -V; ` - dumpbin /dependents $env:ZBX_SOURCES_DIR\bin\win64\zabbix_agent2.exe; ` - ` - Copy-Item -Path $env:ZBX_SOURCES_DIR\bin\win64\zabbix_agent2.exe $env:ZBX_OUTPUT_DIR\sbin; ` - Copy-Item -Path $env:ZBX_SOURCES_DIR\src\go\conf\zabbix_agent2.win.conf $env:ZBX_OUTPUT_DIR\conf\zabbix_agent2.conf; ` - Copy-Item -Recurse -Path $env:ZBX_SOURCES_DIR\src\go\conf\zabbix_agent2.d $env:ZBX_OUTPUT_DIR\conf\zabbix_agent2.d; ` - mingw32-make -s clean; ` - ` - Write-Host ('Building Zabbix MongoDB plugin {0} version ...' -f $env:MONGODB_PLUGIN_VERSION); ` - git -c advice.detachedHead=false clone $env:MONGODB_PLUGIN_SOURCES --branch $env:MONGODB_PLUGIN_VERSION --depth 1 --single-branch $env:SystemDrive\mongodb-plugin-$env:MONGODB_PLUGIN_VERSION; ` - Set-Location -Path $env:SystemDrive\mongodb-plugin-$env:MONGODB_PLUGIN_VERSION; ` - mingw32-make; ` - ` - Write-Host 'Verifying MongoDB plugin ("zabbix-agent2-plugin-mongodb.exe -V") ...'; ` - & $env:SystemDrive\mongodb-plugin-$env:MONGODB_PLUGIN_VERSION\zabbix-agent2-plugin-mongodb.exe -V; ` - ` - Copy-Item -Path $env:SystemDrive\mongodb-plugin-$env:MONGODB_PLUGIN_VERSION\zabbix-agent2-plugin-mongodb.exe $env:ZBX_OUTPUT_DIR\zabbix-agent2-plugin\mongodb.exe; ` - Copy-Item -Path $env:SystemDrive\mongodb-plugin-$env:MONGODB_PLUGIN_VERSION\mongodb.conf $env:ZBX_OUTPUT_DIR\conf\zabbix_agent2.d\plugins.d; ` - mingw32-make -s clean; ` - ` - Write-Host ('Building Zabbix PostgreSQL plugin {0} version ...' -f $env:POSTGRESQL_PLUGIN_VERSION); ` - git -c advice.detachedHead=false clone $env:POSTGRESQL_PLUGIN_SOURCES --branch $env:POSTGRESQL_PLUGIN_VERSION --depth 1 --single-branch $env:SystemDrive\postgresql-plugin-$env:POSTGRESQL_PLUGIN_VERSION; ` - Set-Location -Path $env:SystemDrive\postgresql-plugin-$env:POSTGRESQL_PLUGIN_VERSION; ` - mingw32-make; ` - ` - Write-Host 'Verifying build ("zabbix-agent2-plugin-postgresql.exe -V") ...'; ` - & $env:SystemDrive\postgresql-plugin-$env:POSTGRESQL_PLUGIN_VERSION\zabbix-agent2-plugin-postgresql.exe -V; ` - ` - Copy-Item -Path $env:SystemDrive\postgresql-plugin-$env:POSTGRESQL_PLUGIN_VERSION\zabbix-agent2-plugin-postgresql.exe $env:ZBX_OUTPUT_DIR\zabbix-agent2-plugin\postgresql.exe; ` - Copy-Item -Path $env:SystemDrive\postgresql-plugin-$env:POSTGRESQL_PLUGIN_VERSION\postgresql.conf $env:ZBX_OUTPUT_DIR\conf\zabbix_agent2.d\plugins.d; ` - mingw32-make -s clean; ` - ` - Write-Host ('Building Zabbix MSSQL plugin {0} version ...' -f $env:MSSQL_PLUGIN_VERSION); ` - git -c advice.detachedHead=false clone $env:MSSQL_PLUGIN_SOURCES --branch $env:MSSQL_PLUGIN_VERSION --depth 1 --single-branch $env:SystemDrive\mssql-plugin-$env:MSSQL_PLUGIN_VERSION; ` - Set-Location -Path $env:SystemDrive\mssql-plugin-$env:MSSQL_PLUGIN_VERSION; ` - mingw32-make; ` - ` - Write-Host 'Verifying MSSQL plugin ("zabbix-agent2-plugin-mssql.exe -V") ...'; ` - & $env:SystemDrive\mssql-plugin-$env:MSSQL_PLUGIN_VERSION\zabbix-agent2-plugin-mssql.exe -V; ` - ` - Copy-Item -Path $env:SystemDrive\mssql-plugin-$env:MSSQL_PLUGIN_VERSION\zabbix-agent2-plugin-mssql.exe $env:ZBX_OUTPUT_DIR\zabbix-agent2-plugin\mssql.exe; ` - Copy-Item -Path $env:SystemDrive\mssql-plugin-$env:MSSQL_PLUGIN_VERSION\mssql.conf $env:ZBX_OUTPUT_DIR\conf\zabbix_agent2.d\plugins.d; ` - mingw32-make -s clean; ` - ` - Write-Host ('Building Zabbix Ember+ plugin {0} version ...' -f $env:EMBER_PLUS_PLUGIN_VERSION); ` - git -c advice.detachedHead=false clone $env:EMBER_PLUS_PLUGIN_SOURCES --branch $env:EMBER_PLUS_PLUGIN_VERSION --depth 1 --single-branch $env:SystemDrive\ember-plus-plugin-$env:EMBER_PLUS_PLUGIN_VERSION; ` - Set-Location -Path $env:SystemDrive\ember-plus-plugin-$env:EMBER_PLUS_PLUGIN_VERSION; ` - mingw32-make; ` - ` - Write-Host 'Verifying Ember+ plugin ("zabbix-agent2-plugin-ember-plus.exe -V") ...'; ` - & $env:SystemDrive\ember-plus-plugin-$env:EMBER_PLUS_PLUGIN_VERSION\zabbix-agent2-plugin-ember-plus.exe -V; ` - ` - Copy-Item -Path $env:SystemDrive\ember-plus-plugin-$env:EMBER_PLUS_PLUGIN_VERSION\zabbix-agent2-plugin-ember-plus.exe $env:ZBX_OUTPUT_DIR\zabbix-agent2-plugin\ember-plus.exe; ` - Copy-Item -Path $env:SystemDrive\ember-plus-plugin-$env:EMBER_PLUS_PLUGIN_VERSION\ember.conf $env:ZBX_OUTPUT_DIR\conf\zabbix_agent2.d\plugins.d; ` - mingw32-make -s clean; ` - Write-Host 'Zabbix binaries are compiled...'; diff --git a/Dockerfiles/build-mysql/windows/Dockerfile_vcpkg.agent2 b/Dockerfiles/build-mysql/windows/Dockerfile_vcpkg.agent2 deleted file mode 100644 index a65bbf4a..00000000 --- a/Dockerfiles/build-mysql/windows/Dockerfile_vcpkg.agent2 +++ /dev/null @@ -1,125 +0,0 @@ -# syntax=docker/dockerfile:1 -# escape=` -ARG MAJOR_VERSION=7.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.0 -ARG BUILD_BASE_IMAGE=zabbix-build-base:ltsc2022-agent2-${ZBX_VERSION} - -FROM ${BUILD_BASE_IMAGE} AS builder - -SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] - -ARG MAJOR_VERSION=7.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.0 -ARG ZABBIX_VERSION_RC_NUM=2400 -ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git -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 - -ARG ZBX_PLUGINS_VERSION=${GIT_BRANCH:-$ZBX_VERSION} - -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=${ZBX_PLUGINS_VERSION} ` - POSTGRESQL_PLUGIN_SOURCES=$POSTGRESQL_PLUGIN_SOURCES POSTGRESQL_PLUGIN_VERSION=${ZBX_PLUGINS_VERSION} ` - MSSQL_PLUGIN_SOURCES=$MSSQL_PLUGIN_SOURCES MSSQL_PLUGIN_VERSION=${ZBX_PLUGINS_VERSION} ` - EMBER_PLUS_PLUGIN_SOURCES=$EMBER_PLUS_PLUGIN_SOURCES EMBER_PLUS_PLUGIN_VERSION=${ZBX_PLUGINS_VERSION} ` - ZABBIX_VERSION_RC_NUM=$ZABBIX_VERSION_RC_NUM ` - ZBX_SOURCES_DIR=C:\\zabbix-${ZBX_VERSION} ZBX_OUTPUT_DIR=C:\\zabbix-${ZBX_VERSION}-output - -LABEL org.opencontainers.image.title="Zabbix agent 2 build (Windows)" ` - org.opencontainers.image.authors="Alexey Pustovalov " ` - org.opencontainers.image.vendor="Zabbix SIA" ` - org.opencontainers.image.url="https://zabbix.com/" ` - org.opencontainers.image.description="Zabbix build for agent 2 images based on Windows" ` - org.opencontainers.image.licenses="AGPL v3.0" ` - org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" ` - org.opencontainers.image.version="${ZBX_VERSION}" ` - org.opencontainers.image.source="${ZBX_SOURCES}" - -RUN Set-Location -Path $env:SystemDrive\.; ` - ` - New-Item -ItemType directory -Path $env:ZBX_SOURCES_DIR | Out-Null; ` - New-Item -ItemType directory -Path $env:ZBX_OUTPUT_DIR | Out-Null; ` - New-Item -ItemType directory -Path $env:ZBX_OUTPUT_DIR\sbin | Out-Null; ` - New-Item -ItemType directory -Path $env:ZBX_OUTPUT_DIR\conf | Out-Null; ` - New-Item -ItemType directory -Path $env:ZBX_OUTPUT_DIR\conf\zabbix_agentd.d | Out-Null; ` - New-Item -ItemType directory -Path $env:ZBX_OUTPUT_DIR\zabbix-agent2-plugin | Out-Null; ` - ` - Import-Module (Get-ChildItem $env:VS_PATH -Recurse -File -Filter Microsoft.VisualStudio.DevShell.dll).FullName; ` - Enter-VsDevShell -VsInstallPath $env:VS_PATH -SkipAutomaticLocation -DevCmdArguments """-arch=$env:BUILD_ARCH"""; ` - ` - Write-Host ('Checkout GIT {0} ({1}) repository ...' -f $env:ZBX_SOURCES, $env:GIT_BRANCH); ` - git -c advice.detachedHead=false clone $env:ZBX_SOURCES --branch $env:GIT_BRANCH --depth 1 --single-branch $env:ZBX_SOURCES_DIR; ` - ` - Write-Host ('Building Zabbix {0} version ...' -f $env:ZBX_VERSION); ` - Set-Location -Path $env:ZBX_SOURCES_DIR; ` - $ZbxRevision=(git rev-parse --short HEAD); ` - (Get-Content include\version.h).replace('{ZABBIX_REVISION}', $ZbxRevision) | Set-Content include\version.h; ` - (Get-Content src\go\pkg\version\version.go).replace('{ZABBIX_REVISION}', $ZbxRevision) | Set-Content src\go\pkg\version\version.go; ` - Set-Location -Path $env:ZBX_SOURCES_DIR\build\mingw; ` - mingw32-make -j"""$env:NUMBER_OF_PROCESSORS""" ` - GOFLAGS="""-buildvcs=false""" ` - CGO_LDFLAGS="""-lcrypt32 -L$env:SystemDrive\vcpkg\installed\x64-mingw-static-release\lib""" ` - PCRE2=$env:SystemDrive\vcpkg\installed\x64-mingw-static-release ` - OPENSSL=$env:SystemDrive\vcpkg\installed\x64-mingw-static-release ` - RFLAGS="""-DZABBIX_VERSION_RC_NUM=$env:ZABBIX_VERSION_RC_NUM"""; ` - ` - Write-Host 'Verifying build ("zabbix_agent2.exe -V") ...'; ` - & $env:ZBX_SOURCES_DIR\bin\win64\zabbix_agent2.exe -V; ` - dumpbin /dependents $env:ZBX_SOURCES_DIR\bin\win64\zabbix_agent2.exe; ` - ` - Copy-Item -Path $env:ZBX_SOURCES_DIR\bin\win64\zabbix_agent2.exe $env:ZBX_OUTPUT_DIR\sbin; ` - Copy-Item -Path $env:ZBX_SOURCES_DIR\src\go\conf\zabbix_agent2.win.conf $env:ZBX_OUTPUT_DIR\conf\zabbix_agent2.conf; ` - Copy-Item -Recurse -Path $env:ZBX_SOURCES_DIR\src\go\conf\zabbix_agent2.d $env:ZBX_OUTPUT_DIR\conf\zabbix_agent2.d; ` - mingw32-make -s clean; ` - ` - Write-Host ('Building Zabbix MongoDB plugin {0} version ...' -f $env:MONGODB_PLUGIN_VERSION); ` - git -c advice.detachedHead=false clone $env:MONGODB_PLUGIN_SOURCES --branch $env:MONGODB_PLUGIN_VERSION --depth 1 --single-branch $env:SystemDrive\mongodb-plugin-$env:MONGODB_PLUGIN_VERSION; ` - Set-Location -Path $env:SystemDrive\mongodb-plugin-$env:MONGODB_PLUGIN_VERSION; ` - mingw32-make; ` - ` - Write-Host 'Verifying MongoDB plugin ("zabbix-agent2-plugin-mongodb.exe -V") ...'; ` - & $env:SystemDrive\mongodb-plugin-$env:MONGODB_PLUGIN_VERSION\zabbix-agent2-plugin-mongodb.exe -V; ` - ` - Copy-Item -Path $env:SystemDrive\mongodb-plugin-$env:MONGODB_PLUGIN_VERSION\zabbix-agent2-plugin-mongodb.exe $env:ZBX_OUTPUT_DIR\zabbix-agent2-plugin\mongodb.exe; ` - Copy-Item -Path $env:SystemDrive\mongodb-plugin-$env:MONGODB_PLUGIN_VERSION\mongodb.conf $env:ZBX_OUTPUT_DIR\conf\zabbix_agent2.d\plugins.d; ` - mingw32-make -s clean; ` - ` - Write-Host ('Building Zabbix PostgreSQL plugin {0} version ...' -f $env:POSTGRESQL_PLUGIN_VERSION); ` - git -c advice.detachedHead=false clone $env:POSTGRESQL_PLUGIN_SOURCES --branch $env:POSTGRESQL_PLUGIN_VERSION --depth 1 --single-branch $env:SystemDrive\postgresql-plugin-$env:POSTGRESQL_PLUGIN_VERSION; ` - Set-Location -Path $env:SystemDrive\postgresql-plugin-$env:POSTGRESQL_PLUGIN_VERSION; ` - mingw32-make; ` - ` - Write-Host 'Verifying build ("zabbix-agent2-plugin-postgresql.exe -V") ...'; ` - & $env:SystemDrive\postgresql-plugin-$env:POSTGRESQL_PLUGIN_VERSION\zabbix-agent2-plugin-postgresql.exe -V; ` - ` - Copy-Item -Path $env:SystemDrive\postgresql-plugin-$env:POSTGRESQL_PLUGIN_VERSION\zabbix-agent2-plugin-postgresql.exe $env:ZBX_OUTPUT_DIR\zabbix-agent2-plugin\postgresql.exe; ` - Copy-Item -Path $env:SystemDrive\postgresql-plugin-$env:POSTGRESQL_PLUGIN_VERSION\postgresql.conf $env:ZBX_OUTPUT_DIR\conf\zabbix_agent2.d\plugins.d; ` - mingw32-make -s clean; ` - ` - Write-Host ('Building Zabbix MSSQL plugin {0} version ...' -f $env:MSSQL_PLUGIN_VERSION); ` - git -c advice.detachedHead=false clone $env:MSSQL_PLUGIN_SOURCES --branch $env:MSSQL_PLUGIN_VERSION --depth 1 --single-branch $env:SystemDrive\mssql-plugin-$env:MSSQL_PLUGIN_VERSION; ` - Set-Location -Path $env:SystemDrive\mssql-plugin-$env:MSSQL_PLUGIN_VERSION; ` - mingw32-make; ` - ` - Write-Host 'Verifying MSSQL plugin ("zabbix-agent2-plugin-mssql.exe -V") ...'; ` - & $env:SystemDrive\mssql-plugin-$env:MSSQL_PLUGIN_VERSION\zabbix-agent2-plugin-mssql.exe -V; ` - ` - Copy-Item -Path $env:SystemDrive\mssql-plugin-$env:MSSQL_PLUGIN_VERSION\zabbix-agent2-plugin-mssql.exe $env:ZBX_OUTPUT_DIR\zabbix-agent2-plugin\mssql.exe; ` - Copy-Item -Path $env:SystemDrive\mssql-plugin-$env:MSSQL_PLUGIN_VERSION\mssql.conf $env:ZBX_OUTPUT_DIR\conf\zabbix_agent2.d\plugins.d; ` - mingw32-make -s clean; ` - ` - Write-Host ('Building Zabbix Ember+ plugin {0} version ...' -f $env:EMBER_PLUS_PLUGIN_VERSION); ` - git -c advice.detachedHead=false clone $env:EMBER_PLUS_PLUGIN_SOURCES --branch $env:EMBER_PLUS_PLUGIN_VERSION --depth 1 --single-branch $env:SystemDrive\ember-plus-plugin-$env:EMBER_PLUS_PLUGIN_VERSION; ` - Set-Location -Path $env:SystemDrive\ember-plus-plugin-$env:EMBER_PLUS_PLUGIN_VERSION; ` - mingw32-make; ` - ` - Write-Host 'Verifying Ember+ plugin ("zabbix-agent2-plugin-ember-plus.exe -V") ...'; ` - & $env:SystemDrive\ember-plus-plugin-$env:EMBER_PLUS_PLUGIN_VERSION\zabbix-agent2-plugin-ember-plus.exe -V; ` - ` - Copy-Item -Path $env:SystemDrive\ember-plus-plugin-$env:EMBER_PLUS_PLUGIN_VERSION\zabbix-agent2-plugin-ember-plus.exe $env:ZBX_OUTPUT_DIR\zabbix-agent2-plugin\ember-plus.exe; ` - Copy-Item -Path $env:SystemDrive\ember-plus-plugin-$env:EMBER_PLUS_PLUGIN_VERSION\ember.conf $env:ZBX_OUTPUT_DIR\conf\zabbix_agent2.d\plugins.d; ` - mingw32-make -s clean; ` - Write-Host 'Zabbix binaries are compiled...'; diff --git a/Dockerfiles/build-mysql/windows/README.md b/Dockerfiles/build-mysql/windows/README.md deleted file mode 120000 index 32d46ee8..00000000 --- a/Dockerfiles/build-mysql/windows/README.md +++ /dev/null @@ -1 +0,0 @@ -../README.md \ No newline at end of file diff --git a/Dockerfiles/build-pgsql/README.md b/Dockerfiles/build-pgsql/README.md deleted file mode 100644 index f884f181..00000000 --- a/Dockerfiles/build-pgsql/README.md +++ /dev/null @@ -1,82 +0,0 @@ -![logo](https://assets.zabbix.com/img/logo/zabbix_logo_500x131.png) - -# What is Zabbix? - -Zabbix is an enterprise-class open source distributed monitoring solution. - -Zabbix is software that monitors numerous parameters of a network and the health and integrity of servers. Zabbix uses a flexible notification mechanism that allows users to configure e-mail based alerts for virtually any event. This allows a fast reaction to server problems. Zabbix offers excellent reporting and data visualisation features based on the stored data. This makes Zabbix ideal for capacity planning. - -For more information and related downloads for Zabbix components, please visit https://hub.docker.com/u/zabbix/ and https://zabbix.com - -# What is Zabbix build base (PostgreSQL)? - -Zabbix build base (PostgreSQL) image is used for building Zabbix components. It contains compiled Zabbix components. - -# Zabbix build base (PostgreSQL) images - -These are the only official Zabbix build base (PostgreSQL) Docker images. They are based on Alpine Linux v3.24, Ubuntu 26.04 (resolute), CentOS Stream 10 and Oracle Linux 10 images. The available versions of the image are: - - Zabbix build base 6.0 (tags: alpine-6.0-latest, ubuntu-6.0-latest, ol-6.0-latest) - Zabbix build base 6.0.* (tags: alpine-6.0.*, ubuntu-6.0.*, ol-6.0.*) - Zabbix build base 7.0 (tags: alpine-7.0-latest, ubuntu-7.0-latest, ol-7.0-latest) - Zabbix build base 7.0.* (tags: alpine-7.0.*, ubuntu-7.0.*, ol-7.0.*) - Zabbix build base 7.2 (tags: alpine-7.2-latest, ubuntu-7.2-latest, ol-7.2-latest) - Zabbix build base 7.2.* (tags: alpine-7.2.*, ubuntu-7.2.*, ol-7.2.*) - Zabbix build base 7.4 (tags: alpine-7.4-latest, ubuntu-7.4-latest, ol-7.4-latest, alpine-latest, ubuntu-latest, ol-latest, latest) - Zabbix build base 7.4.* (tags: alpine-7.4.*, ubuntu-7.4.*, ol-7.4.*) - Zabbix build base 8.0 (tags: alpine-trunk, ubuntu-trunk, ol-trunk) - -Images are updated when new releases are published. The image with ``latest`` tag is based on Alpine Linux. - -# How to use this image - -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/7.4/Dockerfiles/build-base) image with prepared build environment as base image and build / compile Zabbix components only. - -# The image variants - -The `zabbix-build-pgsql` images come in many flavors, each designed for a specific use case. - -## `zabbix-build-pgsql:alpine-` - -This image is based on the popular [Alpine Linux project](http://alpinelinux.org), available in [the `alpine` official image](https://hub.docker.com/_/alpine). Alpine Linux is much smaller than most distribution base images (~5MB), and thus leads to much slimmer images in general. - -This variant is highly recommended when final image size being as small as possible is desired. The main caveat to note is that it does use [musl libc](http://www.musl-libc.org) instead of [glibc and friends](http://www.etalabs.net/compare_libcs.html), so certain software might run into issues depending on the depth of their libc requirements. However, most software doesn't have an issue with this, so this variant is usually a very safe choice. See [this Hacker News comment thread](https://news.ycombinator.com/item?id=10782897) for more discussion of the issues that might arise and some pro/con comparisons of using Alpine-based images. - -To minimize image size, it's uncommon for additional related tools (such as `git` or `bash`) to be included in Alpine-based images. Using this image as a base, add the things you need in your own Dockerfile (see the [`alpine` image description](https://hub.docker.com/_/alpine/) for examples of how to install packages if you are unfamiliar). - -## `zabbix-build-pgsql:ubuntu-` - -This is the defacto image. If you are unsure about what your needs are, you probably want to use this one. It is designed to be used both as a throw away container (mount your source code and start the container to start your app), as well as the base to build other images off of. - -## `zabbix-build-pgsql:ol-` - -Oracle Linux is an open-source operating system available under the GNU General Public License (GPLv2). Suitable for general purpose or Oracle workloads, it benefits from rigorous testing of more than 128,000 hours per day with real-world workloads and includes unique innovations such as Ksplice for zero-downtime kernel patching, DTrace for real-time diagnostics, the powerful Btrfs file system, and more. - -# User Feedback - -## Documentation - -Documentation for this image is stored in the [`build-pgsql/` directory](https://github.com/zabbix/zabbix-docker/tree/7.4/Dockerfiles/build-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.4/README.md) before attempting a pull request. - -## Issues - -If you have any problems with or questions about this image, please contact us through a [GitHub issue](https://github.com/zabbix/zabbix-docker/issues). - -### Known issues - -## Contributing - -You are invited to contribute new features, fixes, or updates, large or small; we are always thrilled to receive pull requests, and do our best to process them as fast as we can. - -Before you start to code, we recommend discussing your plans through a [GitHub issue](https://github.com/zabbix/zabbix-docker/issues), especially for more ambitious contributions. This gives other contributors a chance to point you in the right direction, give you feedback on your design, and help you find out if someone else is working on the same thing. - -## License - -Starting from Zabbix version 7.0, all subsequent Zabbix versions will be released under the GNU Affero General Public License version 3 (AGPLv3). -You can modify the relevant version and propagate such modified version under the terms of the AGPLv3 as published by the Free Software Foundation. -For additional details, including answers to common questions about the AGPLv3, see the generic FAQ from the [Free Software Foundation](http://www.fsf.org/licenses/gpl-faq.html). - -Zabbix is Open Source Software, however, if you use Zabbix in a commercial context we kindly ask you to support the development of Zabbix by purchasing some level of technical support. -All previous Zabbix software versions up to 6.4 are released under the GNU General Public License version 2 (GPLv2). The formal terms of the GPLv2 and AGPLv3 can be found at http://www.fsf.org/licenses/. diff --git a/Dockerfiles/build-pgsql/alpine/.dockerignore b/Dockerfiles/build-pgsql/alpine/.dockerignore deleted file mode 100644 index 88a84e55..00000000 --- a/Dockerfiles/build-pgsql/alpine/.dockerignore +++ /dev/null @@ -1 +0,0 @@ -build.sh diff --git a/Dockerfiles/build-pgsql/alpine/Dockerfile b/Dockerfiles/build-pgsql/alpine/Dockerfile deleted file mode 100644 index 48c958bb..00000000 --- a/Dockerfiles/build-pgsql/alpine/Dockerfile +++ /dev/null @@ -1,217 +0,0 @@ -# syntax=docker/dockerfile:1.6 -ARG MAJOR_VERSION=7.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.12 -ARG BUILD_BASE_IMAGE=zabbix-build-base:alpine-${ZBX_VERSION} - -FROM ${BUILD_BASE_IMAGE} AS builder -ARG BUILD_JOBS - -ARG MAJOR_VERSION -ARG ZBX_VERSION -ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git -ARG GIT_BRANCH - -ARG ZBX_PLUGINS_VERSION=${GIT_BRANCH:-$ZBX_VERSION} -ARG CFLAGS -ARG LDFLAGS - -LABEL org.opencontainers.image.authors="Alexey Pustovalov " \ - org.opencontainers.image.description="Zabbix build base for PostgreSQL based images" \ - org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ - org.opencontainers.image.licenses="AGPL v3.0" \ - org.opencontainers.image.source="${ZBX_SOURCES}" \ - org.opencontainers.image.title="Zabbix build base (PostgreSQL)" \ - org.opencontainers.image.url="https://zabbix.com/" \ - org.opencontainers.image.vendor="Zabbix SIA" \ - org.opencontainers.image.version="${ZBX_VERSION}" - -ENV ZBX_SOURCES_DIR=/tmp/zabbix-${ZBX_VERSION} ZBX_OUTPUT_DIR=/tmp/zabbix-${ZBX_VERSION}-output \ - DB_TYPE=postgresql \ - CFLAGS=${CFLAGS:-"-O2 -fPIE -fstack-protector-strong -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -pipe"} \ - LDFLAGS=${LDFLAGS:-"-pie -Wl,-z,relro,-z,now,-z,defs -Wl,--as-needed"} \ - MONGODB_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/mongodb.git MONGODB_PLUGIN_VERSION=${ZBX_PLUGINS_VERSION} \ - POSTGRESQL_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/postgresql.git POSTGRESQL_PLUGIN_VERSION=${ZBX_PLUGINS_VERSION} \ - MSSQL_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/mssql.git MSSQL_PLUGIN_VERSION=${ZBX_PLUGINS_VERSION} \ - EMBER_PLUS_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/ember-plus.git EMBER_PLUS_PLUGIN_VERSION=${ZBX_PLUGINS_VERSION} \ - NVIDIA_GPU_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/nvidia-gpu.git NVIDIA_GPU_PLUGIN_VERSION=${ZBX_PLUGINS_VERSION} - -RUN --mount=from=sources,target=/tmp/src,ro \ - --mount=type=bind,source=patches/,target=/tmp/patches,ro \ - set -eux && \ - mkdir -p \ - ${ZBX_OUTPUT_DIR}/agent/sbin \ - ${ZBX_OUTPUT_DIR}/agent/conf \ - ${ZBX_OUTPUT_DIR}/agent2/sbin \ - ${ZBX_OUTPUT_DIR}/agent2/conf \ - ${ZBX_OUTPUT_DIR}/agent2/conf/zabbix_agent2.d/plugins.d \ - ${ZBX_OUTPUT_DIR}/proxy/sbin \ - ${ZBX_OUTPUT_DIR}/proxy/conf \ - ${ZBX_OUTPUT_DIR}/proxy/database/${DB_TYPE} \ - ${ZBX_OUTPUT_DIR}/server/sbin \ - ${ZBX_OUTPUT_DIR}/server/conf \ - ${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE} \ - ${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE}/option-patches/with-compression/ \ - ${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE}/option-patches/without-compression/ \ - ${ZBX_OUTPUT_DIR}/java_gateway/sbin/bin \ - ${ZBX_OUTPUT_DIR}/java_gateway/sbin/lib \ - ${ZBX_OUTPUT_DIR}/java_gateway/conf \ - ${ZBX_OUTPUT_DIR}/web_service/sbin \ - ${ZBX_OUTPUT_DIR}/web_service/conf \ - ${ZBX_OUTPUT_DIR}/web/conf \ - ${ZBX_OUTPUT_DIR}/general/sbin \ - ${ZBX_OUTPUT_DIR}/general/bin \ - ${ZBX_OUTPUT_DIR}/general/conf && \ - if [ -f /tmp/src/bootstrap.sh ]; then \ - mkdir -p "${ZBX_SOURCES_DIR}" && \ - cp -a /tmp/src/. "${ZBX_SOURCES_DIR}/"; \ - else \ - git -c advice.detachedHead=false clone \ - "${ZBX_SOURCES}" \ - --branch "${GIT_BRANCH:-$ZBX_VERSION}" \ - --depth 1 \ - --single-branch \ - "${ZBX_SOURCES_DIR}"; \ - fi && \ - cd "${ZBX_SOURCES_DIR}" && \ - for patch_filename in /tmp/patches/*.patch; do \ - [ -f "$patch_filename" ] || continue; \ - patch -p1 < "$patch_filename"; \ - done && \ - if git rev-parse --short HEAD >/dev/null 2>&1; then \ - zabbix_revision="$(git rev-parse --short HEAD)"; \ - else \ - zabbix_revision="unknown"; \ - fi && \ - sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" include/version.h && \ - sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" src/go/pkg/version/version.go && \ - sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java - -WORKDIR ${ZBX_SOURCES_DIR} - -RUN --mount=type=cache,target=/root/.cache/go-build \ - --mount=type=cache,target=/root/go/pkg/mod \ - --mount=from=config_templates,target=/tmp/conf,ro \ - set -eux && \ - cd "${ZBX_SOURCES_DIR}" && \ - ./bootstrap.sh && \ - ./configure \ - --datadir=/usr/lib \ - --libdir=/usr/lib/zabbix \ - --prefix=/usr \ - --sysconfdir=/etc/zabbix \ - --enable-ipv6 \ - --enable-agent \ - --enable-agent2 \ - --enable-java \ - --enable-proxy \ - --enable-server \ - --enable-webservice \ - --with-ares \ - --with-ldap \ - --with-libcurl \ - --with-libmodbus \ - --with-libpcre2 \ - --with-libxml2 \ - --with-${DB_TYPE} \ - --with-net-snmp \ - --with-openipmi \ - --with-openssl \ - --with-ssh \ - --with-unixodbc \ - --silent && \ - jobs="${BUILD_JOBS:-$(nproc)}" && \ - make -j"${jobs}" -s dbschema && \ - make -j"${jobs}" -s && \ - make -j"${jobs}" -s gettext && \ - cat "database/${DB_TYPE}/schema.sql" > "database/${DB_TYPE}/create.sql" && \ - gzip -c "database/${DB_TYPE}/create.sql" > "${ZBX_OUTPUT_DIR}/proxy/database/${DB_TYPE}/create.sql.gz" && \ - cat "database/${DB_TYPE}/images.sql" >> "database/${DB_TYPE}/create.sql" && \ - cat "database/${DB_TYPE}/data.sql" >> "database/${DB_TYPE}/create.sql" && \ - gzip -c "database/${DB_TYPE}/create.sql" > "${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE}/create.sql.gz" && \ - rm -f "database/${DB_TYPE}/create.sql" && \ - cp "database/${DB_TYPE}/timescaledb/schema.sql" "${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE}/timescaledb.sql" && \ - cp "${ZBX_SOURCES_DIR}/database/${DB_TYPE}/timescaledb/option-patches/with-compression/"*.sql "${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE}/option-patches/with-compression/" && \ - cp "${ZBX_SOURCES_DIR}/database/${DB_TYPE}/timescaledb/option-patches/without-compression/"*.sql "${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE}/option-patches/without-compression/" && \ - strip src/zabbix_agent/zabbix_agentd && \ - strip src/zabbix_server/zabbix_server && \ - strip src/zabbix_proxy/zabbix_proxy && \ - strip src/zabbix_get/zabbix_get && \ - strip src/zabbix_sender/zabbix_sender && \ - strip src/go/bin/zabbix_agent2 || true && \ - strip src/go/bin/zabbix_web_service || true && \ - mv src/zabbix_agent/zabbix_agentd "${ZBX_OUTPUT_DIR}/agent/sbin/" && \ - cp conf/zabbix_agentd.conf "${ZBX_OUTPUT_DIR}/agent/conf/zabbix_agentd.conf.dist" && \ - cp -a conf/zabbix_agentd/. "${ZBX_OUTPUT_DIR}/agent/conf/" && \ - cp -a /tmp/conf/agent/. "${ZBX_OUTPUT_DIR}/agent/conf/" && \ - mv src/go/bin/zabbix_agent2 "${ZBX_OUTPUT_DIR}/agent2/sbin/" && \ - cp src/go/conf/zabbix_agent2.conf "${ZBX_OUTPUT_DIR}/agent2/conf/zabbix_agent2.conf.dist" && \ - cp -a src/go/conf/zabbix_agent2.d/. "${ZBX_OUTPUT_DIR}/agent2/conf/zabbix_agent2.d/" && \ - cp -a /tmp/conf/agent2/. "${ZBX_OUTPUT_DIR}/agent2/conf/" && \ - mv src/zabbix_server/zabbix_server "${ZBX_OUTPUT_DIR}/server/sbin/" && \ - cp conf/zabbix_server.conf "${ZBX_OUTPUT_DIR}/server/conf/zabbix_server.conf.dist" && \ - cp -a /tmp/conf/server/. "${ZBX_OUTPUT_DIR}/server/conf/" && \ - mv src/zabbix_proxy/zabbix_proxy "${ZBX_OUTPUT_DIR}/proxy/sbin/" && \ - cp conf/zabbix_proxy.conf "${ZBX_OUTPUT_DIR}/proxy/conf/zabbix_proxy.conf.dist" && \ - cp -a /tmp/conf/proxy/. "${ZBX_OUTPUT_DIR}/proxy/conf/" && \ - cp -a src/zabbix_java/bin/. "${ZBX_OUTPUT_DIR}/java_gateway/sbin/bin/" && \ - cp -a src/zabbix_java/lib/*.jar "${ZBX_OUTPUT_DIR}/java_gateway/sbin/lib/" && \ - cp src/zabbix_java/lib/logback.xml "${ZBX_OUTPUT_DIR}/java_gateway/conf/logback.xml.dist" && \ - cp src/zabbix_java/lib/logback-console.xml "${ZBX_OUTPUT_DIR}/java_gateway/conf/logback-console.xml.dist" && \ - cp -a /tmp/conf/java-gateway/. "${ZBX_OUTPUT_DIR}/java_gateway/conf/" && \ - mv src/go/bin/zabbix_web_service "${ZBX_OUTPUT_DIR}/web_service/sbin/" && \ - cp src/go/conf/zabbix_web_service.conf "${ZBX_OUTPUT_DIR}/web_service/conf/zabbix_web_service.conf.dist" && \ - cp -a /tmp/conf/web_service/. "${ZBX_OUTPUT_DIR}/web_service/conf/" && \ - mv src/zabbix_get/zabbix_get "${ZBX_OUTPUT_DIR}/general/bin/" && \ - mv src/zabbix_sender/zabbix_sender "${ZBX_OUTPUT_DIR}/general/bin/" && \ - cp -a /tmp/conf/web/. "${ZBX_OUTPUT_DIR}/web/conf/" && \ - make -s distclean - -RUN set -eux && \ - cd "${ZBX_SOURCES_DIR}" && \ - curl --retry 5 --retry-all-errors --retry-delay 2 --tlsv1.2 -sSf -L \ - "https://raw.githubusercontent.com/notofonts/noto-cjk/main/Sans/OTF/Japanese/NotoSansCJKjp-Regular.otf" \ - -o ui/assets/fonts/NotoSansCJKjp-Regular.otf && \ - curl --retry 5 --retry-all-errors --retry-delay 2 --tlsv1.2 -sSf -L \ - "https://raw.githubusercontent.com/notofonts/noto-cjk/main/Sans/LICENSE" \ - -o ui/assets/fonts/OFL.txt && \ - sed -i -r 's/(define\(.*_FONT_NAME.*)DejaVuSans/\1NotoSansCJKjp-Regular/' ui/include/defines.inc.php && \ - sed -i -r 's/\.ttf/\.otf/' ui/include/graphs.inc.php && \ - rm -f ui/assets/fonts/DejaVuSans.ttf && \ - chmod o+r ui/assets/fonts/* - -RUN --mount=type=cache,target=/root/.cache/go-build \ - --mount=type=cache,target=/root/go/pkg/mod \ - set -eux && \ - mkdir -p "${ZBX_OUTPUT_DIR}/agent2/sbin/zabbix-agent2-plugin" && \ - mkdir -p "${ZBX_OUTPUT_DIR}/agent2/conf/zabbix_agent2.d/plugins.d" && \ - build_plugin() { \ - name="$1"; \ - repo="$2"; \ - version="$3"; \ - binary="$4"; \ - conf="$5"; \ - outname="$6"; \ - workdir="/tmp/${name}-plugin-${version}"; \ - rm -rf "$workdir"; \ - git -c advice.detachedHead=false clone "$repo" \ - --branch "$version" \ - --depth 1 \ - --single-branch \ - "$workdir"; \ - cd "$workdir"; \ - make; \ - strip "$binary" || true; \ - mv "$binary" "${ZBX_OUTPUT_DIR}/agent2/sbin/zabbix-agent2-plugin/${outname}"; \ - cp "$conf" "${ZBX_OUTPUT_DIR}/agent2/conf/zabbix_agent2.d/plugins.d/"; \ - make clean; \ - }; \ - build_plugin mongodb "${MONGODB_PLUGIN_SOURCES}" "${MONGODB_PLUGIN_VERSION}" \ - zabbix-agent2-plugin-mongodb mongodb.conf mongodb && \ - build_plugin postgresql "${POSTGRESQL_PLUGIN_SOURCES}" "${POSTGRESQL_PLUGIN_VERSION}" \ - zabbix-agent2-plugin-postgresql postgresql.conf postgresql && \ - build_plugin mssql "${MSSQL_PLUGIN_SOURCES}" "${MSSQL_PLUGIN_VERSION}" \ - zabbix-agent2-plugin-mssql mssql.conf mssql && \ - build_plugin ember "${EMBER_PLUS_PLUGIN_SOURCES}" "${EMBER_PLUS_PLUGIN_VERSION}" \ - zabbix-agent2-plugin-ember-plus ember.conf ember-plus && \ - build_plugin nvidia-gpu "${NVIDIA_GPU_PLUGIN_SOURCES}" "${NVIDIA_GPU_PLUGIN_VERSION}" \ - zabbix-agent2-plugin-nvidia-gpu nvidia.conf nvidia-gpu diff --git a/Dockerfiles/build-pgsql/alpine/README.md b/Dockerfiles/build-pgsql/alpine/README.md deleted file mode 120000 index 32d46ee8..00000000 --- a/Dockerfiles/build-pgsql/alpine/README.md +++ /dev/null @@ -1 +0,0 @@ -../README.md \ No newline at end of file diff --git a/Dockerfiles/build-pgsql/alpine/build.sh b/Dockerfiles/build-pgsql/alpine/build.sh deleted file mode 120000 index 46b20313..00000000 --- a/Dockerfiles/build-pgsql/alpine/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../../build.sh \ No newline at end of file diff --git a/Dockerfiles/build-pgsql/alpine/patches/chromedp_no_sandbox.patch b/Dockerfiles/build-pgsql/alpine/patches/chromedp_no_sandbox.patch deleted file mode 100644 index c8a2e162..00000000 --- a/Dockerfiles/build-pgsql/alpine/patches/chromedp_no_sandbox.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/src/go/cmd/zabbix_web_service/pdf_report_creator.go b/src/go/cmd/zabbix_web_service/pdf_report_creator.go -index afab41204d1..f1a9b859f34 100644 ---- a/src/go/cmd/zabbix_web_service/pdf_report_creator.go -+++ b/src/go/cmd/zabbix_web_service/pdf_report_creator.go -@@ -100,7 +100,11 @@ func (h *handler) report(w http.ResponseWriter, r *http.Request) { - return - } - -- opts := chromedp.DefaultExecAllocatorOptions[:] -+ opts := append(chromedp.DefaultExecAllocatorOptions[:], -+ chromedp.DisableGPU, -+ chromedp.NoSandbox, -+ chromedp.Flag("disable-setuid-sandbox", true), -+ ) - - if options.IgnoreURLCertErrors == 1 { - opts = append(opts, chromedp.Flag("ignore-certificate-errors", "1")) diff --git a/Dockerfiles/build-pgsql/centos/.dockerignore b/Dockerfiles/build-pgsql/centos/.dockerignore deleted file mode 100644 index 88a84e55..00000000 --- a/Dockerfiles/build-pgsql/centos/.dockerignore +++ /dev/null @@ -1 +0,0 @@ -build.sh diff --git a/Dockerfiles/build-pgsql/centos/Dockerfile b/Dockerfiles/build-pgsql/centos/Dockerfile deleted file mode 100644 index 906b3fda..00000000 --- a/Dockerfiles/build-pgsql/centos/Dockerfile +++ /dev/null @@ -1,217 +0,0 @@ -# syntax=docker/dockerfile:1.6 -ARG MAJOR_VERSION=7.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.12 -ARG BUILD_BASE_IMAGE=zabbix-build-base:centos-${ZBX_VERSION} - -FROM ${BUILD_BASE_IMAGE} AS builder -ARG BUILD_JOBS - -ARG MAJOR_VERSION -ARG ZBX_VERSION -ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git -ARG GIT_BRANCH - -ARG ZBX_PLUGINS_VERSION=${GIT_BRANCH:-$ZBX_VERSION} -ARG CFLAGS -ARG LDFLAGS - -LABEL org.opencontainers.image.authors="Alexey Pustovalov " \ - org.opencontainers.image.description="Zabbix build base for PostgreSQL based images" \ - org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ - org.opencontainers.image.licenses="AGPL v3.0" \ - org.opencontainers.image.source="${ZBX_SOURCES}" \ - org.opencontainers.image.title="Zabbix build base (PostgreSQL)" \ - org.opencontainers.image.url="https://zabbix.com/" \ - org.opencontainers.image.vendor="Zabbix SIA" \ - org.opencontainers.image.version="${ZBX_VERSION}" - -ENV ZBX_SOURCES_DIR=/tmp/zabbix-${ZBX_VERSION} ZBX_OUTPUT_DIR=/tmp/zabbix-${ZBX_VERSION}-output \ - DB_TYPE=postgresql \ - CFLAGS=${CFLAGS:-"-O2 -fPIE -fstack-protector-strong -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -pipe"} \ - LDFLAGS=${LDFLAGS:-"-pie -Wl,-z,relro,-z,now,-z,defs -Wl,--as-needed"} \ - MONGODB_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/mongodb.git MONGODB_PLUGIN_VERSION=${ZBX_PLUGINS_VERSION} \ - POSTGRESQL_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/postgresql.git POSTGRESQL_PLUGIN_VERSION=${ZBX_PLUGINS_VERSION} \ - MSSQL_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/mssql.git MSSQL_PLUGIN_VERSION=${ZBX_PLUGINS_VERSION} \ - EMBER_PLUS_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/ember-plus.git EMBER_PLUS_PLUGIN_VERSION=${ZBX_PLUGINS_VERSION} \ - NVIDIA_GPU_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/nvidia-gpu.git NVIDIA_GPU_PLUGIN_VERSION=${ZBX_PLUGINS_VERSION} - -RUN --mount=from=sources,target=/tmp/src,ro \ - --mount=type=bind,source=patches/,target=/tmp/patches,ro \ - set -eux && \ - mkdir -p \ - ${ZBX_OUTPUT_DIR}/agent/sbin \ - ${ZBX_OUTPUT_DIR}/agent/conf \ - ${ZBX_OUTPUT_DIR}/agent2/sbin \ - ${ZBX_OUTPUT_DIR}/agent2/conf \ - ${ZBX_OUTPUT_DIR}/agent2/conf/zabbix_agent2.d/plugins.d \ - ${ZBX_OUTPUT_DIR}/proxy/sbin \ - ${ZBX_OUTPUT_DIR}/proxy/conf \ - ${ZBX_OUTPUT_DIR}/proxy/database/${DB_TYPE} \ - ${ZBX_OUTPUT_DIR}/server/sbin \ - ${ZBX_OUTPUT_DIR}/server/conf \ - ${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE} \ - ${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE}/option-patches/with-compression/ \ - ${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE}/option-patches/without-compression/ \ - ${ZBX_OUTPUT_DIR}/java_gateway/sbin/bin \ - ${ZBX_OUTPUT_DIR}/java_gateway/sbin/lib \ - ${ZBX_OUTPUT_DIR}/java_gateway/conf \ - ${ZBX_OUTPUT_DIR}/web_service/sbin \ - ${ZBX_OUTPUT_DIR}/web_service/conf \ - ${ZBX_OUTPUT_DIR}/web/conf \ - ${ZBX_OUTPUT_DIR}/general/sbin \ - ${ZBX_OUTPUT_DIR}/general/bin \ - ${ZBX_OUTPUT_DIR}/general/conf && \ - if [ -f /tmp/src/bootstrap.sh ]; then \ - mkdir -p "${ZBX_SOURCES_DIR}" && \ - cp -a /tmp/src/. "${ZBX_SOURCES_DIR}/"; \ - else \ - git -c advice.detachedHead=false clone \ - "${ZBX_SOURCES}" \ - --branch "${GIT_BRANCH:-$ZBX_VERSION}" \ - --depth 1 \ - --single-branch \ - "${ZBX_SOURCES_DIR}"; \ - fi && \ - cd "${ZBX_SOURCES_DIR}" && \ - for patch_filename in /tmp/patches/*.patch; do \ - [ -f "$patch_filename" ] || continue; \ - patch -p1 < "$patch_filename"; \ - done && \ - if git rev-parse --short HEAD >/dev/null 2>&1; then \ - zabbix_revision="$(git rev-parse --short HEAD)"; \ - else \ - zabbix_revision="unknown"; \ - fi && \ - sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" include/version.h && \ - sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" src/go/pkg/version/version.go && \ - sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java - -WORKDIR ${ZBX_SOURCES_DIR} - -RUN --mount=type=cache,target=/root/.cache/go-build \ - --mount=type=cache,target=/root/go/pkg/mod \ - --mount=from=config_templates,target=/tmp/conf,ro \ - set -eux && \ - cd "${ZBX_SOURCES_DIR}" && \ - ./bootstrap.sh && \ - ./configure \ - --datadir=/usr/lib \ - --libdir=/usr/lib/zabbix \ - --prefix=/usr \ - --sysconfdir=/etc/zabbix \ - --enable-ipv6 \ - --enable-agent \ - --enable-agent2 \ - --enable-java \ - --enable-proxy \ - --enable-server \ - --enable-webservice \ - --with-ares \ - --with-ldap \ - --with-libcurl \ - --with-libmodbus \ - --with-libpcre2 \ - --with-libxml2 \ - --with-${DB_TYPE} \ - --with-net-snmp \ - --with-openipmi \ - --with-openssl \ - --with-ssh \ - --with-unixodbc \ - --silent && \ - jobs="${BUILD_JOBS:-$(nproc)}" && \ - make -j"${jobs}" -s dbschema && \ - make -j"${jobs}" -s && \ - make -j"${jobs}" -s gettext && \ - cat "database/${DB_TYPE}/schema.sql" > "database/${DB_TYPE}/create.sql" && \ - gzip -c "database/${DB_TYPE}/create.sql" > "${ZBX_OUTPUT_DIR}/proxy/database/${DB_TYPE}/create.sql.gz" && \ - cat "database/${DB_TYPE}/images.sql" >> "database/${DB_TYPE}/create.sql" && \ - cat "database/${DB_TYPE}/data.sql" >> "database/${DB_TYPE}/create.sql" && \ - gzip -c "database/${DB_TYPE}/create.sql" > "${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE}/create.sql.gz" && \ - rm -f "database/${DB_TYPE}/create.sql" && \ - cp "database/${DB_TYPE}/timescaledb/schema.sql" "${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE}/timescaledb.sql" && \ - cp "${ZBX_SOURCES_DIR}/database/${DB_TYPE}/timescaledb/option-patches/with-compression/"*.sql "${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE}/option-patches/with-compression/" && \ - cp "${ZBX_SOURCES_DIR}/database/${DB_TYPE}/timescaledb/option-patches/without-compression/"*.sql "${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE}/option-patches/without-compression/" && \ - strip src/zabbix_agent/zabbix_agentd && \ - strip src/zabbix_server/zabbix_server && \ - strip src/zabbix_proxy/zabbix_proxy && \ - strip src/zabbix_get/zabbix_get && \ - strip src/zabbix_sender/zabbix_sender && \ - strip src/go/bin/zabbix_agent2 || true && \ - strip src/go/bin/zabbix_web_service || true && \ - mv src/zabbix_agent/zabbix_agentd "${ZBX_OUTPUT_DIR}/agent/sbin/" && \ - cp conf/zabbix_agentd.conf "${ZBX_OUTPUT_DIR}/agent/conf/zabbix_agentd.conf.dist" && \ - cp -a conf/zabbix_agentd/. "${ZBX_OUTPUT_DIR}/agent/conf/" && \ - cp -a /tmp/conf/agent/. "${ZBX_OUTPUT_DIR}/agent/conf/" && \ - mv src/go/bin/zabbix_agent2 "${ZBX_OUTPUT_DIR}/agent2/sbin/" && \ - cp src/go/conf/zabbix_agent2.conf "${ZBX_OUTPUT_DIR}/agent2/conf/zabbix_agent2.conf.dist" && \ - cp -a src/go/conf/zabbix_agent2.d/. "${ZBX_OUTPUT_DIR}/agent2/conf/zabbix_agent2.d/" && \ - cp -a /tmp/conf/agent2/. "${ZBX_OUTPUT_DIR}/agent2/conf/" && \ - mv src/zabbix_server/zabbix_server "${ZBX_OUTPUT_DIR}/server/sbin/" && \ - cp conf/zabbix_server.conf "${ZBX_OUTPUT_DIR}/server/conf/zabbix_server.conf.dist" && \ - cp -a /tmp/conf/server/. "${ZBX_OUTPUT_DIR}/server/conf/" && \ - mv src/zabbix_proxy/zabbix_proxy "${ZBX_OUTPUT_DIR}/proxy/sbin/" && \ - cp conf/zabbix_proxy.conf "${ZBX_OUTPUT_DIR}/proxy/conf/zabbix_proxy.conf.dist" && \ - cp -a /tmp/conf/proxy/. "${ZBX_OUTPUT_DIR}/proxy/conf/" && \ - cp -a src/zabbix_java/bin/. "${ZBX_OUTPUT_DIR}/java_gateway/sbin/bin/" && \ - cp -a src/zabbix_java/lib/*.jar "${ZBX_OUTPUT_DIR}/java_gateway/sbin/lib/" && \ - cp src/zabbix_java/lib/logback.xml "${ZBX_OUTPUT_DIR}/java_gateway/conf/logback.xml.dist" && \ - cp src/zabbix_java/lib/logback-console.xml "${ZBX_OUTPUT_DIR}/java_gateway/conf/logback-console.xml.dist" && \ - cp -a /tmp/conf/java-gateway/. "${ZBX_OUTPUT_DIR}/java_gateway/conf/" && \ - mv src/go/bin/zabbix_web_service "${ZBX_OUTPUT_DIR}/web_service/sbin/" && \ - cp src/go/conf/zabbix_web_service.conf "${ZBX_OUTPUT_DIR}/web_service/conf/zabbix_web_service.conf.dist" && \ - cp -a /tmp/conf/web_service/. "${ZBX_OUTPUT_DIR}/web_service/conf/" && \ - mv src/zabbix_get/zabbix_get "${ZBX_OUTPUT_DIR}/general/bin/" && \ - mv src/zabbix_sender/zabbix_sender "${ZBX_OUTPUT_DIR}/general/bin/" && \ - cp -a /tmp/conf/web/. "${ZBX_OUTPUT_DIR}/web/conf/" && \ - make -s distclean - -RUN set -eux && \ - cd "${ZBX_SOURCES_DIR}" && \ - curl --retry 5 --retry-all-errors --retry-delay 2 --tlsv1.2 -sSf -L \ - "https://raw.githubusercontent.com/notofonts/noto-cjk/main/Sans/OTF/Japanese/NotoSansCJKjp-Regular.otf" \ - -o ui/assets/fonts/NotoSansCJKjp-Regular.otf && \ - curl --retry 5 --retry-all-errors --retry-delay 2 --tlsv1.2 -sSf -L \ - "https://raw.githubusercontent.com/notofonts/noto-cjk/main/Sans/LICENSE" \ - -o ui/assets/fonts/OFL.txt && \ - sed -i -r 's/(define\(.*_FONT_NAME.*)DejaVuSans/\1NotoSansCJKjp-Regular/' ui/include/defines.inc.php && \ - sed -i -r 's/\.ttf/\.otf/' ui/include/graphs.inc.php && \ - rm -f ui/assets/fonts/DejaVuSans.ttf && \ - chmod o+r ui/assets/fonts/* - -RUN --mount=type=cache,target=/root/.cache/go-build \ - --mount=type=cache,target=/root/go/pkg/mod \ - set -eux && \ - mkdir -p "${ZBX_OUTPUT_DIR}/agent2/sbin/zabbix-agent2-plugin" && \ - mkdir -p "${ZBX_OUTPUT_DIR}/agent2/conf/zabbix_agent2.d/plugins.d" && \ - build_plugin() { \ - name="$1"; \ - repo="$2"; \ - version="$3"; \ - binary="$4"; \ - conf="$5"; \ - outname="$6"; \ - workdir="/tmp/${name}-plugin-${version}"; \ - rm -rf "$workdir"; \ - git -c advice.detachedHead=false clone "$repo" \ - --branch "$version" \ - --depth 1 \ - --single-branch \ - "$workdir"; \ - cd "$workdir"; \ - make; \ - strip "$binary" || true; \ - mv "$binary" "${ZBX_OUTPUT_DIR}/agent2/sbin/zabbix-agent2-plugin/${outname}"; \ - cp "$conf" "${ZBX_OUTPUT_DIR}/agent2/conf/zabbix_agent2.d/plugins.d/"; \ - make clean; \ - }; \ - build_plugin mongodb "${MONGODB_PLUGIN_SOURCES}" "${MONGODB_PLUGIN_VERSION}" \ - zabbix-agent2-plugin-mongodb mongodb.conf mongodb && \ - build_plugin postgresql "${POSTGRESQL_PLUGIN_SOURCES}" "${POSTGRESQL_PLUGIN_VERSION}" \ - zabbix-agent2-plugin-postgresql postgresql.conf postgresql && \ - build_plugin mssql "${MSSQL_PLUGIN_SOURCES}" "${MSSQL_PLUGIN_VERSION}" \ - zabbix-agent2-plugin-mssql mssql.conf mssql && \ - build_plugin ember "${EMBER_PLUS_PLUGIN_SOURCES}" "${EMBER_PLUS_PLUGIN_VERSION}" \ - zabbix-agent2-plugin-ember-plus ember.conf ember-plus && \ - build_plugin nvidia-gpu "${NVIDIA_GPU_PLUGIN_SOURCES}" "${NVIDIA_GPU_PLUGIN_VERSION}" \ - zabbix-agent2-plugin-nvidia-gpu nvidia.conf nvidia-gpu diff --git a/Dockerfiles/build-pgsql/centos/README.md b/Dockerfiles/build-pgsql/centos/README.md deleted file mode 120000 index 32d46ee8..00000000 --- a/Dockerfiles/build-pgsql/centos/README.md +++ /dev/null @@ -1 +0,0 @@ -../README.md \ No newline at end of file diff --git a/Dockerfiles/build-pgsql/centos/build.sh b/Dockerfiles/build-pgsql/centos/build.sh deleted file mode 120000 index 46b20313..00000000 --- a/Dockerfiles/build-pgsql/centos/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../../build.sh \ No newline at end of file diff --git a/Dockerfiles/build-pgsql/centos/patches/chromedp_no_sandbox.patch b/Dockerfiles/build-pgsql/centos/patches/chromedp_no_sandbox.patch deleted file mode 100644 index c8a2e162..00000000 --- a/Dockerfiles/build-pgsql/centos/patches/chromedp_no_sandbox.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/src/go/cmd/zabbix_web_service/pdf_report_creator.go b/src/go/cmd/zabbix_web_service/pdf_report_creator.go -index afab41204d1..f1a9b859f34 100644 ---- a/src/go/cmd/zabbix_web_service/pdf_report_creator.go -+++ b/src/go/cmd/zabbix_web_service/pdf_report_creator.go -@@ -100,7 +100,11 @@ func (h *handler) report(w http.ResponseWriter, r *http.Request) { - return - } - -- opts := chromedp.DefaultExecAllocatorOptions[:] -+ opts := append(chromedp.DefaultExecAllocatorOptions[:], -+ chromedp.DisableGPU, -+ chromedp.NoSandbox, -+ chromedp.Flag("disable-setuid-sandbox", true), -+ ) - - if options.IgnoreURLCertErrors == 1 { - opts = append(opts, chromedp.Flag("ignore-certificate-errors", "1")) diff --git a/Dockerfiles/build-pgsql/ol/.dockerignore b/Dockerfiles/build-pgsql/ol/.dockerignore deleted file mode 100644 index 88a84e55..00000000 --- a/Dockerfiles/build-pgsql/ol/.dockerignore +++ /dev/null @@ -1 +0,0 @@ -build.sh diff --git a/Dockerfiles/build-pgsql/ol/Dockerfile b/Dockerfiles/build-pgsql/ol/Dockerfile deleted file mode 100644 index 46465daf..00000000 --- a/Dockerfiles/build-pgsql/ol/Dockerfile +++ /dev/null @@ -1,217 +0,0 @@ -# syntax=docker/dockerfile:1.6 -ARG MAJOR_VERSION=7.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.12 -ARG BUILD_BASE_IMAGE=zabbix-build-base:ol-${ZBX_VERSION} - -FROM ${BUILD_BASE_IMAGE} AS builder -ARG BUILD_JOBS - -ARG MAJOR_VERSION -ARG ZBX_VERSION -ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git -ARG GIT_BRANCH - -ARG ZBX_PLUGINS_VERSION=${GIT_BRANCH:-$ZBX_VERSION} -ARG CFLAGS -ARG LDFLAGS - -LABEL org.opencontainers.image.authors="Alexey Pustovalov " \ - org.opencontainers.image.description="Zabbix build base for PostgreSQL based images" \ - org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ - org.opencontainers.image.licenses="AGPL v3.0" \ - org.opencontainers.image.source="${ZBX_SOURCES}" \ - org.opencontainers.image.title="Zabbix build base (PostgreSQL)" \ - org.opencontainers.image.url="https://zabbix.com/" \ - org.opencontainers.image.vendor="Zabbix SIA" \ - org.opencontainers.image.version="${ZBX_VERSION}" - -ENV ZBX_SOURCES_DIR=/tmp/zabbix-${ZBX_VERSION} ZBX_OUTPUT_DIR=/tmp/zabbix-${ZBX_VERSION}-output \ - DB_TYPE=postgresql \ - CFLAGS=${CFLAGS:-"-O2 -fPIE -fstack-protector-strong -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -pipe"} \ - LDFLAGS=${LDFLAGS:-"-pie -Wl,-z,relro,-z,now,-z,defs -Wl,--as-needed"} \ - MONGODB_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/mongodb.git MONGODB_PLUGIN_VERSION=${ZBX_PLUGINS_VERSION} \ - POSTGRESQL_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/postgresql.git POSTGRESQL_PLUGIN_VERSION=${ZBX_PLUGINS_VERSION} \ - MSSQL_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/mssql.git MSSQL_PLUGIN_VERSION=${ZBX_PLUGINS_VERSION} \ - EMBER_PLUS_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/ember-plus.git EMBER_PLUS_PLUGIN_VERSION=${ZBX_PLUGINS_VERSION} \ - NVIDIA_GPU_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/nvidia-gpu.git NVIDIA_GPU_PLUGIN_VERSION=${ZBX_PLUGINS_VERSION} - -RUN --mount=from=sources,target=/tmp/src,ro \ - --mount=type=bind,source=patches/,target=/tmp/patches,ro \ - set -eux && \ - mkdir -p \ - ${ZBX_OUTPUT_DIR}/agent/sbin \ - ${ZBX_OUTPUT_DIR}/agent/conf \ - ${ZBX_OUTPUT_DIR}/agent2/sbin \ - ${ZBX_OUTPUT_DIR}/agent2/conf \ - ${ZBX_OUTPUT_DIR}/agent2/conf/zabbix_agent2.d/plugins.d \ - ${ZBX_OUTPUT_DIR}/proxy/sbin \ - ${ZBX_OUTPUT_DIR}/proxy/conf \ - ${ZBX_OUTPUT_DIR}/proxy/database/${DB_TYPE} \ - ${ZBX_OUTPUT_DIR}/server/sbin \ - ${ZBX_OUTPUT_DIR}/server/conf \ - ${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE} \ - ${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE}/option-patches/with-compression/ \ - ${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE}/option-patches/without-compression/ \ - ${ZBX_OUTPUT_DIR}/java_gateway/sbin/bin \ - ${ZBX_OUTPUT_DIR}/java_gateway/sbin/lib \ - ${ZBX_OUTPUT_DIR}/java_gateway/conf \ - ${ZBX_OUTPUT_DIR}/web_service/sbin \ - ${ZBX_OUTPUT_DIR}/web_service/conf \ - ${ZBX_OUTPUT_DIR}/web/conf \ - ${ZBX_OUTPUT_DIR}/general/sbin \ - ${ZBX_OUTPUT_DIR}/general/bin \ - ${ZBX_OUTPUT_DIR}/general/conf && \ - if [ -f /tmp/src/bootstrap.sh ]; then \ - mkdir -p "${ZBX_SOURCES_DIR}" && \ - cp -a /tmp/src/. "${ZBX_SOURCES_DIR}/"; \ - else \ - git -c advice.detachedHead=false clone \ - "${ZBX_SOURCES}" \ - --branch "${GIT_BRANCH:-$ZBX_VERSION}" \ - --depth 1 \ - --single-branch \ - "${ZBX_SOURCES_DIR}"; \ - fi && \ - cd "${ZBX_SOURCES_DIR}" && \ - for patch_filename in /tmp/patches/*.patch; do \ - [ -f "$patch_filename" ] || continue; \ - patch -p1 < "$patch_filename"; \ - done && \ - if git rev-parse --short HEAD >/dev/null 2>&1; then \ - zabbix_revision="$(git rev-parse --short HEAD)"; \ - else \ - zabbix_revision="unknown"; \ - fi && \ - sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" include/version.h && \ - sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" src/go/pkg/version/version.go && \ - sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java - -WORKDIR ${ZBX_SOURCES_DIR} - -RUN --mount=type=cache,target=/root/.cache/go-build \ - --mount=type=cache,target=/root/go/pkg/mod \ - --mount=from=config_templates,target=/tmp/conf,ro \ - set -eux && \ - cd "${ZBX_SOURCES_DIR}" && \ - ./bootstrap.sh && \ - ./configure \ - --datadir=/usr/lib \ - --libdir=/usr/lib/zabbix \ - --prefix=/usr \ - --sysconfdir=/etc/zabbix \ - --enable-ipv6 \ - --enable-agent \ - --enable-agent2 \ - --enable-java \ - --enable-proxy \ - --enable-server \ - --enable-webservice \ - --with-ares \ - --with-ldap \ - --with-libcurl \ - --with-libmodbus \ - --with-libpcre2 \ - --with-libxml2 \ - --with-${DB_TYPE} \ - --with-net-snmp \ - --with-openipmi \ - --with-openssl \ - --with-ssh \ - --with-unixodbc \ - --silent && \ - jobs="${BUILD_JOBS:-$(nproc)}" && \ - make -j"${jobs}" -s dbschema && \ - make -j"${jobs}" -s && \ - make -j"${jobs}" -s gettext && \ - cat "database/${DB_TYPE}/schema.sql" > "database/${DB_TYPE}/create.sql" && \ - gzip -c "database/${DB_TYPE}/create.sql" > "${ZBX_OUTPUT_DIR}/proxy/database/${DB_TYPE}/create.sql.gz" && \ - cat "database/${DB_TYPE}/images.sql" >> "database/${DB_TYPE}/create.sql" && \ - cat "database/${DB_TYPE}/data.sql" >> "database/${DB_TYPE}/create.sql" && \ - gzip -c "database/${DB_TYPE}/create.sql" > "${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE}/create.sql.gz" && \ - rm -f "database/${DB_TYPE}/create.sql" && \ - cp "database/${DB_TYPE}/timescaledb/schema.sql" "${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE}/timescaledb.sql" && \ - cp "${ZBX_SOURCES_DIR}/database/${DB_TYPE}/timescaledb/option-patches/with-compression/"*.sql "${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE}/option-patches/with-compression/" && \ - cp "${ZBX_SOURCES_DIR}/database/${DB_TYPE}/timescaledb/option-patches/without-compression/"*.sql "${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE}/option-patches/without-compression/" && \ - strip src/zabbix_agent/zabbix_agentd && \ - strip src/zabbix_server/zabbix_server && \ - strip src/zabbix_proxy/zabbix_proxy && \ - strip src/zabbix_get/zabbix_get && \ - strip src/zabbix_sender/zabbix_sender && \ - strip src/go/bin/zabbix_agent2 || true && \ - strip src/go/bin/zabbix_web_service || true && \ - mv src/zabbix_agent/zabbix_agentd "${ZBX_OUTPUT_DIR}/agent/sbin/" && \ - cp conf/zabbix_agentd.conf "${ZBX_OUTPUT_DIR}/agent/conf/zabbix_agentd.conf.dist" && \ - cp -a conf/zabbix_agentd/. "${ZBX_OUTPUT_DIR}/agent/conf/" && \ - cp -a /tmp/conf/agent/. "${ZBX_OUTPUT_DIR}/agent/conf/" && \ - mv src/go/bin/zabbix_agent2 "${ZBX_OUTPUT_DIR}/agent2/sbin/" && \ - cp src/go/conf/zabbix_agent2.conf "${ZBX_OUTPUT_DIR}/agent2/conf/zabbix_agent2.conf.dist" && \ - cp -a src/go/conf/zabbix_agent2.d/. "${ZBX_OUTPUT_DIR}/agent2/conf/zabbix_agent2.d/" && \ - cp -a /tmp/conf/agent2/. "${ZBX_OUTPUT_DIR}/agent2/conf/" && \ - mv src/zabbix_server/zabbix_server "${ZBX_OUTPUT_DIR}/server/sbin/" && \ - cp conf/zabbix_server.conf "${ZBX_OUTPUT_DIR}/server/conf/zabbix_server.conf.dist" && \ - cp -a /tmp/conf/server/. "${ZBX_OUTPUT_DIR}/server/conf/" && \ - mv src/zabbix_proxy/zabbix_proxy "${ZBX_OUTPUT_DIR}/proxy/sbin/" && \ - cp conf/zabbix_proxy.conf "${ZBX_OUTPUT_DIR}/proxy/conf/zabbix_proxy.conf.dist" && \ - cp -a /tmp/conf/proxy/. "${ZBX_OUTPUT_DIR}/proxy/conf/" && \ - cp -a src/zabbix_java/bin/. "${ZBX_OUTPUT_DIR}/java_gateway/sbin/bin/" && \ - cp -a src/zabbix_java/lib/*.jar "${ZBX_OUTPUT_DIR}/java_gateway/sbin/lib/" && \ - cp src/zabbix_java/lib/logback.xml "${ZBX_OUTPUT_DIR}/java_gateway/conf/logback.xml.dist" && \ - cp src/zabbix_java/lib/logback-console.xml "${ZBX_OUTPUT_DIR}/java_gateway/conf/logback-console.xml.dist" && \ - cp -a /tmp/conf/java-gateway/. "${ZBX_OUTPUT_DIR}/java_gateway/conf/" && \ - mv src/go/bin/zabbix_web_service "${ZBX_OUTPUT_DIR}/web_service/sbin/" && \ - cp src/go/conf/zabbix_web_service.conf "${ZBX_OUTPUT_DIR}/web_service/conf/zabbix_web_service.conf.dist" && \ - cp -a /tmp/conf/web_service/. "${ZBX_OUTPUT_DIR}/web_service/conf/" && \ - mv src/zabbix_get/zabbix_get "${ZBX_OUTPUT_DIR}/general/bin/" && \ - mv src/zabbix_sender/zabbix_sender "${ZBX_OUTPUT_DIR}/general/bin/" && \ - cp -a /tmp/conf/web/. "${ZBX_OUTPUT_DIR}/web/conf/" && \ - make -s distclean - -RUN set -eux && \ - cd "${ZBX_SOURCES_DIR}" && \ - curl --retry 5 --retry-all-errors --retry-delay 2 --tlsv1.2 -sSf -L \ - "https://raw.githubusercontent.com/notofonts/noto-cjk/main/Sans/OTF/Japanese/NotoSansCJKjp-Regular.otf" \ - -o ui/assets/fonts/NotoSansCJKjp-Regular.otf && \ - curl --retry 5 --retry-all-errors --retry-delay 2 --tlsv1.2 -sSf -L \ - "https://raw.githubusercontent.com/notofonts/noto-cjk/main/Sans/LICENSE" \ - -o ui/assets/fonts/OFL.txt && \ - sed -i -r 's/(define\(.*_FONT_NAME.*)DejaVuSans/\1NotoSansCJKjp-Regular/' ui/include/defines.inc.php && \ - sed -i -r 's/\.ttf/\.otf/' ui/include/graphs.inc.php && \ - rm -f ui/assets/fonts/DejaVuSans.ttf && \ - chmod o+r ui/assets/fonts/* - -RUN --mount=type=cache,target=/root/.cache/go-build \ - --mount=type=cache,target=/root/go/pkg/mod \ - set -eux && \ - mkdir -p "${ZBX_OUTPUT_DIR}/agent2/sbin/zabbix-agent2-plugin" && \ - mkdir -p "${ZBX_OUTPUT_DIR}/agent2/conf/zabbix_agent2.d/plugins.d" && \ - build_plugin() { \ - name="$1"; \ - repo="$2"; \ - version="$3"; \ - binary="$4"; \ - conf="$5"; \ - outname="$6"; \ - workdir="/tmp/${name}-plugin-${version}"; \ - rm -rf "$workdir"; \ - git -c advice.detachedHead=false clone "$repo" \ - --branch "$version" \ - --depth 1 \ - --single-branch \ - "$workdir"; \ - cd "$workdir"; \ - make; \ - strip "$binary" || true; \ - mv "$binary" "${ZBX_OUTPUT_DIR}/agent2/sbin/zabbix-agent2-plugin/${outname}"; \ - cp "$conf" "${ZBX_OUTPUT_DIR}/agent2/conf/zabbix_agent2.d/plugins.d/"; \ - make clean; \ - }; \ - build_plugin mongodb "${MONGODB_PLUGIN_SOURCES}" "${MONGODB_PLUGIN_VERSION}" \ - zabbix-agent2-plugin-mongodb mongodb.conf mongodb && \ - build_plugin postgresql "${POSTGRESQL_PLUGIN_SOURCES}" "${POSTGRESQL_PLUGIN_VERSION}" \ - zabbix-agent2-plugin-postgresql postgresql.conf postgresql && \ - build_plugin mssql "${MSSQL_PLUGIN_SOURCES}" "${MSSQL_PLUGIN_VERSION}" \ - zabbix-agent2-plugin-mssql mssql.conf mssql && \ - build_plugin ember "${EMBER_PLUS_PLUGIN_SOURCES}" "${EMBER_PLUS_PLUGIN_VERSION}" \ - zabbix-agent2-plugin-ember-plus ember.conf ember-plus && \ - build_plugin nvidia-gpu "${NVIDIA_GPU_PLUGIN_SOURCES}" "${NVIDIA_GPU_PLUGIN_VERSION}" \ - zabbix-agent2-plugin-nvidia-gpu nvidia.conf nvidia-gpu diff --git a/Dockerfiles/build-pgsql/ol/README.md b/Dockerfiles/build-pgsql/ol/README.md deleted file mode 120000 index 32d46ee8..00000000 --- a/Dockerfiles/build-pgsql/ol/README.md +++ /dev/null @@ -1 +0,0 @@ -../README.md \ No newline at end of file diff --git a/Dockerfiles/build-pgsql/ol/build.sh b/Dockerfiles/build-pgsql/ol/build.sh deleted file mode 120000 index 46b20313..00000000 --- a/Dockerfiles/build-pgsql/ol/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../../build.sh \ No newline at end of file diff --git a/Dockerfiles/build-pgsql/ol/patches/chromedp_no_sandbox.patch b/Dockerfiles/build-pgsql/ol/patches/chromedp_no_sandbox.patch deleted file mode 100644 index c8a2e162..00000000 --- a/Dockerfiles/build-pgsql/ol/patches/chromedp_no_sandbox.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/src/go/cmd/zabbix_web_service/pdf_report_creator.go b/src/go/cmd/zabbix_web_service/pdf_report_creator.go -index afab41204d1..f1a9b859f34 100644 ---- a/src/go/cmd/zabbix_web_service/pdf_report_creator.go -+++ b/src/go/cmd/zabbix_web_service/pdf_report_creator.go -@@ -100,7 +100,11 @@ func (h *handler) report(w http.ResponseWriter, r *http.Request) { - return - } - -- opts := chromedp.DefaultExecAllocatorOptions[:] -+ opts := append(chromedp.DefaultExecAllocatorOptions[:], -+ chromedp.DisableGPU, -+ chromedp.NoSandbox, -+ chromedp.Flag("disable-setuid-sandbox", true), -+ ) - - if options.IgnoreURLCertErrors == 1 { - opts = append(opts, chromedp.Flag("ignore-certificate-errors", "1")) diff --git a/Dockerfiles/build-pgsql/rhel/.dockerignore b/Dockerfiles/build-pgsql/rhel/.dockerignore deleted file mode 100644 index 88a84e55..00000000 --- a/Dockerfiles/build-pgsql/rhel/.dockerignore +++ /dev/null @@ -1 +0,0 @@ -build.sh diff --git a/Dockerfiles/build-pgsql/rhel/Dockerfile b/Dockerfiles/build-pgsql/rhel/Dockerfile deleted file mode 100644 index 04eea288..00000000 --- a/Dockerfiles/build-pgsql/rhel/Dockerfile +++ /dev/null @@ -1,228 +0,0 @@ -# syntax=docker/dockerfile:1.6 -ARG MAJOR_VERSION=7.4 -ARG RELEASE=12 -ARG ZBX_VERSION=${MAJOR_VERSION}.12 -ARG BUILD_BASE_IMAGE=zabbix-build-base:rhel-${ZBX_VERSION} - -FROM ${BUILD_BASE_IMAGE} AS builder -ARG BUILD_JOBS - -ARG MAJOR_VERSION -ARG RELEASE -ARG ZBX_VERSION -ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git -ARG GIT_BRANCH - -ARG ZBX_PLUGINS_VERSION=${GIT_BRANCH:-$ZBX_VERSION} -ARG CFLAGS -ARG LDFLAGS - -LABEL description="Zabbix build base for PostgreSQL based images" \ - maintainer="alexey.pustovalov@zabbix.com" \ - name="zabbix/zabbix-build-pgsql-74" \ - release="${RELEASE}" \ - summary="Zabbix build base (PostgreSQL)" \ - url="https://www.zabbix.com/" \ - vendor="Zabbix SIA" \ - version="${MAJOR_VERSION}" \ - io.k8s.description="Zabbix build base for PostgreSQL based images" \ - io.k8s.display-name="Zabbix build base (PostgreSQL)" \ - io.openshift.expose-services="" \ - io.openshift.tags="zabbix,build,pgsql" \ - org.label-schema.description="Zabbix build base for PostgreSQL based images" \ - org.label-schema.license="AGPL v3.0" \ - org.label-schema.name="zabbix-build-pgsql-rhel" \ - org.label-schema.url="https://zabbix.com/" \ - org.label-schema.vcs-ref="${VCS_REF}" \ - org.label-schema.vendor="Zabbix SIA" - -ENV ZBX_SOURCES_DIR=/tmp/zabbix-${ZBX_VERSION} ZBX_OUTPUT_DIR=/tmp/zabbix-${ZBX_VERSION}-output \ - DB_TYPE=postgresql \ - CFLAGS=${CFLAGS:-"-O2 -fPIE -fstack-protector-strong -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -pipe"} \ - LDFLAGS=${LDFLAGS:-"-pie -Wl,-z,relro,-z,now,-z,defs -Wl,--as-needed"} \ - MONGODB_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/mongodb.git MONGODB_PLUGIN_VERSION=${ZBX_PLUGINS_VERSION} \ - POSTGRESQL_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/postgresql.git POSTGRESQL_PLUGIN_VERSION=${ZBX_PLUGINS_VERSION} \ - MSSQL_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/mssql.git MSSQL_PLUGIN_VERSION=${ZBX_PLUGINS_VERSION} \ - EMBER_PLUS_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/ember-plus.git EMBER_PLUS_PLUGIN_VERSION=${ZBX_PLUGINS_VERSION} \ - NVIDIA_GPU_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/nvidia-gpu.git NVIDIA_GPU_PLUGIN_VERSION=${ZBX_PLUGINS_VERSION} - -RUN --mount=from=sources,target=/tmp/src,z \ - --mount=type=bind,source=patches/,target=/tmp/patches,z \ - set -eux && \ - mkdir -p \ - ${ZBX_OUTPUT_DIR}/agent/sbin \ - ${ZBX_OUTPUT_DIR}/agent/conf \ - ${ZBX_OUTPUT_DIR}/agent2/sbin \ - ${ZBX_OUTPUT_DIR}/agent2/conf \ - ${ZBX_OUTPUT_DIR}/agent2/conf/zabbix_agent2.d/plugins.d \ - ${ZBX_OUTPUT_DIR}/proxy/sbin \ - ${ZBX_OUTPUT_DIR}/proxy/conf \ - ${ZBX_OUTPUT_DIR}/proxy/database/${DB_TYPE} \ - ${ZBX_OUTPUT_DIR}/server/sbin \ - ${ZBX_OUTPUT_DIR}/server/conf \ - ${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE} \ - ${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE}/option-patches/with-compression/ \ - ${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE}/option-patches/without-compression/ \ - ${ZBX_OUTPUT_DIR}/java_gateway/sbin/bin \ - ${ZBX_OUTPUT_DIR}/java_gateway/sbin/lib \ - ${ZBX_OUTPUT_DIR}/java_gateway/conf \ - ${ZBX_OUTPUT_DIR}/web_service/sbin \ - ${ZBX_OUTPUT_DIR}/web_service/conf \ - ${ZBX_OUTPUT_DIR}/web/conf \ - ${ZBX_OUTPUT_DIR}/general/sbin \ - ${ZBX_OUTPUT_DIR}/general/bin \ - ${ZBX_OUTPUT_DIR}/general/conf && \ - if [ -f /tmp/src/bootstrap.sh ]; then \ - mkdir -p "${ZBX_SOURCES_DIR}" && \ - cp -a /tmp/src/. "${ZBX_SOURCES_DIR}/"; \ - else \ - git -c advice.detachedHead=false clone \ - "${ZBX_SOURCES}" \ - --branch "${GIT_BRANCH:-$ZBX_VERSION}" \ - --depth 1 \ - --single-branch \ - "${ZBX_SOURCES_DIR}"; \ - fi && \ - cd "${ZBX_SOURCES_DIR}" && \ - for patch_filename in /tmp/patches/*.patch; do \ - [ -f "$patch_filename" ] || continue; \ - patch -p1 < "$patch_filename"; \ - done && \ - if git rev-parse --short HEAD >/dev/null 2>&1; then \ - zabbix_revision="$(git rev-parse --short HEAD)"; \ - else \ - zabbix_revision="unknown"; \ - fi && \ - sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" include/version.h && \ - sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" src/go/pkg/version/version.go && \ - sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java - -WORKDIR ${ZBX_SOURCES_DIR} - -RUN --mount=type=cache,target=/root/.cache/go-build \ - --mount=type=cache,target=/root/go/pkg/mod \ - --mount=from=config_templates,target=/tmp/conf,z \ - set -eux && \ - cd "${ZBX_SOURCES_DIR}" && \ - ./bootstrap.sh && \ - ./configure \ - --datadir=/usr/lib \ - --libdir=/usr/lib/zabbix \ - --prefix=/usr \ - --sysconfdir=/etc/zabbix \ - --enable-ipv6 \ - --enable-agent \ - --enable-agent2 \ - --enable-java \ - --enable-proxy \ - --enable-server \ - --enable-webservice \ - --with-ares \ - --with-ldap \ - --with-libcurl \ - --with-libmodbus \ - --with-libpcre2 \ - --with-libxml2 \ - --with-${DB_TYPE} \ - --with-net-snmp \ - --with-openipmi \ - --with-openssl \ - --with-ssh \ - --with-unixodbc \ - --silent && \ - jobs="${BUILD_JOBS:-$(nproc)}" && \ - make -j"${jobs}" -s dbschema && \ - make -j"${jobs}" -s && \ - make -j"${jobs}" -s gettext && \ - cat "database/${DB_TYPE}/schema.sql" > "database/${DB_TYPE}/create.sql" && \ - gzip -c "database/${DB_TYPE}/create.sql" > "${ZBX_OUTPUT_DIR}/proxy/database/${DB_TYPE}/create.sql.gz" && \ - cat "database/${DB_TYPE}/images.sql" >> "database/${DB_TYPE}/create.sql" && \ - cat "database/${DB_TYPE}/data.sql" >> "database/${DB_TYPE}/create.sql" && \ - gzip -c "database/${DB_TYPE}/create.sql" > "${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE}/create.sql.gz" && \ - rm -f "database/${DB_TYPE}/create.sql" && \ - cp "database/${DB_TYPE}/timescaledb/schema.sql" "${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE}/timescaledb.sql" && \ - cp "${ZBX_SOURCES_DIR}/database/${DB_TYPE}/timescaledb/option-patches/with-compression/"*.sql "${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE}/option-patches/with-compression/" && \ - cp "${ZBX_SOURCES_DIR}/database/${DB_TYPE}/timescaledb/option-patches/without-compression/"*.sql "${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE}/option-patches/without-compression/" && \ - strip src/zabbix_agent/zabbix_agentd && \ - strip src/zabbix_server/zabbix_server && \ - strip src/zabbix_proxy/zabbix_proxy && \ - strip src/zabbix_get/zabbix_get && \ - strip src/zabbix_sender/zabbix_sender && \ - strip src/go/bin/zabbix_agent2 || true && \ - strip src/go/bin/zabbix_web_service || true && \ - mv src/zabbix_agent/zabbix_agentd "${ZBX_OUTPUT_DIR}/agent/sbin/" && \ - cp conf/zabbix_agentd.conf "${ZBX_OUTPUT_DIR}/agent/conf/zabbix_agentd.conf.dist" && \ - cp -a conf/zabbix_agentd/. "${ZBX_OUTPUT_DIR}/agent/conf/" && \ - cp -a /tmp/conf/agent/. "${ZBX_OUTPUT_DIR}/agent/conf/" && \ - mv src/go/bin/zabbix_agent2 "${ZBX_OUTPUT_DIR}/agent2/sbin/" && \ - cp src/go/conf/zabbix_agent2.conf "${ZBX_OUTPUT_DIR}/agent2/conf/zabbix_agent2.conf.dist" && \ - cp -a src/go/conf/zabbix_agent2.d/. "${ZBX_OUTPUT_DIR}/agent2/conf/zabbix_agent2.d/" && \ - cp -a /tmp/conf/agent2/. "${ZBX_OUTPUT_DIR}/agent2/conf/" && \ - mv src/zabbix_server/zabbix_server "${ZBX_OUTPUT_DIR}/server/sbin/" && \ - cp conf/zabbix_server.conf "${ZBX_OUTPUT_DIR}/server/conf/zabbix_server.conf.dist" && \ - cp -a /tmp/conf/server/. "${ZBX_OUTPUT_DIR}/server/conf/" && \ - mv src/zabbix_proxy/zabbix_proxy "${ZBX_OUTPUT_DIR}/proxy/sbin/" && \ - cp conf/zabbix_proxy.conf "${ZBX_OUTPUT_DIR}/proxy/conf/zabbix_proxy.conf.dist" && \ - cp -a /tmp/conf/proxy/. "${ZBX_OUTPUT_DIR}/proxy/conf/" && \ - cp -a src/zabbix_java/bin/. "${ZBX_OUTPUT_DIR}/java_gateway/sbin/bin/" && \ - cp -a src/zabbix_java/lib/*.jar "${ZBX_OUTPUT_DIR}/java_gateway/sbin/lib/" && \ - cp src/zabbix_java/lib/logback.xml "${ZBX_OUTPUT_DIR}/java_gateway/conf/logback.xml.dist" && \ - cp src/zabbix_java/lib/logback-console.xml "${ZBX_OUTPUT_DIR}/java_gateway/conf/logback-console.xml.dist" && \ - cp -a /tmp/conf/java-gateway/. "${ZBX_OUTPUT_DIR}/java_gateway/conf/" && \ - mv src/go/bin/zabbix_web_service "${ZBX_OUTPUT_DIR}/web_service/sbin/" && \ - cp src/go/conf/zabbix_web_service.conf "${ZBX_OUTPUT_DIR}/web_service/conf/zabbix_web_service.conf.dist" && \ - cp -a /tmp/conf/web_service/. "${ZBX_OUTPUT_DIR}/web_service/conf/" && \ - mv src/zabbix_get/zabbix_get "${ZBX_OUTPUT_DIR}/general/bin/" && \ - mv src/zabbix_sender/zabbix_sender "${ZBX_OUTPUT_DIR}/general/bin/" && \ - cp -a /tmp/conf/web/. "${ZBX_OUTPUT_DIR}/web/conf/" && \ - make -s distclean - -RUN set -eux && \ - cd "${ZBX_SOURCES_DIR}" && \ - curl --retry 5 --retry-all-errors --retry-delay 2 --tlsv1.2 -sSf -L \ - "https://raw.githubusercontent.com/notofonts/noto-cjk/main/Sans/OTF/Japanese/NotoSansCJKjp-Regular.otf" \ - -o ui/assets/fonts/NotoSansCJKjp-Regular.otf && \ - curl --retry 5 --retry-all-errors --retry-delay 2 --tlsv1.2 -sSf -L \ - "https://raw.githubusercontent.com/notofonts/noto-cjk/main/Sans/LICENSE" \ - -o ui/assets/fonts/OFL.txt && \ - sed -i -r 's/(define\(.*_FONT_NAME.*)DejaVuSans/\1NotoSansCJKjp-Regular/' ui/include/defines.inc.php && \ - sed -i -r 's/\.ttf/\.otf/' ui/include/graphs.inc.php && \ - rm -f ui/assets/fonts/DejaVuSans.ttf && \ - chmod o+r ui/assets/fonts/* - -RUN --mount=type=cache,target=/root/.cache/go-build \ - --mount=type=cache,target=/root/go/pkg/mod \ - set -eux && \ - mkdir -p "${ZBX_OUTPUT_DIR}/agent2/sbin/zabbix-agent2-plugin" && \ - mkdir -p "${ZBX_OUTPUT_DIR}/agent2/conf/zabbix_agent2.d/plugins.d" && \ - build_plugin() { \ - name="$1"; \ - repo="$2"; \ - version="$3"; \ - binary="$4"; \ - conf="$5"; \ - outname="$6"; \ - workdir="/tmp/${name}-plugin-${version}"; \ - rm -rf "$workdir"; \ - git -c advice.detachedHead=false clone "$repo" \ - --branch "$version" \ - --depth 1 \ - --single-branch \ - "$workdir"; \ - cd "$workdir"; \ - make; \ - strip "$binary" || true; \ - mv "$binary" "${ZBX_OUTPUT_DIR}/agent2/sbin/zabbix-agent2-plugin/${outname}"; \ - cp "$conf" "${ZBX_OUTPUT_DIR}/agent2/conf/zabbix_agent2.d/plugins.d/"; \ - make clean; \ - }; \ - build_plugin mongodb "${MONGODB_PLUGIN_SOURCES}" "${MONGODB_PLUGIN_VERSION}" \ - zabbix-agent2-plugin-mongodb mongodb.conf mongodb && \ - build_plugin postgresql "${POSTGRESQL_PLUGIN_SOURCES}" "${POSTGRESQL_PLUGIN_VERSION}" \ - zabbix-agent2-plugin-postgresql postgresql.conf postgresql && \ - build_plugin mssql "${MSSQL_PLUGIN_SOURCES}" "${MSSQL_PLUGIN_VERSION}" \ - zabbix-agent2-plugin-mssql mssql.conf mssql && \ - build_plugin ember "${EMBER_PLUS_PLUGIN_SOURCES}" "${EMBER_PLUS_PLUGIN_VERSION}" \ - zabbix-agent2-plugin-ember-plus ember.conf ember-plus && \ - build_plugin nvidia-gpu "${NVIDIA_GPU_PLUGIN_SOURCES}" "${NVIDIA_GPU_PLUGIN_VERSION}" \ - zabbix-agent2-plugin-nvidia-gpu nvidia.conf nvidia-gpu diff --git a/Dockerfiles/build-pgsql/rhel/README.md b/Dockerfiles/build-pgsql/rhel/README.md deleted file mode 120000 index 32d46ee8..00000000 --- a/Dockerfiles/build-pgsql/rhel/README.md +++ /dev/null @@ -1 +0,0 @@ -../README.md \ No newline at end of file diff --git a/Dockerfiles/build-pgsql/rhel/build.sh b/Dockerfiles/build-pgsql/rhel/build.sh deleted file mode 120000 index 46b20313..00000000 --- a/Dockerfiles/build-pgsql/rhel/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../../build.sh \ No newline at end of file diff --git a/Dockerfiles/build-pgsql/rhel/patches/chromedp_no_sandbox.patch b/Dockerfiles/build-pgsql/rhel/patches/chromedp_no_sandbox.patch deleted file mode 100644 index c8a2e162..00000000 --- a/Dockerfiles/build-pgsql/rhel/patches/chromedp_no_sandbox.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/src/go/cmd/zabbix_web_service/pdf_report_creator.go b/src/go/cmd/zabbix_web_service/pdf_report_creator.go -index afab41204d1..f1a9b859f34 100644 ---- a/src/go/cmd/zabbix_web_service/pdf_report_creator.go -+++ b/src/go/cmd/zabbix_web_service/pdf_report_creator.go -@@ -100,7 +100,11 @@ func (h *handler) report(w http.ResponseWriter, r *http.Request) { - return - } - -- opts := chromedp.DefaultExecAllocatorOptions[:] -+ opts := append(chromedp.DefaultExecAllocatorOptions[:], -+ chromedp.DisableGPU, -+ chromedp.NoSandbox, -+ chromedp.Flag("disable-setuid-sandbox", true), -+ ) - - if options.IgnoreURLCertErrors == 1 { - opts = append(opts, chromedp.Flag("ignore-certificate-errors", "1")) diff --git a/Dockerfiles/build-pgsql/ubuntu/.dockerignore b/Dockerfiles/build-pgsql/ubuntu/.dockerignore deleted file mode 100644 index 88a84e55..00000000 --- a/Dockerfiles/build-pgsql/ubuntu/.dockerignore +++ /dev/null @@ -1 +0,0 @@ -build.sh diff --git a/Dockerfiles/build-pgsql/ubuntu/Dockerfile b/Dockerfiles/build-pgsql/ubuntu/Dockerfile deleted file mode 100644 index b0581f37..00000000 --- a/Dockerfiles/build-pgsql/ubuntu/Dockerfile +++ /dev/null @@ -1,217 +0,0 @@ -# syntax=docker/dockerfile:1.6 -ARG MAJOR_VERSION=7.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.12 -ARG BUILD_BASE_IMAGE=zabbix-build-base:ubuntu-${ZBX_VERSION} - -FROM ${BUILD_BASE_IMAGE} AS builder -ARG BUILD_JOBS - -ARG MAJOR_VERSION -ARG ZBX_VERSION -ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git -ARG GIT_BRANCH - -ARG ZBX_PLUGINS_VERSION=${GIT_BRANCH:-$ZBX_VERSION} -ARG CFLAGS -ARG LDFLAGS - -LABEL org.opencontainers.image.authors="Alexey Pustovalov " \ - org.opencontainers.image.description="Zabbix build base for PostgreSQL based images" \ - org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ - org.opencontainers.image.licenses="AGPL v3.0" \ - org.opencontainers.image.source="${ZBX_SOURCES}" \ - org.opencontainers.image.title="Zabbix build base (PostgreSQL)" \ - org.opencontainers.image.url="https://zabbix.com/" \ - org.opencontainers.image.vendor="Zabbix SIA" \ - org.opencontainers.image.version="${ZBX_VERSION}" - -ENV ZBX_SOURCES_DIR=/tmp/zabbix-${ZBX_VERSION} ZBX_OUTPUT_DIR=/tmp/zabbix-${ZBX_VERSION}-output \ - DB_TYPE=postgresql \ - CFLAGS=${CFLAGS:-"-O2 -fPIE -fstack-protector-strong -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -pipe"} \ - LDFLAGS=${LDFLAGS:-"-pie -Wl,-z,relro,-z,now,-z,defs -Wl,--as-needed"} \ - MONGODB_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/mongodb.git MONGODB_PLUGIN_VERSION=${ZBX_PLUGINS_VERSION} \ - POSTGRESQL_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/postgresql.git POSTGRESQL_PLUGIN_VERSION=${ZBX_PLUGINS_VERSION} \ - MSSQL_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/mssql.git MSSQL_PLUGIN_VERSION=${ZBX_PLUGINS_VERSION} \ - EMBER_PLUS_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/ember-plus.git EMBER_PLUS_PLUGIN_VERSION=${ZBX_PLUGINS_VERSION} \ - NVIDIA_GPU_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/nvidia-gpu.git NVIDIA_GPU_PLUGIN_VERSION=${ZBX_PLUGINS_VERSION} - -RUN --mount=from=sources,target=/tmp/src,ro \ - --mount=type=bind,source=patches/,target=/tmp/patches,ro \ - set -eux && \ - mkdir -p \ - ${ZBX_OUTPUT_DIR}/agent/sbin \ - ${ZBX_OUTPUT_DIR}/agent/conf \ - ${ZBX_OUTPUT_DIR}/agent2/sbin \ - ${ZBX_OUTPUT_DIR}/agent2/conf \ - ${ZBX_OUTPUT_DIR}/agent2/conf/zabbix_agent2.d/plugins.d \ - ${ZBX_OUTPUT_DIR}/proxy/sbin \ - ${ZBX_OUTPUT_DIR}/proxy/conf \ - ${ZBX_OUTPUT_DIR}/proxy/database/${DB_TYPE} \ - ${ZBX_OUTPUT_DIR}/server/sbin \ - ${ZBX_OUTPUT_DIR}/server/conf \ - ${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE} \ - ${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE}/option-patches/with-compression/ \ - ${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE}/option-patches/without-compression/ \ - ${ZBX_OUTPUT_DIR}/java_gateway/sbin/bin \ - ${ZBX_OUTPUT_DIR}/java_gateway/sbin/lib \ - ${ZBX_OUTPUT_DIR}/java_gateway/conf \ - ${ZBX_OUTPUT_DIR}/web_service/sbin \ - ${ZBX_OUTPUT_DIR}/web_service/conf \ - ${ZBX_OUTPUT_DIR}/web/conf \ - ${ZBX_OUTPUT_DIR}/general/sbin \ - ${ZBX_OUTPUT_DIR}/general/bin \ - ${ZBX_OUTPUT_DIR}/general/conf && \ - if [ -f /tmp/src/bootstrap.sh ]; then \ - mkdir -p "${ZBX_SOURCES_DIR}" && \ - cp -a /tmp/src/. "${ZBX_SOURCES_DIR}/"; \ - else \ - git -c advice.detachedHead=false clone \ - "${ZBX_SOURCES}" \ - --branch "${GIT_BRANCH:-$ZBX_VERSION}" \ - --depth 1 \ - --single-branch \ - "${ZBX_SOURCES_DIR}"; \ - fi && \ - cd "${ZBX_SOURCES_DIR}" && \ - for patch_filename in /tmp/patches/*.patch; do \ - [ -f "$patch_filename" ] || continue; \ - patch -p1 < "$patch_filename"; \ - done && \ - if git rev-parse --short HEAD >/dev/null 2>&1; then \ - zabbix_revision="$(git rev-parse --short HEAD)"; \ - else \ - zabbix_revision="unknown"; \ - fi && \ - sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" include/version.h && \ - sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" src/go/pkg/version/version.go && \ - sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java - -WORKDIR ${ZBX_SOURCES_DIR} - -RUN --mount=type=cache,target=/root/.cache/go-build \ - --mount=type=cache,target=/root/go/pkg/mod \ - --mount=from=config_templates,target=/tmp/conf,ro \ - set -eux && \ - cd "${ZBX_SOURCES_DIR}" && \ - ./bootstrap.sh && \ - ./configure \ - --datadir=/usr/lib \ - --libdir=/usr/lib/zabbix \ - --prefix=/usr \ - --sysconfdir=/etc/zabbix \ - --enable-ipv6 \ - --enable-agent \ - --enable-agent2 \ - --enable-java \ - --enable-proxy \ - --enable-server \ - --enable-webservice \ - --with-ares \ - --with-ldap \ - --with-libcurl \ - --with-libmodbus \ - --with-libpcre2 \ - --with-libxml2 \ - --with-${DB_TYPE} \ - --with-net-snmp \ - --with-openipmi \ - --with-openssl \ - --with-ssh \ - --with-unixodbc \ - --silent && \ - jobs="${BUILD_JOBS:-$(nproc)}" && \ - make -j"${jobs}" -s dbschema && \ - make -j"${jobs}" -s && \ - make -j"${jobs}" -s gettext && \ - cat "database/${DB_TYPE}/schema.sql" > "database/${DB_TYPE}/create.sql" && \ - gzip -c "database/${DB_TYPE}/create.sql" > "${ZBX_OUTPUT_DIR}/proxy/database/${DB_TYPE}/create.sql.gz" && \ - cat "database/${DB_TYPE}/images.sql" >> "database/${DB_TYPE}/create.sql" && \ - cat "database/${DB_TYPE}/data.sql" >> "database/${DB_TYPE}/create.sql" && \ - gzip -c "database/${DB_TYPE}/create.sql" > "${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE}/create.sql.gz" && \ - rm -f "database/${DB_TYPE}/create.sql" && \ - cp "database/${DB_TYPE}/timescaledb/schema.sql" "${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE}/timescaledb.sql" && \ - cp "${ZBX_SOURCES_DIR}/database/${DB_TYPE}/timescaledb/option-patches/with-compression/"*.sql "${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE}/option-patches/with-compression/" && \ - cp "${ZBX_SOURCES_DIR}/database/${DB_TYPE}/timescaledb/option-patches/without-compression/"*.sql "${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE}/option-patches/without-compression/" && \ - strip src/zabbix_agent/zabbix_agentd && \ - strip src/zabbix_server/zabbix_server && \ - strip src/zabbix_proxy/zabbix_proxy && \ - strip src/zabbix_get/zabbix_get && \ - strip src/zabbix_sender/zabbix_sender && \ - strip src/go/bin/zabbix_agent2 || true && \ - strip src/go/bin/zabbix_web_service || true && \ - mv src/zabbix_agent/zabbix_agentd "${ZBX_OUTPUT_DIR}/agent/sbin/" && \ - cp conf/zabbix_agentd.conf "${ZBX_OUTPUT_DIR}/agent/conf/zabbix_agentd.conf.dist" && \ - cp -a conf/zabbix_agentd/. "${ZBX_OUTPUT_DIR}/agent/conf/" && \ - cp -a /tmp/conf/agent/. "${ZBX_OUTPUT_DIR}/agent/conf/" && \ - mv src/go/bin/zabbix_agent2 "${ZBX_OUTPUT_DIR}/agent2/sbin/" && \ - cp src/go/conf/zabbix_agent2.conf "${ZBX_OUTPUT_DIR}/agent2/conf/zabbix_agent2.conf.dist" && \ - cp -a src/go/conf/zabbix_agent2.d/. "${ZBX_OUTPUT_DIR}/agent2/conf/zabbix_agent2.d/" && \ - cp -a /tmp/conf/agent2/. "${ZBX_OUTPUT_DIR}/agent2/conf/" && \ - mv src/zabbix_server/zabbix_server "${ZBX_OUTPUT_DIR}/server/sbin/" && \ - cp conf/zabbix_server.conf "${ZBX_OUTPUT_DIR}/server/conf/zabbix_server.conf.dist" && \ - cp -a /tmp/conf/server/. "${ZBX_OUTPUT_DIR}/server/conf/" && \ - mv src/zabbix_proxy/zabbix_proxy "${ZBX_OUTPUT_DIR}/proxy/sbin/" && \ - cp conf/zabbix_proxy.conf "${ZBX_OUTPUT_DIR}/proxy/conf/zabbix_proxy.conf.dist" && \ - cp -a /tmp/conf/proxy/. "${ZBX_OUTPUT_DIR}/proxy/conf/" && \ - cp -a src/zabbix_java/bin/. "${ZBX_OUTPUT_DIR}/java_gateway/sbin/bin/" && \ - cp -a src/zabbix_java/lib/*.jar "${ZBX_OUTPUT_DIR}/java_gateway/sbin/lib/" && \ - cp src/zabbix_java/lib/logback.xml "${ZBX_OUTPUT_DIR}/java_gateway/conf/logback.xml.dist" && \ - cp src/zabbix_java/lib/logback-console.xml "${ZBX_OUTPUT_DIR}/java_gateway/conf/logback-console.xml.dist" && \ - cp -a /tmp/conf/java-gateway/. "${ZBX_OUTPUT_DIR}/java_gateway/conf/" && \ - mv src/go/bin/zabbix_web_service "${ZBX_OUTPUT_DIR}/web_service/sbin/" && \ - cp src/go/conf/zabbix_web_service.conf "${ZBX_OUTPUT_DIR}/web_service/conf/zabbix_web_service.conf.dist" && \ - cp -a /tmp/conf/web_service/. "${ZBX_OUTPUT_DIR}/web_service/conf/" && \ - mv src/zabbix_get/zabbix_get "${ZBX_OUTPUT_DIR}/general/bin/" && \ - mv src/zabbix_sender/zabbix_sender "${ZBX_OUTPUT_DIR}/general/bin/" && \ - cp -a /tmp/conf/web/. "${ZBX_OUTPUT_DIR}/web/conf/" && \ - make -s distclean - -RUN set -eux && \ - cd "${ZBX_SOURCES_DIR}" && \ - curl --retry 5 --retry-all-errors --retry-delay 2 --tlsv1.2 -sSf -L \ - "https://raw.githubusercontent.com/notofonts/noto-cjk/main/Sans/OTF/Japanese/NotoSansCJKjp-Regular.otf" \ - -o ui/assets/fonts/NotoSansCJKjp-Regular.otf && \ - curl --retry 5 --retry-all-errors --retry-delay 2 --tlsv1.2 -sSf -L \ - "https://raw.githubusercontent.com/notofonts/noto-cjk/main/Sans/LICENSE" \ - -o ui/assets/fonts/OFL.txt && \ - sed -i -r 's/(define\(.*_FONT_NAME.*)DejaVuSans/\1NotoSansCJKjp-Regular/' ui/include/defines.inc.php && \ - sed -i -r 's/\.ttf/\.otf/' ui/include/graphs.inc.php && \ - rm -f ui/assets/fonts/DejaVuSans.ttf && \ - chmod o+r ui/assets/fonts/* - -RUN --mount=type=cache,target=/root/.cache/go-build \ - --mount=type=cache,target=/root/go/pkg/mod \ - set -eux && \ - mkdir -p "${ZBX_OUTPUT_DIR}/agent2/sbin/zabbix-agent2-plugin" && \ - mkdir -p "${ZBX_OUTPUT_DIR}/agent2/conf/zabbix_agent2.d/plugins.d" && \ - build_plugin() { \ - name="$1"; \ - repo="$2"; \ - version="$3"; \ - binary="$4"; \ - conf="$5"; \ - outname="$6"; \ - workdir="/tmp/${name}-plugin-${version}"; \ - rm -rf "$workdir"; \ - git -c advice.detachedHead=false clone "$repo" \ - --branch "$version" \ - --depth 1 \ - --single-branch \ - "$workdir"; \ - cd "$workdir"; \ - make; \ - strip "$binary" || true; \ - mv "$binary" "${ZBX_OUTPUT_DIR}/agent2/sbin/zabbix-agent2-plugin/${outname}"; \ - cp "$conf" "${ZBX_OUTPUT_DIR}/agent2/conf/zabbix_agent2.d/plugins.d/"; \ - make clean; \ - }; \ - build_plugin mongodb "${MONGODB_PLUGIN_SOURCES}" "${MONGODB_PLUGIN_VERSION}" \ - zabbix-agent2-plugin-mongodb mongodb.conf mongodb && \ - build_plugin postgresql "${POSTGRESQL_PLUGIN_SOURCES}" "${POSTGRESQL_PLUGIN_VERSION}" \ - zabbix-agent2-plugin-postgresql postgresql.conf postgresql && \ - build_plugin mssql "${MSSQL_PLUGIN_SOURCES}" "${MSSQL_PLUGIN_VERSION}" \ - zabbix-agent2-plugin-mssql mssql.conf mssql && \ - build_plugin ember "${EMBER_PLUS_PLUGIN_SOURCES}" "${EMBER_PLUS_PLUGIN_VERSION}" \ - zabbix-agent2-plugin-ember-plus ember.conf ember-plus && \ - build_plugin nvidia-gpu "${NVIDIA_GPU_PLUGIN_SOURCES}" "${NVIDIA_GPU_PLUGIN_VERSION}" \ - zabbix-agent2-plugin-nvidia-gpu nvidia.conf nvidia-gpu diff --git a/Dockerfiles/build-pgsql/ubuntu/README.md b/Dockerfiles/build-pgsql/ubuntu/README.md deleted file mode 120000 index 32d46ee8..00000000 --- a/Dockerfiles/build-pgsql/ubuntu/README.md +++ /dev/null @@ -1 +0,0 @@ -../README.md \ No newline at end of file diff --git a/Dockerfiles/build-pgsql/ubuntu/build.sh b/Dockerfiles/build-pgsql/ubuntu/build.sh deleted file mode 120000 index 46b20313..00000000 --- a/Dockerfiles/build-pgsql/ubuntu/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../../build.sh \ No newline at end of file diff --git a/Dockerfiles/build-pgsql/ubuntu/patches/chromedp_no_sandbox.patch b/Dockerfiles/build-pgsql/ubuntu/patches/chromedp_no_sandbox.patch deleted file mode 100644 index c8a2e162..00000000 --- a/Dockerfiles/build-pgsql/ubuntu/patches/chromedp_no_sandbox.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/src/go/cmd/zabbix_web_service/pdf_report_creator.go b/src/go/cmd/zabbix_web_service/pdf_report_creator.go -index afab41204d1..f1a9b859f34 100644 ---- a/src/go/cmd/zabbix_web_service/pdf_report_creator.go -+++ b/src/go/cmd/zabbix_web_service/pdf_report_creator.go -@@ -100,7 +100,11 @@ func (h *handler) report(w http.ResponseWriter, r *http.Request) { - return - } - -- opts := chromedp.DefaultExecAllocatorOptions[:] -+ opts := append(chromedp.DefaultExecAllocatorOptions[:], -+ chromedp.DisableGPU, -+ chromedp.NoSandbox, -+ chromedp.Flag("disable-setuid-sandbox", true), -+ ) - - if options.IgnoreURLCertErrors == 1 { - opts = append(opts, chromedp.Flag("ignore-certificate-errors", "1")) diff --git a/Dockerfiles/build-sqlite3/README.md b/Dockerfiles/build-sqlite3/README.md deleted file mode 100644 index 022fdbcd..00000000 --- a/Dockerfiles/build-sqlite3/README.md +++ /dev/null @@ -1,88 +0,0 @@ -![logo](https://assets.zabbix.com/img/logo/zabbix_logo_500x131.png) - -# What is Zabbix? - -Zabbix is an enterprise-class open source distributed monitoring solution. - -Zabbix is software that monitors numerous parameters of a network and the health and integrity of servers. Zabbix uses a flexible notification mechanism that allows users to configure e-mail based alerts for virtually any event. This allows a fast reaction to server problems. Zabbix offers excellent reporting and data visualisation features based on the stored data. This makes Zabbix ideal for capacity planning. - -For more information and related downloads for Zabbix components, please visit https://hub.docker.com/u/zabbix/ and https://zabbix.com - -# What is Zabbix build base (SQLite3)? - -Zabbix build base (SQLite3) image is used for building Zabbix components. It contains compiled Zabbix components. - -# Zabbix build base (SQLite3) images - -These are the only official Zabbix build base (SQLite3) Docker images. They are based on Alpine Linux v3.24, Ubuntu 26.04 (resolute), CentOS Stream 10 and Oracle Linux 10 images. The available versions of the image are: - - Zabbix build base 6.0 (tags: alpine-6.0-latest, ubuntu-6.0-latest, ol-6.0-latest) - Zabbix build base 6.0.* (tags: alpine-6.0.*, ubuntu-6.0.*, ol-6.0.*) - Zabbix build base 7.0 (tags: alpine-7.0-latest, ubuntu-7.0-latest, ol-7.0-latest) - Zabbix build base 7.0.* (tags: alpine-7.0.*, ubuntu-7.0.*, ol-7.0.*) - Zabbix build base 7.2 (tags: alpine-7.2-latest, ubuntu-7.2-latest, ol-7.2-latest) - Zabbix build base 7.2.* (tags: alpine-7.2.*, ubuntu-7.2.*, ol-7.2.*) - Zabbix build base 7.4 (tags: alpine-7.4-latest, ubuntu-7.4-latest, ol-7.4-latest, alpine-latest, ubuntu-latest, ol-latest, latest) - Zabbix build base 7.4.* (tags: alpine-7.4.*, ubuntu-7.4.*, ol-7.4.*) - Zabbix build base 8.0 (tags: alpine-trunk, ubuntu-trunk, ol-trunk) - -Images are updated when new releases are published. The image with ``latest`` tag is based on Alpine Linux. - -# How to use this image - -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/7.4/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 -* zabbix-agent2 -* zabbix-proxy-sqlite3 -* zabbix-java-gateway - -# The image variants - -The `zabbix-build-sqlite3` images come in many flavors, each designed for a specific use case. - -## `zabbix-build-sqlite3:alpine-` - -This image is based on the popular [Alpine Linux project](http://alpinelinux.org), available in [the `alpine` official image](https://hub.docker.com/_/alpine). Alpine Linux is much smaller than most distribution base images (~5MB), and thus leads to much slimmer images in general. - -This variant is highly recommended when final image size being as small as possible is desired. The main caveat to note is that it does use [musl libc](http://www.musl-libc.org) instead of [glibc and friends](http://www.etalabs.net/compare_libcs.html), so certain software might run into issues depending on the depth of their libc requirements. However, most software doesn't have an issue with this, so this variant is usually a very safe choice. See [this Hacker News comment thread](https://news.ycombinator.com/item?id=10782897) for more discussion of the issues that might arise and some pro/con comparisons of using Alpine-based images. - -To minimize image size, it's uncommon for additional related tools (such as `git` or `bash`) to be included in Alpine-based images. Using this image as a base, add the things you need in your own Dockerfile (see the [`alpine` image description](https://hub.docker.com/_/alpine/) for examples of how to install packages if you are unfamiliar). - -## `zabbix-build-sqlite3:ubuntu-` - -This is the defacto image. If you are unsure about what your needs are, you probably want to use this one. It is designed to be used both as a throw away container (mount your source code and start the container to start your app), as well as the base to build other images off of. - -## `zabbix-build-sqlite3:ol-` - -Oracle Linux is an open-source operating system available under the GNU General Public License (GPLv2). Suitable for general purpose or Oracle workloads, it benefits from rigorous testing of more than 128,000 hours per day with real-world workloads and includes unique innovations such as Ksplice for zero-downtime kernel patching, DTrace for real-time diagnostics, the powerful Btrfs file system, and more. - -# User Feedback - -## Documentation - -Documentation for this image is stored in the [`build-sqlite3/` directory](https://github.com/zabbix/zabbix-docker/tree/7.4/Dockerfiles/build-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.4/README.md) before attempting a pull request. - -## Issues - -If you have any problems with or questions about this image, please contact us through a [GitHub issue](https://github.com/zabbix/zabbix-docker/issues). - -### Known issues - -## Contributing - -You are invited to contribute new features, fixes, or updates, large or small; we are always thrilled to receive pull requests, and do our best to process them as fast as we can. - -Before you start to code, we recommend discussing your plans through a [GitHub issue](https://github.com/zabbix/zabbix-docker/issues), especially for more ambitious contributions. This gives other contributors a chance to point you in the right direction, give you feedback on your design, and help you find out if someone else is working on the same thing. - -## License - -Starting from Zabbix version 7.0, all subsequent Zabbix versions will be released under the GNU Affero General Public License version 3 (AGPLv3). -You can modify the relevant version and propagate such modified version under the terms of the AGPLv3 as published by the Free Software Foundation. -For additional details, including answers to common questions about the AGPLv3, see the generic FAQ from the [Free Software Foundation](http://www.fsf.org/licenses/gpl-faq.html). - -Zabbix is Open Source Software, however, if you use Zabbix in a commercial context we kindly ask you to support the development of Zabbix by purchasing some level of technical support. -All previous Zabbix software versions up to 6.4 are released under the GNU General Public License version 2 (GPLv2). The formal terms of the GPLv2 and AGPLv3 can be found at http://www.fsf.org/licenses/. diff --git a/Dockerfiles/build-sqlite3/alpine/.dockerignore b/Dockerfiles/build-sqlite3/alpine/.dockerignore deleted file mode 100644 index 88a84e55..00000000 --- a/Dockerfiles/build-sqlite3/alpine/.dockerignore +++ /dev/null @@ -1 +0,0 @@ -build.sh diff --git a/Dockerfiles/build-sqlite3/alpine/Dockerfile b/Dockerfiles/build-sqlite3/alpine/Dockerfile deleted file mode 100644 index 681804d2..00000000 --- a/Dockerfiles/build-sqlite3/alpine/Dockerfile +++ /dev/null @@ -1,193 +0,0 @@ -# syntax=docker/dockerfile:1.6 -ARG MAJOR_VERSION=7.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.12 -ARG BUILD_BASE_IMAGE=zabbix-build-base:alpine-${ZBX_VERSION} - -FROM ${BUILD_BASE_IMAGE} AS builder -ARG BUILD_JOBS - -ARG MAJOR_VERSION -ARG ZBX_VERSION -ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git -ARG GIT_BRANCH - -ARG ZBX_PLUGINS_VERSION=${GIT_BRANCH:-$ZBX_VERSION} -ARG CFLAGS -ARG LDFLAGS - -LABEL org.opencontainers.image.authors="Alexey Pustovalov " \ - org.opencontainers.image.description="Zabbix build base for SQLite3 based images" \ - org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ - org.opencontainers.image.licenses="AGPL v3.0" \ - org.opencontainers.image.source="${ZBX_SOURCES}" \ - org.opencontainers.image.title="Zabbix build base (SQLite3)" \ - org.opencontainers.image.url="https://zabbix.com/" \ - org.opencontainers.image.vendor="Zabbix SIA" \ - org.opencontainers.image.version="${ZBX_VERSION}" - -ENV ZBX_SOURCES_DIR=/tmp/zabbix-${ZBX_VERSION} ZBX_OUTPUT_DIR=/tmp/zabbix-${ZBX_VERSION}-output \ - DB_TYPE=sqlite3 \ - CFLAGS=${CFLAGS:-"-O2 -fPIE -fstack-protector-strong -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -pipe"} \ - LDFLAGS=${LDFLAGS:-"-pie -Wl,-z,relro,-z,now,-z,defs -Wl,--as-needed"} \ - MONGODB_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/mongodb.git MONGODB_PLUGIN_VERSION=${ZBX_PLUGINS_VERSION} \ - POSTGRESQL_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/postgresql.git POSTGRESQL_PLUGIN_VERSION=${ZBX_PLUGINS_VERSION} \ - MSSQL_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/mssql.git MSSQL_PLUGIN_VERSION=${ZBX_PLUGINS_VERSION} \ - EMBER_PLUS_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/ember-plus.git EMBER_PLUS_PLUGIN_VERSION=${ZBX_PLUGINS_VERSION} \ - NVIDIA_GPU_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/nvidia-gpu.git NVIDIA_GPU_PLUGIN_VERSION=${ZBX_PLUGINS_VERSION} - -RUN --mount=from=sources,target=/tmp/src,ro \ - --mount=type=bind,source=patches/,target=/tmp/patches,ro \ - set -eux && \ - mkdir -p \ - ${ZBX_OUTPUT_DIR}/agent/sbin \ - ${ZBX_OUTPUT_DIR}/agent/conf \ - ${ZBX_OUTPUT_DIR}/agent2/sbin \ - ${ZBX_OUTPUT_DIR}/agent2/conf \ - ${ZBX_OUTPUT_DIR}/agent2/conf/zabbix_agent2.d/plugins.d \ - ${ZBX_OUTPUT_DIR}/proxy/sbin \ - ${ZBX_OUTPUT_DIR}/proxy/conf \ - ${ZBX_OUTPUT_DIR}/proxy/database/${DB_TYPE} \ - ${ZBX_OUTPUT_DIR}/java_gateway/sbin/bin \ - ${ZBX_OUTPUT_DIR}/java_gateway/sbin/lib \ - ${ZBX_OUTPUT_DIR}/java_gateway/conf \ - ${ZBX_OUTPUT_DIR}/web/conf \ - ${ZBX_OUTPUT_DIR}/general/sbin \ - ${ZBX_OUTPUT_DIR}/general/bin \ - ${ZBX_OUTPUT_DIR}/general/conf && \ - if [ -f /tmp/src/bootstrap.sh ]; then \ - mkdir -p "${ZBX_SOURCES_DIR}" && \ - cp -a /tmp/src/. "${ZBX_SOURCES_DIR}/"; \ - else \ - git -c advice.detachedHead=false clone \ - "${ZBX_SOURCES}" \ - --branch "${GIT_BRANCH:-$ZBX_VERSION}" \ - --depth 1 \ - --single-branch \ - "${ZBX_SOURCES_DIR}"; \ - fi && \ - cd "${ZBX_SOURCES_DIR}" && \ - for patch_filename in /tmp/patches/*.patch; do \ - [ -f "$patch_filename" ] || continue; \ - patch -p1 < "$patch_filename"; \ - done && \ - if git rev-parse --short HEAD >/dev/null 2>&1; then \ - zabbix_revision="$(git rev-parse --short HEAD)"; \ - else \ - zabbix_revision="unknown"; \ - fi && \ - sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" include/version.h && \ - sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" src/go/pkg/version/version.go && \ - sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java - -WORKDIR ${ZBX_SOURCES_DIR} - -RUN --mount=type=cache,target=/root/.cache/go-build \ - --mount=type=cache,target=/root/go/pkg/mod \ - --mount=from=config_templates,target=/tmp/conf,ro \ - set -eux && \ - cd "${ZBX_SOURCES_DIR}" && \ - ./bootstrap.sh && \ - ./configure \ - --datadir=/usr/lib \ - --libdir=/usr/lib/zabbix \ - --prefix=/usr \ - --sysconfdir=/etc/zabbix \ - --enable-ipv6 \ - --enable-agent \ - --enable-agent2 \ - --enable-java \ - --enable-proxy \ - --with-ares \ - --with-ldap \ - --with-libcurl \ - --with-libmodbus \ - --with-libpcre2 \ - --with-libxml2 \ - --with-${DB_TYPE} \ - --with-net-snmp \ - --with-openipmi \ - --with-openssl \ - --with-ssh \ - --with-unixodbc \ - --silent && \ - jobs="${BUILD_JOBS:-$(nproc)}" && \ - make -j"${jobs}" -s dbschema && \ - make -j"${jobs}" -s && \ - make -j"${jobs}" -s gettext && \ - cat "database/${DB_TYPE}/schema.sql" > "database/${DB_TYPE}/create.sql" && \ - gzip -c "database/${DB_TYPE}/create.sql" > "${ZBX_OUTPUT_DIR}/proxy/database/${DB_TYPE}/create.sql.gz" && \ - strip src/zabbix_agent/zabbix_agentd && \ - strip src/zabbix_proxy/zabbix_proxy && \ - strip src/zabbix_get/zabbix_get && \ - strip src/zabbix_sender/zabbix_sender && \ - strip src/go/bin/zabbix_agent2 || true && \ - mv src/zabbix_agent/zabbix_agentd "${ZBX_OUTPUT_DIR}/agent/sbin/" && \ - cp conf/zabbix_agentd.conf "${ZBX_OUTPUT_DIR}/agent/conf/zabbix_agentd.conf.dist" && \ - cp -a conf/zabbix_agentd/. "${ZBX_OUTPUT_DIR}/agent/conf/" && \ - cp -a /tmp/conf/agent/. "${ZBX_OUTPUT_DIR}/agent/conf/" && \ - mv src/go/bin/zabbix_agent2 "${ZBX_OUTPUT_DIR}/agent2/sbin/" && \ - cp src/go/conf/zabbix_agent2.conf "${ZBX_OUTPUT_DIR}/agent2/conf/zabbix_agent2.conf.dist" && \ - cp -a src/go/conf/zabbix_agent2.d/. "${ZBX_OUTPUT_DIR}/agent2/conf/zabbix_agent2.d/" && \ - cp -a /tmp/conf/agent2/. "${ZBX_OUTPUT_DIR}/agent2/conf/" && \ - mv src/zabbix_proxy/zabbix_proxy "${ZBX_OUTPUT_DIR}/proxy/sbin/" && \ - cp conf/zabbix_proxy.conf "${ZBX_OUTPUT_DIR}/proxy/conf/zabbix_proxy.conf.dist" && \ - cp -a /tmp/conf/proxy/. "${ZBX_OUTPUT_DIR}/proxy/conf/" && \ - cp -a src/zabbix_java/bin/. "${ZBX_OUTPUT_DIR}/java_gateway/sbin/bin/" && \ - cp -a src/zabbix_java/lib/*.jar "${ZBX_OUTPUT_DIR}/java_gateway/sbin/lib/" && \ - cp src/zabbix_java/lib/logback.xml "${ZBX_OUTPUT_DIR}/java_gateway/conf/logback.xml.dist" && \ - cp src/zabbix_java/lib/logback-console.xml "${ZBX_OUTPUT_DIR}/java_gateway/conf/logback-console.xml.dist" && \ - cp -a /tmp/conf/java-gateway/. "${ZBX_OUTPUT_DIR}/java_gateway/conf/" && \ - mv src/zabbix_get/zabbix_get "${ZBX_OUTPUT_DIR}/general/bin/" && \ - mv src/zabbix_sender/zabbix_sender "${ZBX_OUTPUT_DIR}/general/bin/" && \ - cp -a /tmp/conf/web/. "${ZBX_OUTPUT_DIR}/web/conf/" && \ - make -s distclean - -RUN set -eux && \ - cd "${ZBX_SOURCES_DIR}" && \ - curl --retry 5 --retry-all-errors --retry-delay 2 --tlsv1.2 -sSf -L \ - "https://raw.githubusercontent.com/notofonts/noto-cjk/main/Sans/OTF/Japanese/NotoSansCJKjp-Regular.otf" \ - -o ui/assets/fonts/NotoSansCJKjp-Regular.otf && \ - curl --retry 5 --retry-all-errors --retry-delay 2 --tlsv1.2 -sSf -L \ - "https://raw.githubusercontent.com/notofonts/noto-cjk/main/Sans/LICENSE" \ - -o ui/assets/fonts/OFL.txt && \ - sed -i -r 's/(define\(.*_FONT_NAME.*)DejaVuSans/\1NotoSansCJKjp-Regular/' ui/include/defines.inc.php && \ - sed -i -r 's/\.ttf/\.otf/' ui/include/graphs.inc.php && \ - rm -f ui/assets/fonts/DejaVuSans.ttf && \ - chmod o+r ui/assets/fonts/* - -RUN --mount=type=cache,target=/root/.cache/go-build \ - --mount=type=cache,target=/root/go/pkg/mod \ - set -eux && \ - mkdir -p "${ZBX_OUTPUT_DIR}/agent2/sbin/zabbix-agent2-plugin" && \ - mkdir -p "${ZBX_OUTPUT_DIR}/agent2/conf/zabbix_agent2.d/plugins.d" && \ - build_plugin() { \ - name="$1"; \ - repo="$2"; \ - version="$3"; \ - binary="$4"; \ - conf="$5"; \ - outname="$6"; \ - workdir="/tmp/${name}-plugin-${version}"; \ - rm -rf "$workdir"; \ - git -c advice.detachedHead=false clone "$repo" \ - --branch "$version" \ - --depth 1 \ - --single-branch \ - "$workdir"; \ - cd "$workdir"; \ - make; \ - strip "$binary" || true; \ - mv "$binary" "${ZBX_OUTPUT_DIR}/agent2/sbin/zabbix-agent2-plugin/${outname}"; \ - cp "$conf" "${ZBX_OUTPUT_DIR}/agent2/conf/zabbix_agent2.d/plugins.d/"; \ - make clean; \ - }; \ - build_plugin mongodb "${MONGODB_PLUGIN_SOURCES}" "${MONGODB_PLUGIN_VERSION}" \ - zabbix-agent2-plugin-mongodb mongodb.conf mongodb && \ - build_plugin postgresql "${POSTGRESQL_PLUGIN_SOURCES}" "${POSTGRESQL_PLUGIN_VERSION}" \ - zabbix-agent2-plugin-postgresql postgresql.conf postgresql && \ - build_plugin mssql "${MSSQL_PLUGIN_SOURCES}" "${MSSQL_PLUGIN_VERSION}" \ - zabbix-agent2-plugin-mssql mssql.conf mssql && \ - build_plugin ember "${EMBER_PLUS_PLUGIN_SOURCES}" "${EMBER_PLUS_PLUGIN_VERSION}" \ - zabbix-agent2-plugin-ember-plus ember.conf ember-plus && \ - build_plugin nvidia-gpu "${NVIDIA_GPU_PLUGIN_SOURCES}" "${NVIDIA_GPU_PLUGIN_VERSION}" \ - zabbix-agent2-plugin-nvidia-gpu nvidia.conf nvidia-gpu diff --git a/Dockerfiles/build-sqlite3/alpine/README.md b/Dockerfiles/build-sqlite3/alpine/README.md deleted file mode 120000 index 32d46ee8..00000000 --- a/Dockerfiles/build-sqlite3/alpine/README.md +++ /dev/null @@ -1 +0,0 @@ -../README.md \ No newline at end of file diff --git a/Dockerfiles/build-sqlite3/alpine/build.sh b/Dockerfiles/build-sqlite3/alpine/build.sh deleted file mode 120000 index 46b20313..00000000 --- a/Dockerfiles/build-sqlite3/alpine/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../../build.sh \ No newline at end of file diff --git a/Dockerfiles/build-sqlite3/alpine/patches/.gitkeep b/Dockerfiles/build-sqlite3/alpine/patches/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/Dockerfiles/build-sqlite3/centos/.dockerignore b/Dockerfiles/build-sqlite3/centos/.dockerignore deleted file mode 100644 index 88a84e55..00000000 --- a/Dockerfiles/build-sqlite3/centos/.dockerignore +++ /dev/null @@ -1 +0,0 @@ -build.sh diff --git a/Dockerfiles/build-sqlite3/centos/Dockerfile b/Dockerfiles/build-sqlite3/centos/Dockerfile deleted file mode 100644 index 0d1cb5d8..00000000 --- a/Dockerfiles/build-sqlite3/centos/Dockerfile +++ /dev/null @@ -1,193 +0,0 @@ -# syntax=docker/dockerfile:1.6 -ARG MAJOR_VERSION=7.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.12 -ARG BUILD_BASE_IMAGE=zabbix-build-base:centos-${ZBX_VERSION} - -FROM ${BUILD_BASE_IMAGE} AS builder -ARG BUILD_JOBS - -ARG MAJOR_VERSION -ARG ZBX_VERSION -ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git -ARG GIT_BRANCH - -ARG ZBX_PLUGINS_VERSION=${GIT_BRANCH:-$ZBX_VERSION} -ARG CFLAGS -ARG LDFLAGS - -LABEL org.opencontainers.image.authors="Alexey Pustovalov " \ - org.opencontainers.image.description="Zabbix build base for SQLite3 based images" \ - org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ - org.opencontainers.image.licenses="AGPL v3.0" \ - org.opencontainers.image.source="${ZBX_SOURCES}" \ - org.opencontainers.image.title="Zabbix build base (SQLite3)" \ - org.opencontainers.image.url="https://zabbix.com/" \ - org.opencontainers.image.vendor="Zabbix SIA" \ - org.opencontainers.image.version="${ZBX_VERSION}" - -ENV ZBX_SOURCES_DIR=/tmp/zabbix-${ZBX_VERSION} ZBX_OUTPUT_DIR=/tmp/zabbix-${ZBX_VERSION}-output \ - DB_TYPE=sqlite3 \ - CFLAGS=${CFLAGS:-"-O2 -fPIE -fstack-protector-strong -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -pipe"} \ - LDFLAGS=${LDFLAGS:-"-pie -Wl,-z,relro,-z,now,-z,defs -Wl,--as-needed"} \ - MONGODB_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/mongodb.git MONGODB_PLUGIN_VERSION=${ZBX_PLUGINS_VERSION} \ - POSTGRESQL_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/postgresql.git POSTGRESQL_PLUGIN_VERSION=${ZBX_PLUGINS_VERSION} \ - MSSQL_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/mssql.git MSSQL_PLUGIN_VERSION=${ZBX_PLUGINS_VERSION} \ - EMBER_PLUS_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/ember-plus.git EMBER_PLUS_PLUGIN_VERSION=${ZBX_PLUGINS_VERSION} \ - NVIDIA_GPU_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/nvidia-gpu.git NVIDIA_GPU_PLUGIN_VERSION=${ZBX_PLUGINS_VERSION} - -RUN --mount=from=sources,target=/tmp/src,ro \ - --mount=type=bind,source=patches/,target=/tmp/patches,ro \ - set -eux && \ - mkdir -p \ - ${ZBX_OUTPUT_DIR}/agent/sbin \ - ${ZBX_OUTPUT_DIR}/agent/conf \ - ${ZBX_OUTPUT_DIR}/agent2/sbin \ - ${ZBX_OUTPUT_DIR}/agent2/conf \ - ${ZBX_OUTPUT_DIR}/agent2/conf/zabbix_agent2.d/plugins.d \ - ${ZBX_OUTPUT_DIR}/proxy/sbin \ - ${ZBX_OUTPUT_DIR}/proxy/conf \ - ${ZBX_OUTPUT_DIR}/proxy/database/${DB_TYPE} \ - ${ZBX_OUTPUT_DIR}/java_gateway/sbin/bin \ - ${ZBX_OUTPUT_DIR}/java_gateway/sbin/lib \ - ${ZBX_OUTPUT_DIR}/java_gateway/conf \ - ${ZBX_OUTPUT_DIR}/web/conf \ - ${ZBX_OUTPUT_DIR}/general/sbin \ - ${ZBX_OUTPUT_DIR}/general/bin \ - ${ZBX_OUTPUT_DIR}/general/conf && \ - if [ -f /tmp/src/bootstrap.sh ]; then \ - mkdir -p "${ZBX_SOURCES_DIR}" && \ - cp -a /tmp/src/. "${ZBX_SOURCES_DIR}/"; \ - else \ - git -c advice.detachedHead=false clone \ - "${ZBX_SOURCES}" \ - --branch "${GIT_BRANCH:-$ZBX_VERSION}" \ - --depth 1 \ - --single-branch \ - "${ZBX_SOURCES_DIR}"; \ - fi && \ - cd "${ZBX_SOURCES_DIR}" && \ - for patch_filename in /tmp/patches/*.patch; do \ - [ -f "$patch_filename" ] || continue; \ - patch -p1 < "$patch_filename"; \ - done && \ - if git rev-parse --short HEAD >/dev/null 2>&1; then \ - zabbix_revision="$(git rev-parse --short HEAD)"; \ - else \ - zabbix_revision="unknown"; \ - fi && \ - sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" include/version.h && \ - sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" src/go/pkg/version/version.go && \ - sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java - -WORKDIR ${ZBX_SOURCES_DIR} - -RUN --mount=type=cache,target=/root/.cache/go-build \ - --mount=type=cache,target=/root/go/pkg/mod \ - --mount=from=config_templates,target=/tmp/conf,ro \ - set -eux && \ - cd "${ZBX_SOURCES_DIR}" && \ - ./bootstrap.sh && \ - ./configure \ - --datadir=/usr/lib \ - --libdir=/usr/lib/zabbix \ - --prefix=/usr \ - --sysconfdir=/etc/zabbix \ - --enable-ipv6 \ - --enable-agent \ - --enable-agent2 \ - --enable-java \ - --enable-proxy \ - --with-ares \ - --with-ldap \ - --with-libcurl \ - --with-libmodbus \ - --with-libpcre2 \ - --with-libxml2 \ - --with-${DB_TYPE} \ - --with-net-snmp \ - --with-openipmi \ - --with-openssl \ - --with-ssh \ - --with-unixodbc \ - --silent && \ - jobs="${BUILD_JOBS:-$(nproc)}" && \ - make -j"${jobs}" -s dbschema && \ - make -j"${jobs}" -s && \ - make -j"${jobs}" -s gettext && \ - cat "database/${DB_TYPE}/schema.sql" > "database/${DB_TYPE}/create.sql" && \ - gzip -c "database/${DB_TYPE}/create.sql" > "${ZBX_OUTPUT_DIR}/proxy/database/${DB_TYPE}/create.sql.gz" && \ - strip src/zabbix_agent/zabbix_agentd && \ - strip src/zabbix_proxy/zabbix_proxy && \ - strip src/zabbix_get/zabbix_get && \ - strip src/zabbix_sender/zabbix_sender && \ - strip src/go/bin/zabbix_agent2 || true && \ - mv src/zabbix_agent/zabbix_agentd "${ZBX_OUTPUT_DIR}/agent/sbin/" && \ - cp conf/zabbix_agentd.conf "${ZBX_OUTPUT_DIR}/agent/conf/zabbix_agentd.conf.dist" && \ - cp -a conf/zabbix_agentd/. "${ZBX_OUTPUT_DIR}/agent/conf/" && \ - cp -a /tmp/conf/agent/. "${ZBX_OUTPUT_DIR}/agent/conf/" && \ - mv src/go/bin/zabbix_agent2 "${ZBX_OUTPUT_DIR}/agent2/sbin/" && \ - cp src/go/conf/zabbix_agent2.conf "${ZBX_OUTPUT_DIR}/agent2/conf/zabbix_agent2.conf.dist" && \ - cp -a src/go/conf/zabbix_agent2.d/. "${ZBX_OUTPUT_DIR}/agent2/conf/zabbix_agent2.d/" && \ - cp -a /tmp/conf/agent2/. "${ZBX_OUTPUT_DIR}/agent2/conf/" && \ - mv src/zabbix_proxy/zabbix_proxy "${ZBX_OUTPUT_DIR}/proxy/sbin/" && \ - cp conf/zabbix_proxy.conf "${ZBX_OUTPUT_DIR}/proxy/conf/zabbix_proxy.conf.dist" && \ - cp -a /tmp/conf/proxy/. "${ZBX_OUTPUT_DIR}/proxy/conf/" && \ - cp -a src/zabbix_java/bin/. "${ZBX_OUTPUT_DIR}/java_gateway/sbin/bin/" && \ - cp -a src/zabbix_java/lib/*.jar "${ZBX_OUTPUT_DIR}/java_gateway/sbin/lib/" && \ - cp src/zabbix_java/lib/logback.xml "${ZBX_OUTPUT_DIR}/java_gateway/conf/logback.xml.dist" && \ - cp src/zabbix_java/lib/logback-console.xml "${ZBX_OUTPUT_DIR}/java_gateway/conf/logback-console.xml.dist" && \ - cp -a /tmp/conf/java-gateway/. "${ZBX_OUTPUT_DIR}/java_gateway/conf/" && \ - mv src/zabbix_get/zabbix_get "${ZBX_OUTPUT_DIR}/general/bin/" && \ - mv src/zabbix_sender/zabbix_sender "${ZBX_OUTPUT_DIR}/general/bin/" && \ - cp -a /tmp/conf/web/. "${ZBX_OUTPUT_DIR}/web/conf/" && \ - make -s distclean - -RUN set -eux && \ - cd "${ZBX_SOURCES_DIR}" && \ - curl --retry 5 --retry-all-errors --retry-delay 2 --tlsv1.2 -sSf -L \ - "https://raw.githubusercontent.com/notofonts/noto-cjk/main/Sans/OTF/Japanese/NotoSansCJKjp-Regular.otf" \ - -o ui/assets/fonts/NotoSansCJKjp-Regular.otf && \ - curl --retry 5 --retry-all-errors --retry-delay 2 --tlsv1.2 -sSf -L \ - "https://raw.githubusercontent.com/notofonts/noto-cjk/main/Sans/LICENSE" \ - -o ui/assets/fonts/OFL.txt && \ - sed -i -r 's/(define\(.*_FONT_NAME.*)DejaVuSans/\1NotoSansCJKjp-Regular/' ui/include/defines.inc.php && \ - sed -i -r 's/\.ttf/\.otf/' ui/include/graphs.inc.php && \ - rm -f ui/assets/fonts/DejaVuSans.ttf && \ - chmod o+r ui/assets/fonts/* - -RUN --mount=type=cache,target=/root/.cache/go-build \ - --mount=type=cache,target=/root/go/pkg/mod \ - set -eux && \ - mkdir -p "${ZBX_OUTPUT_DIR}/agent2/sbin/zabbix-agent2-plugin" && \ - mkdir -p "${ZBX_OUTPUT_DIR}/agent2/conf/zabbix_agent2.d/plugins.d" && \ - build_plugin() { \ - name="$1"; \ - repo="$2"; \ - version="$3"; \ - binary="$4"; \ - conf="$5"; \ - outname="$6"; \ - workdir="/tmp/${name}-plugin-${version}"; \ - rm -rf "$workdir"; \ - git -c advice.detachedHead=false clone "$repo" \ - --branch "$version" \ - --depth 1 \ - --single-branch \ - "$workdir"; \ - cd "$workdir"; \ - make; \ - strip "$binary" || true; \ - mv "$binary" "${ZBX_OUTPUT_DIR}/agent2/sbin/zabbix-agent2-plugin/${outname}"; \ - cp "$conf" "${ZBX_OUTPUT_DIR}/agent2/conf/zabbix_agent2.d/plugins.d/"; \ - make clean; \ - }; \ - build_plugin mongodb "${MONGODB_PLUGIN_SOURCES}" "${MONGODB_PLUGIN_VERSION}" \ - zabbix-agent2-plugin-mongodb mongodb.conf mongodb && \ - build_plugin postgresql "${POSTGRESQL_PLUGIN_SOURCES}" "${POSTGRESQL_PLUGIN_VERSION}" \ - zabbix-agent2-plugin-postgresql postgresql.conf postgresql && \ - build_plugin mssql "${MSSQL_PLUGIN_SOURCES}" "${MSSQL_PLUGIN_VERSION}" \ - zabbix-agent2-plugin-mssql mssql.conf mssql && \ - build_plugin ember "${EMBER_PLUS_PLUGIN_SOURCES}" "${EMBER_PLUS_PLUGIN_VERSION}" \ - zabbix-agent2-plugin-ember-plus ember.conf ember-plus && \ - build_plugin nvidia-gpu "${NVIDIA_GPU_PLUGIN_SOURCES}" "${NVIDIA_GPU_PLUGIN_VERSION}" \ - zabbix-agent2-plugin-nvidia-gpu nvidia.conf nvidia-gpu diff --git a/Dockerfiles/build-sqlite3/centos/README.md b/Dockerfiles/build-sqlite3/centos/README.md deleted file mode 120000 index 32d46ee8..00000000 --- a/Dockerfiles/build-sqlite3/centos/README.md +++ /dev/null @@ -1 +0,0 @@ -../README.md \ No newline at end of file diff --git a/Dockerfiles/build-sqlite3/centos/build.sh b/Dockerfiles/build-sqlite3/centos/build.sh deleted file mode 120000 index 46b20313..00000000 --- a/Dockerfiles/build-sqlite3/centos/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../../build.sh \ No newline at end of file diff --git a/Dockerfiles/build-sqlite3/centos/patches/.gitkeep b/Dockerfiles/build-sqlite3/centos/patches/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/Dockerfiles/build-sqlite3/ol/.dockerignore b/Dockerfiles/build-sqlite3/ol/.dockerignore deleted file mode 100644 index 88a84e55..00000000 --- a/Dockerfiles/build-sqlite3/ol/.dockerignore +++ /dev/null @@ -1 +0,0 @@ -build.sh diff --git a/Dockerfiles/build-sqlite3/ol/Dockerfile b/Dockerfiles/build-sqlite3/ol/Dockerfile deleted file mode 100644 index 1ca5e6dc..00000000 --- a/Dockerfiles/build-sqlite3/ol/Dockerfile +++ /dev/null @@ -1,193 +0,0 @@ -# syntax=docker/dockerfile:1.6 -ARG MAJOR_VERSION=7.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.12 -ARG BUILD_BASE_IMAGE=zabbix-build-base:ol-${ZBX_VERSION} - -FROM ${BUILD_BASE_IMAGE} AS builder -ARG BUILD_JOBS - -ARG MAJOR_VERSION -ARG ZBX_VERSION -ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git -ARG GIT_BRANCH - -ARG ZBX_PLUGINS_VERSION=${GIT_BRANCH:-$ZBX_VERSION} -ARG CFLAGS -ARG LDFLAGS - -LABEL org.opencontainers.image.authors="Alexey Pustovalov " \ - org.opencontainers.image.description="Zabbix build base for SQLite3 based images" \ - org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ - org.opencontainers.image.licenses="AGPL v3.0" \ - org.opencontainers.image.source="${ZBX_SOURCES}" \ - org.opencontainers.image.title="Zabbix build base (SQLite3)" \ - org.opencontainers.image.url="https://zabbix.com/" \ - org.opencontainers.image.vendor="Zabbix SIA" \ - org.opencontainers.image.version="${ZBX_VERSION}" - -ENV ZBX_SOURCES_DIR=/tmp/zabbix-${ZBX_VERSION} ZBX_OUTPUT_DIR=/tmp/zabbix-${ZBX_VERSION}-output \ - DB_TYPE=sqlite3 \ - CFLAGS=${CFLAGS:-"-O2 -fPIE -fstack-protector-strong -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -pipe"} \ - LDFLAGS=${LDFLAGS:-"-pie -Wl,-z,relro,-z,now,-z,defs -Wl,--as-needed"} \ - MONGODB_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/mongodb.git MONGODB_PLUGIN_VERSION=${ZBX_PLUGINS_VERSION} \ - POSTGRESQL_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/postgresql.git POSTGRESQL_PLUGIN_VERSION=${ZBX_PLUGINS_VERSION} \ - MSSQL_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/mssql.git MSSQL_PLUGIN_VERSION=${ZBX_PLUGINS_VERSION} \ - EMBER_PLUS_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/ember-plus.git EMBER_PLUS_PLUGIN_VERSION=${ZBX_PLUGINS_VERSION} \ - NVIDIA_GPU_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/nvidia-gpu.git NVIDIA_GPU_PLUGIN_VERSION=${ZBX_PLUGINS_VERSION} - -RUN --mount=from=sources,target=/tmp/src,ro \ - --mount=type=bind,source=patches/,target=/tmp/patches,ro \ - set -eux && \ - mkdir -p \ - ${ZBX_OUTPUT_DIR}/agent/sbin \ - ${ZBX_OUTPUT_DIR}/agent/conf \ - ${ZBX_OUTPUT_DIR}/agent2/sbin \ - ${ZBX_OUTPUT_DIR}/agent2/conf \ - ${ZBX_OUTPUT_DIR}/agent2/conf/zabbix_agent2.d/plugins.d \ - ${ZBX_OUTPUT_DIR}/proxy/sbin \ - ${ZBX_OUTPUT_DIR}/proxy/conf \ - ${ZBX_OUTPUT_DIR}/proxy/database/${DB_TYPE} \ - ${ZBX_OUTPUT_DIR}/java_gateway/sbin/bin \ - ${ZBX_OUTPUT_DIR}/java_gateway/sbin/lib \ - ${ZBX_OUTPUT_DIR}/java_gateway/conf \ - ${ZBX_OUTPUT_DIR}/web/conf \ - ${ZBX_OUTPUT_DIR}/general/sbin \ - ${ZBX_OUTPUT_DIR}/general/bin \ - ${ZBX_OUTPUT_DIR}/general/conf && \ - if [ -f /tmp/src/bootstrap.sh ]; then \ - mkdir -p "${ZBX_SOURCES_DIR}" && \ - cp -a /tmp/src/. "${ZBX_SOURCES_DIR}/"; \ - else \ - git -c advice.detachedHead=false clone \ - "${ZBX_SOURCES}" \ - --branch "${GIT_BRANCH:-$ZBX_VERSION}" \ - --depth 1 \ - --single-branch \ - "${ZBX_SOURCES_DIR}"; \ - fi && \ - cd "${ZBX_SOURCES_DIR}" && \ - for patch_filename in /tmp/patches/*.patch; do \ - [ -f "$patch_filename" ] || continue; \ - patch -p1 < "$patch_filename"; \ - done && \ - if git rev-parse --short HEAD >/dev/null 2>&1; then \ - zabbix_revision="$(git rev-parse --short HEAD)"; \ - else \ - zabbix_revision="unknown"; \ - fi && \ - sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" include/version.h && \ - sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" src/go/pkg/version/version.go && \ - sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java - -WORKDIR ${ZBX_SOURCES_DIR} - -RUN --mount=type=cache,target=/root/.cache/go-build \ - --mount=type=cache,target=/root/go/pkg/mod \ - --mount=from=config_templates,target=/tmp/conf,ro \ - set -eux && \ - cd "${ZBX_SOURCES_DIR}" && \ - ./bootstrap.sh && \ - ./configure \ - --datadir=/usr/lib \ - --libdir=/usr/lib/zabbix \ - --prefix=/usr \ - --sysconfdir=/etc/zabbix \ - --enable-ipv6 \ - --enable-agent \ - --enable-agent2 \ - --enable-java \ - --enable-proxy \ - --with-ares \ - --with-ldap \ - --with-libcurl \ - --with-libmodbus \ - --with-libpcre2 \ - --with-libxml2 \ - --with-${DB_TYPE} \ - --with-net-snmp \ - --with-openipmi \ - --with-openssl \ - --with-ssh \ - --with-unixodbc \ - --silent && \ - jobs="${BUILD_JOBS:-$(nproc)}" && \ - make -j"${jobs}" -s dbschema && \ - make -j"${jobs}" -s && \ - make -j"${jobs}" -s gettext && \ - cat "database/${DB_TYPE}/schema.sql" > "database/${DB_TYPE}/create.sql" && \ - gzip -c "database/${DB_TYPE}/create.sql" > "${ZBX_OUTPUT_DIR}/proxy/database/${DB_TYPE}/create.sql.gz" && \ - strip src/zabbix_agent/zabbix_agentd && \ - strip src/zabbix_proxy/zabbix_proxy && \ - strip src/zabbix_get/zabbix_get && \ - strip src/zabbix_sender/zabbix_sender && \ - strip src/go/bin/zabbix_agent2 || true && \ - mv src/zabbix_agent/zabbix_agentd "${ZBX_OUTPUT_DIR}/agent/sbin/" && \ - cp conf/zabbix_agentd.conf "${ZBX_OUTPUT_DIR}/agent/conf/zabbix_agentd.conf.dist" && \ - cp -a conf/zabbix_agentd/. "${ZBX_OUTPUT_DIR}/agent/conf/" && \ - cp -a /tmp/conf/agent/. "${ZBX_OUTPUT_DIR}/agent/conf/" && \ - mv src/go/bin/zabbix_agent2 "${ZBX_OUTPUT_DIR}/agent2/sbin/" && \ - cp src/go/conf/zabbix_agent2.conf "${ZBX_OUTPUT_DIR}/agent2/conf/zabbix_agent2.conf.dist" && \ - cp -a src/go/conf/zabbix_agent2.d/. "${ZBX_OUTPUT_DIR}/agent2/conf/zabbix_agent2.d/" && \ - cp -a /tmp/conf/agent2/. "${ZBX_OUTPUT_DIR}/agent2/conf/" && \ - mv src/zabbix_proxy/zabbix_proxy "${ZBX_OUTPUT_DIR}/proxy/sbin/" && \ - cp conf/zabbix_proxy.conf "${ZBX_OUTPUT_DIR}/proxy/conf/zabbix_proxy.conf.dist" && \ - cp -a /tmp/conf/proxy/. "${ZBX_OUTPUT_DIR}/proxy/conf/" && \ - cp -a src/zabbix_java/bin/. "${ZBX_OUTPUT_DIR}/java_gateway/sbin/bin/" && \ - cp -a src/zabbix_java/lib/*.jar "${ZBX_OUTPUT_DIR}/java_gateway/sbin/lib/" && \ - cp src/zabbix_java/lib/logback.xml "${ZBX_OUTPUT_DIR}/java_gateway/conf/logback.xml.dist" && \ - cp src/zabbix_java/lib/logback-console.xml "${ZBX_OUTPUT_DIR}/java_gateway/conf/logback-console.xml.dist" && \ - cp -a /tmp/conf/java-gateway/. "${ZBX_OUTPUT_DIR}/java_gateway/conf/" && \ - mv src/zabbix_get/zabbix_get "${ZBX_OUTPUT_DIR}/general/bin/" && \ - mv src/zabbix_sender/zabbix_sender "${ZBX_OUTPUT_DIR}/general/bin/" && \ - cp -a /tmp/conf/web/. "${ZBX_OUTPUT_DIR}/web/conf/" && \ - make -s distclean - -RUN set -eux && \ - cd "${ZBX_SOURCES_DIR}" && \ - curl --retry 5 --retry-all-errors --retry-delay 2 --tlsv1.2 -sSf -L \ - "https://raw.githubusercontent.com/notofonts/noto-cjk/main/Sans/OTF/Japanese/NotoSansCJKjp-Regular.otf" \ - -o ui/assets/fonts/NotoSansCJKjp-Regular.otf && \ - curl --retry 5 --retry-all-errors --retry-delay 2 --tlsv1.2 -sSf -L \ - "https://raw.githubusercontent.com/notofonts/noto-cjk/main/Sans/LICENSE" \ - -o ui/assets/fonts/OFL.txt && \ - sed -i -r 's/(define\(.*_FONT_NAME.*)DejaVuSans/\1NotoSansCJKjp-Regular/' ui/include/defines.inc.php && \ - sed -i -r 's/\.ttf/\.otf/' ui/include/graphs.inc.php && \ - rm -f ui/assets/fonts/DejaVuSans.ttf && \ - chmod o+r ui/assets/fonts/* - -RUN --mount=type=cache,target=/root/.cache/go-build \ - --mount=type=cache,target=/root/go/pkg/mod \ - set -eux && \ - mkdir -p "${ZBX_OUTPUT_DIR}/agent2/sbin/zabbix-agent2-plugin" && \ - mkdir -p "${ZBX_OUTPUT_DIR}/agent2/conf/zabbix_agent2.d/plugins.d" && \ - build_plugin() { \ - name="$1"; \ - repo="$2"; \ - version="$3"; \ - binary="$4"; \ - conf="$5"; \ - outname="$6"; \ - workdir="/tmp/${name}-plugin-${version}"; \ - rm -rf "$workdir"; \ - git -c advice.detachedHead=false clone "$repo" \ - --branch "$version" \ - --depth 1 \ - --single-branch \ - "$workdir"; \ - cd "$workdir"; \ - make; \ - strip "$binary" || true; \ - mv "$binary" "${ZBX_OUTPUT_DIR}/agent2/sbin/zabbix-agent2-plugin/${outname}"; \ - cp "$conf" "${ZBX_OUTPUT_DIR}/agent2/conf/zabbix_agent2.d/plugins.d/"; \ - make clean; \ - }; \ - build_plugin mongodb "${MONGODB_PLUGIN_SOURCES}" "${MONGODB_PLUGIN_VERSION}" \ - zabbix-agent2-plugin-mongodb mongodb.conf mongodb && \ - build_plugin postgresql "${POSTGRESQL_PLUGIN_SOURCES}" "${POSTGRESQL_PLUGIN_VERSION}" \ - zabbix-agent2-plugin-postgresql postgresql.conf postgresql && \ - build_plugin mssql "${MSSQL_PLUGIN_SOURCES}" "${MSSQL_PLUGIN_VERSION}" \ - zabbix-agent2-plugin-mssql mssql.conf mssql && \ - build_plugin ember "${EMBER_PLUS_PLUGIN_SOURCES}" "${EMBER_PLUS_PLUGIN_VERSION}" \ - zabbix-agent2-plugin-ember-plus ember.conf ember-plus && \ - build_plugin nvidia-gpu "${NVIDIA_GPU_PLUGIN_SOURCES}" "${NVIDIA_GPU_PLUGIN_VERSION}" \ - zabbix-agent2-plugin-nvidia-gpu nvidia.conf nvidia-gpu diff --git a/Dockerfiles/build-sqlite3/ol/README.md b/Dockerfiles/build-sqlite3/ol/README.md deleted file mode 120000 index 32d46ee8..00000000 --- a/Dockerfiles/build-sqlite3/ol/README.md +++ /dev/null @@ -1 +0,0 @@ -../README.md \ No newline at end of file diff --git a/Dockerfiles/build-sqlite3/ol/build.sh b/Dockerfiles/build-sqlite3/ol/build.sh deleted file mode 120000 index 46b20313..00000000 --- a/Dockerfiles/build-sqlite3/ol/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../../build.sh \ No newline at end of file diff --git a/Dockerfiles/build-sqlite3/ol/patches/.gitkeep b/Dockerfiles/build-sqlite3/ol/patches/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/Dockerfiles/build-sqlite3/rhel/.dockerignore b/Dockerfiles/build-sqlite3/rhel/.dockerignore deleted file mode 100644 index 88a84e55..00000000 --- a/Dockerfiles/build-sqlite3/rhel/.dockerignore +++ /dev/null @@ -1 +0,0 @@ -build.sh diff --git a/Dockerfiles/build-sqlite3/rhel/Dockerfile b/Dockerfiles/build-sqlite3/rhel/Dockerfile deleted file mode 100644 index 4834f6ac..00000000 --- a/Dockerfiles/build-sqlite3/rhel/Dockerfile +++ /dev/null @@ -1,204 +0,0 @@ -# syntax=docker/dockerfile:1.6 -ARG MAJOR_VERSION=7.4 -ARG RELEASE=12 -ARG ZBX_VERSION=${MAJOR_VERSION}.12 -ARG BUILD_BASE_IMAGE=zabbix-build-base:rhel-${ZBX_VERSION} - -FROM ${BUILD_BASE_IMAGE} AS builder -ARG BUILD_JOBS - -ARG MAJOR_VERSION -ARG RELEASE -ARG ZBX_VERSION -ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git -ARG GIT_BRANCH - -ARG ZBX_PLUGINS_VERSION=${GIT_BRANCH:-$ZBX_VERSION} -ARG CFLAGS -ARG LDFLAGS - -LABEL description="Zabbix build base for SQLite3 based images" \ - maintainer="alexey.pustovalov@zabbix.com" \ - name="zabbix/zabbix-build-sqlite3-74" \ - release="${RELEASE}" \ - summary="Zabbix build base (SQLite3)" \ - url="https://www.zabbix.com/" \ - vendor="Zabbix SIA" \ - version="${MAJOR_VERSION}" \ - io.k8s.description="Zabbix build base for SQLite3 based images" \ - io.k8s.display-name="Zabbix build base (SQLite3)" \ - io.openshift.expose-services="" \ - io.openshift.tags="zabbix,build,sqlite3" \ - org.label-schema.description="Zabbix build base for SQLite3 based images" \ - org.label-schema.license="AGPL v3.0" \ - org.label-schema.name="zabbix-build-sqlite3-rhel" \ - org.label-schema.url="https://zabbix.com/" \ - org.label-schema.vcs-ref="${VCS_REF}" \ - org.label-schema.vendor="Zabbix SIA" - -ENV ZBX_SOURCES_DIR=/tmp/zabbix-${ZBX_VERSION} ZBX_OUTPUT_DIR=/tmp/zabbix-${ZBX_VERSION}-output \ - DB_TYPE=sqlite3 \ - CFLAGS=${CFLAGS:-"-O2 -fPIE -fstack-protector-strong -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -pipe"} \ - LDFLAGS=${LDFLAGS:-"-pie -Wl,-z,relro,-z,now,-z,defs -Wl,--as-needed"} \ - MONGODB_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/mongodb.git MONGODB_PLUGIN_VERSION=${ZBX_PLUGINS_VERSION} \ - POSTGRESQL_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/postgresql.git POSTGRESQL_PLUGIN_VERSION=${ZBX_PLUGINS_VERSION} \ - MSSQL_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/mssql.git MSSQL_PLUGIN_VERSION=${ZBX_PLUGINS_VERSION} \ - EMBER_PLUS_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/ember-plus.git EMBER_PLUS_PLUGIN_VERSION=${ZBX_PLUGINS_VERSION} \ - NVIDIA_GPU_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/nvidia-gpu.git NVIDIA_GPU_PLUGIN_VERSION=${ZBX_PLUGINS_VERSION} - -RUN --mount=from=sources,target=/tmp/src,z \ - --mount=type=bind,source=patches/,target=/tmp/patches,z \ - set -eux && \ - mkdir -p \ - ${ZBX_OUTPUT_DIR}/agent/sbin \ - ${ZBX_OUTPUT_DIR}/agent/conf \ - ${ZBX_OUTPUT_DIR}/agent2/sbin \ - ${ZBX_OUTPUT_DIR}/agent2/conf \ - ${ZBX_OUTPUT_DIR}/agent2/conf/zabbix_agent2.d/plugins.d \ - ${ZBX_OUTPUT_DIR}/proxy/sbin \ - ${ZBX_OUTPUT_DIR}/proxy/conf \ - ${ZBX_OUTPUT_DIR}/proxy/database/${DB_TYPE} \ - ${ZBX_OUTPUT_DIR}/java_gateway/sbin/bin \ - ${ZBX_OUTPUT_DIR}/java_gateway/sbin/lib \ - ${ZBX_OUTPUT_DIR}/java_gateway/conf \ - ${ZBX_OUTPUT_DIR}/web/conf \ - ${ZBX_OUTPUT_DIR}/general/sbin \ - ${ZBX_OUTPUT_DIR}/general/bin \ - ${ZBX_OUTPUT_DIR}/general/conf && \ - if [ -f /tmp/src/bootstrap.sh ]; then \ - mkdir -p "${ZBX_SOURCES_DIR}" && \ - cp -a /tmp/src/. "${ZBX_SOURCES_DIR}/"; \ - else \ - git -c advice.detachedHead=false clone \ - "${ZBX_SOURCES}" \ - --branch "${GIT_BRANCH:-$ZBX_VERSION}" \ - --depth 1 \ - --single-branch \ - "${ZBX_SOURCES_DIR}"; \ - fi && \ - cd "${ZBX_SOURCES_DIR}" && \ - for patch_filename in /tmp/patches/*.patch; do \ - [ -f "$patch_filename" ] || continue; \ - patch -p1 < "$patch_filename"; \ - done && \ - if git rev-parse --short HEAD >/dev/null 2>&1; then \ - zabbix_revision="$(git rev-parse --short HEAD)"; \ - else \ - zabbix_revision="unknown"; \ - fi && \ - sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" include/version.h && \ - sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" src/go/pkg/version/version.go && \ - sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java - -WORKDIR ${ZBX_SOURCES_DIR} - -RUN --mount=type=cache,target=/root/.cache/go-build \ - --mount=type=cache,target=/root/go/pkg/mod \ - --mount=from=config_templates,target=/tmp/conf,z \ - set -eux && \ - cd "${ZBX_SOURCES_DIR}" && \ - ./bootstrap.sh && \ - ./configure \ - --datadir=/usr/lib \ - --libdir=/usr/lib/zabbix \ - --prefix=/usr \ - --sysconfdir=/etc/zabbix \ - --enable-ipv6 \ - --enable-agent \ - --enable-agent2 \ - --enable-java \ - --enable-proxy \ - --with-ares \ - --with-ldap \ - --with-libcurl \ - --with-libmodbus \ - --with-libpcre2 \ - --with-libxml2 \ - --with-${DB_TYPE} \ - --with-net-snmp \ - --with-openipmi \ - --with-openssl \ - --with-ssh \ - --with-unixodbc \ - --silent && \ - jobs="${BUILD_JOBS:-$(nproc)}" && \ - make -j"${jobs}" -s dbschema && \ - make -j"${jobs}" -s && \ - make -j"${jobs}" -s gettext && \ - cat "database/${DB_TYPE}/schema.sql" > "database/${DB_TYPE}/create.sql" && \ - gzip -c "database/${DB_TYPE}/create.sql" > "${ZBX_OUTPUT_DIR}/proxy/database/${DB_TYPE}/create.sql.gz" && \ - strip src/zabbix_agent/zabbix_agentd && \ - strip src/zabbix_proxy/zabbix_proxy && \ - strip src/zabbix_get/zabbix_get && \ - strip src/zabbix_sender/zabbix_sender && \ - strip src/go/bin/zabbix_agent2 || true && \ - mv src/zabbix_agent/zabbix_agentd "${ZBX_OUTPUT_DIR}/agent/sbin/" && \ - cp conf/zabbix_agentd.conf "${ZBX_OUTPUT_DIR}/agent/conf/zabbix_agentd.conf.dist" && \ - cp -a conf/zabbix_agentd/. "${ZBX_OUTPUT_DIR}/agent/conf/" && \ - cp -a /tmp/conf/agent/. "${ZBX_OUTPUT_DIR}/agent/conf/" && \ - mv src/go/bin/zabbix_agent2 "${ZBX_OUTPUT_DIR}/agent2/sbin/" && \ - cp src/go/conf/zabbix_agent2.conf "${ZBX_OUTPUT_DIR}/agent2/conf/zabbix_agent2.conf.dist" && \ - cp -a src/go/conf/zabbix_agent2.d/. "${ZBX_OUTPUT_DIR}/agent2/conf/zabbix_agent2.d/" && \ - cp -a /tmp/conf/agent2/. "${ZBX_OUTPUT_DIR}/agent2/conf/" && \ - mv src/zabbix_proxy/zabbix_proxy "${ZBX_OUTPUT_DIR}/proxy/sbin/" && \ - cp conf/zabbix_proxy.conf "${ZBX_OUTPUT_DIR}/proxy/conf/zabbix_proxy.conf.dist" && \ - cp -a /tmp/conf/proxy/. "${ZBX_OUTPUT_DIR}/proxy/conf/" && \ - cp -a src/zabbix_java/bin/. "${ZBX_OUTPUT_DIR}/java_gateway/sbin/bin/" && \ - cp -a src/zabbix_java/lib/*.jar "${ZBX_OUTPUT_DIR}/java_gateway/sbin/lib/" && \ - cp src/zabbix_java/lib/logback.xml "${ZBX_OUTPUT_DIR}/java_gateway/conf/logback.xml.dist" && \ - cp src/zabbix_java/lib/logback-console.xml "${ZBX_OUTPUT_DIR}/java_gateway/conf/logback-console.xml.dist" && \ - cp -a /tmp/conf/java-gateway/. "${ZBX_OUTPUT_DIR}/java_gateway/conf/" && \ - mv src/zabbix_get/zabbix_get "${ZBX_OUTPUT_DIR}/general/bin/" && \ - mv src/zabbix_sender/zabbix_sender "${ZBX_OUTPUT_DIR}/general/bin/" && \ - cp -a /tmp/conf/web/. "${ZBX_OUTPUT_DIR}/web/conf/" && \ - make -s distclean - -RUN set -eux && \ - cd "${ZBX_SOURCES_DIR}" && \ - curl --retry 5 --retry-all-errors --retry-delay 2 --tlsv1.2 -sSf -L \ - "https://raw.githubusercontent.com/notofonts/noto-cjk/main/Sans/OTF/Japanese/NotoSansCJKjp-Regular.otf" \ - -o ui/assets/fonts/NotoSansCJKjp-Regular.otf && \ - curl --retry 5 --retry-all-errors --retry-delay 2 --tlsv1.2 -sSf -L \ - "https://raw.githubusercontent.com/notofonts/noto-cjk/main/Sans/LICENSE" \ - -o ui/assets/fonts/OFL.txt && \ - sed -i -r 's/(define\(.*_FONT_NAME.*)DejaVuSans/\1NotoSansCJKjp-Regular/' ui/include/defines.inc.php && \ - sed -i -r 's/\.ttf/\.otf/' ui/include/graphs.inc.php && \ - rm -f ui/assets/fonts/DejaVuSans.ttf && \ - chmod o+r ui/assets/fonts/* - -RUN --mount=type=cache,target=/root/.cache/go-build \ - --mount=type=cache,target=/root/go/pkg/mod \ - set -eux && \ - mkdir -p "${ZBX_OUTPUT_DIR}/agent2/sbin/zabbix-agent2-plugin" && \ - mkdir -p "${ZBX_OUTPUT_DIR}/agent2/conf/zabbix_agent2.d/plugins.d" && \ - build_plugin() { \ - name="$1"; \ - repo="$2"; \ - version="$3"; \ - binary="$4"; \ - conf="$5"; \ - outname="$6"; \ - workdir="/tmp/${name}-plugin-${version}"; \ - rm -rf "$workdir"; \ - git -c advice.detachedHead=false clone "$repo" \ - --branch "$version" \ - --depth 1 \ - --single-branch \ - "$workdir"; \ - cd "$workdir"; \ - make; \ - strip "$binary" || true; \ - mv "$binary" "${ZBX_OUTPUT_DIR}/agent2/sbin/zabbix-agent2-plugin/${outname}"; \ - cp "$conf" "${ZBX_OUTPUT_DIR}/agent2/conf/zabbix_agent2.d/plugins.d/"; \ - make clean; \ - }; \ - build_plugin mongodb "${MONGODB_PLUGIN_SOURCES}" "${MONGODB_PLUGIN_VERSION}" \ - zabbix-agent2-plugin-mongodb mongodb.conf mongodb && \ - build_plugin postgresql "${POSTGRESQL_PLUGIN_SOURCES}" "${POSTGRESQL_PLUGIN_VERSION}" \ - zabbix-agent2-plugin-postgresql postgresql.conf postgresql && \ - build_plugin mssql "${MSSQL_PLUGIN_SOURCES}" "${MSSQL_PLUGIN_VERSION}" \ - zabbix-agent2-plugin-mssql mssql.conf mssql && \ - build_plugin ember "${EMBER_PLUS_PLUGIN_SOURCES}" "${EMBER_PLUS_PLUGIN_VERSION}" \ - zabbix-agent2-plugin-ember-plus ember.conf ember-plus && \ - build_plugin nvidia-gpu "${NVIDIA_GPU_PLUGIN_SOURCES}" "${NVIDIA_GPU_PLUGIN_VERSION}" \ - zabbix-agent2-plugin-nvidia-gpu nvidia.conf nvidia-gpu diff --git a/Dockerfiles/build-sqlite3/rhel/README.md b/Dockerfiles/build-sqlite3/rhel/README.md deleted file mode 120000 index 32d46ee8..00000000 --- a/Dockerfiles/build-sqlite3/rhel/README.md +++ /dev/null @@ -1 +0,0 @@ -../README.md \ No newline at end of file diff --git a/Dockerfiles/build-sqlite3/rhel/build.sh b/Dockerfiles/build-sqlite3/rhel/build.sh deleted file mode 120000 index 46b20313..00000000 --- a/Dockerfiles/build-sqlite3/rhel/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../../build.sh \ No newline at end of file diff --git a/Dockerfiles/build-sqlite3/rhel/patches/.gitkeep b/Dockerfiles/build-sqlite3/rhel/patches/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/Dockerfiles/build-sqlite3/ubuntu/.dockerignore b/Dockerfiles/build-sqlite3/ubuntu/.dockerignore deleted file mode 100644 index 88a84e55..00000000 --- a/Dockerfiles/build-sqlite3/ubuntu/.dockerignore +++ /dev/null @@ -1 +0,0 @@ -build.sh diff --git a/Dockerfiles/build-sqlite3/ubuntu/Dockerfile b/Dockerfiles/build-sqlite3/ubuntu/Dockerfile deleted file mode 100644 index bdf1c331..00000000 --- a/Dockerfiles/build-sqlite3/ubuntu/Dockerfile +++ /dev/null @@ -1,193 +0,0 @@ -# syntax=docker/dockerfile:1.6 -ARG MAJOR_VERSION=7.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.12 -ARG BUILD_BASE_IMAGE=zabbix-build-base:ubuntu-${ZBX_VERSION} - -FROM ${BUILD_BASE_IMAGE} AS builder -ARG BUILD_JOBS - -ARG MAJOR_VERSION -ARG ZBX_VERSION -ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git -ARG GIT_BRANCH - -ARG ZBX_PLUGINS_VERSION=${GIT_BRANCH:-$ZBX_VERSION} -ARG CFLAGS -ARG LDFLAGS - -LABEL org.opencontainers.image.authors="Alexey Pustovalov " \ - org.opencontainers.image.description="Zabbix build base for SQLite3 based images" \ - org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ - org.opencontainers.image.licenses="AGPL v3.0" \ - org.opencontainers.image.source="${ZBX_SOURCES}" \ - org.opencontainers.image.title="Zabbix build base (SQLite3)" \ - org.opencontainers.image.url="https://zabbix.com/" \ - org.opencontainers.image.vendor="Zabbix SIA" \ - org.opencontainers.image.version="${ZBX_VERSION}" - -ENV ZBX_SOURCES_DIR=/tmp/zabbix-${ZBX_VERSION} ZBX_OUTPUT_DIR=/tmp/zabbix-${ZBX_VERSION}-output \ - DB_TYPE=sqlite3 \ - CFLAGS=${CFLAGS:-"-O2 -fPIE -fstack-protector-strong -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -pipe"} \ - LDFLAGS=${LDFLAGS:-"-pie -Wl,-z,relro,-z,now,-z,defs -Wl,--as-needed"} \ - MONGODB_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/mongodb.git MONGODB_PLUGIN_VERSION=${ZBX_PLUGINS_VERSION} \ - POSTGRESQL_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/postgresql.git POSTGRESQL_PLUGIN_VERSION=${ZBX_PLUGINS_VERSION} \ - MSSQL_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/mssql.git MSSQL_PLUGIN_VERSION=${ZBX_PLUGINS_VERSION} \ - EMBER_PLUS_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/ember-plus.git EMBER_PLUS_PLUGIN_VERSION=${ZBX_PLUGINS_VERSION} \ - NVIDIA_GPU_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/nvidia-gpu.git NVIDIA_GPU_PLUGIN_VERSION=${ZBX_PLUGINS_VERSION} - -RUN --mount=from=sources,target=/tmp/src,ro \ - --mount=type=bind,source=patches/,target=/tmp/patches,ro \ - set -eux && \ - mkdir -p \ - ${ZBX_OUTPUT_DIR}/agent/sbin \ - ${ZBX_OUTPUT_DIR}/agent/conf \ - ${ZBX_OUTPUT_DIR}/agent2/sbin \ - ${ZBX_OUTPUT_DIR}/agent2/conf \ - ${ZBX_OUTPUT_DIR}/agent2/conf/zabbix_agent2.d/plugins.d \ - ${ZBX_OUTPUT_DIR}/proxy/sbin \ - ${ZBX_OUTPUT_DIR}/proxy/conf \ - ${ZBX_OUTPUT_DIR}/proxy/database/${DB_TYPE} \ - ${ZBX_OUTPUT_DIR}/java_gateway/sbin/bin \ - ${ZBX_OUTPUT_DIR}/java_gateway/sbin/lib \ - ${ZBX_OUTPUT_DIR}/java_gateway/conf \ - ${ZBX_OUTPUT_DIR}/web/conf \ - ${ZBX_OUTPUT_DIR}/general/sbin \ - ${ZBX_OUTPUT_DIR}/general/bin \ - ${ZBX_OUTPUT_DIR}/general/conf && \ - if [ -f /tmp/src/bootstrap.sh ]; then \ - mkdir -p "${ZBX_SOURCES_DIR}" && \ - cp -a /tmp/src/. "${ZBX_SOURCES_DIR}/"; \ - else \ - git -c advice.detachedHead=false clone \ - "${ZBX_SOURCES}" \ - --branch "${GIT_BRANCH:-$ZBX_VERSION}" \ - --depth 1 \ - --single-branch \ - "${ZBX_SOURCES_DIR}"; \ - fi && \ - cd "${ZBX_SOURCES_DIR}" && \ - for patch_filename in /tmp/patches/*.patch; do \ - [ -f "$patch_filename" ] || continue; \ - patch -p1 < "$patch_filename"; \ - done && \ - if git rev-parse --short HEAD >/dev/null 2>&1; then \ - zabbix_revision="$(git rev-parse --short HEAD)"; \ - else \ - zabbix_revision="unknown"; \ - fi && \ - sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" include/version.h && \ - sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" src/go/pkg/version/version.go && \ - sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java - -WORKDIR ${ZBX_SOURCES_DIR} - -RUN --mount=type=cache,target=/root/.cache/go-build \ - --mount=type=cache,target=/root/go/pkg/mod \ - --mount=from=config_templates,target=/tmp/conf,ro \ - set -eux && \ - cd "${ZBX_SOURCES_DIR}" && \ - ./bootstrap.sh && \ - ./configure \ - --datadir=/usr/lib \ - --libdir=/usr/lib/zabbix \ - --prefix=/usr \ - --sysconfdir=/etc/zabbix \ - --enable-ipv6 \ - --enable-agent \ - --enable-agent2 \ - --enable-java \ - --enable-proxy \ - --with-ares \ - --with-ldap \ - --with-libcurl \ - --with-libmodbus \ - --with-libpcre2 \ - --with-libxml2 \ - --with-${DB_TYPE} \ - --with-net-snmp \ - --with-openipmi \ - --with-openssl \ - --with-ssh \ - --with-unixodbc \ - --silent && \ - jobs="${BUILD_JOBS:-$(nproc)}" && \ - make -j"${jobs}" -s dbschema && \ - make -j"${jobs}" -s && \ - make -j"${jobs}" -s gettext && \ - cat "database/${DB_TYPE}/schema.sql" > "database/${DB_TYPE}/create.sql" && \ - gzip -c "database/${DB_TYPE}/create.sql" > "${ZBX_OUTPUT_DIR}/proxy/database/${DB_TYPE}/create.sql.gz" && \ - strip src/zabbix_agent/zabbix_agentd && \ - strip src/zabbix_proxy/zabbix_proxy && \ - strip src/zabbix_get/zabbix_get && \ - strip src/zabbix_sender/zabbix_sender && \ - strip src/go/bin/zabbix_agent2 || true && \ - mv src/zabbix_agent/zabbix_agentd "${ZBX_OUTPUT_DIR}/agent/sbin/" && \ - cp conf/zabbix_agentd.conf "${ZBX_OUTPUT_DIR}/agent/conf/zabbix_agentd.conf.dist" && \ - cp -a conf/zabbix_agentd/. "${ZBX_OUTPUT_DIR}/agent/conf/" && \ - cp -a /tmp/conf/agent/. "${ZBX_OUTPUT_DIR}/agent/conf/" && \ - mv src/go/bin/zabbix_agent2 "${ZBX_OUTPUT_DIR}/agent2/sbin/" && \ - cp src/go/conf/zabbix_agent2.conf "${ZBX_OUTPUT_DIR}/agent2/conf/zabbix_agent2.conf.dist" && \ - cp -a src/go/conf/zabbix_agent2.d/. "${ZBX_OUTPUT_DIR}/agent2/conf/zabbix_agent2.d/" && \ - cp -a /tmp/conf/agent2/. "${ZBX_OUTPUT_DIR}/agent2/conf/" && \ - mv src/zabbix_proxy/zabbix_proxy "${ZBX_OUTPUT_DIR}/proxy/sbin/" && \ - cp conf/zabbix_proxy.conf "${ZBX_OUTPUT_DIR}/proxy/conf/zabbix_proxy.conf.dist" && \ - cp -a /tmp/conf/proxy/. "${ZBX_OUTPUT_DIR}/proxy/conf/" && \ - cp -a src/zabbix_java/bin/. "${ZBX_OUTPUT_DIR}/java_gateway/sbin/bin/" && \ - cp -a src/zabbix_java/lib/*.jar "${ZBX_OUTPUT_DIR}/java_gateway/sbin/lib/" && \ - cp src/zabbix_java/lib/logback.xml "${ZBX_OUTPUT_DIR}/java_gateway/conf/logback.xml.dist" && \ - cp src/zabbix_java/lib/logback-console.xml "${ZBX_OUTPUT_DIR}/java_gateway/conf/logback-console.xml.dist" && \ - cp -a /tmp/conf/java-gateway/. "${ZBX_OUTPUT_DIR}/java_gateway/conf/" && \ - mv src/zabbix_get/zabbix_get "${ZBX_OUTPUT_DIR}/general/bin/" && \ - mv src/zabbix_sender/zabbix_sender "${ZBX_OUTPUT_DIR}/general/bin/" && \ - cp -a /tmp/conf/web/. "${ZBX_OUTPUT_DIR}/web/conf/" && \ - make -s distclean - -RUN set -eux && \ - cd "${ZBX_SOURCES_DIR}" && \ - curl --retry 5 --retry-all-errors --retry-delay 2 --tlsv1.2 -sSf -L \ - "https://raw.githubusercontent.com/notofonts/noto-cjk/main/Sans/OTF/Japanese/NotoSansCJKjp-Regular.otf" \ - -o ui/assets/fonts/NotoSansCJKjp-Regular.otf && \ - curl --retry 5 --retry-all-errors --retry-delay 2 --tlsv1.2 -sSf -L \ - "https://raw.githubusercontent.com/notofonts/noto-cjk/main/Sans/LICENSE" \ - -o ui/assets/fonts/OFL.txt && \ - sed -i -r 's/(define\(.*_FONT_NAME.*)DejaVuSans/\1NotoSansCJKjp-Regular/' ui/include/defines.inc.php && \ - sed -i -r 's/\.ttf/\.otf/' ui/include/graphs.inc.php && \ - rm -f ui/assets/fonts/DejaVuSans.ttf && \ - chmod o+r ui/assets/fonts/* - -RUN --mount=type=cache,target=/root/.cache/go-build \ - --mount=type=cache,target=/root/go/pkg/mod \ - set -eux && \ - mkdir -p "${ZBX_OUTPUT_DIR}/agent2/sbin/zabbix-agent2-plugin" && \ - mkdir -p "${ZBX_OUTPUT_DIR}/agent2/conf/zabbix_agent2.d/plugins.d" && \ - build_plugin() { \ - name="$1"; \ - repo="$2"; \ - version="$3"; \ - binary="$4"; \ - conf="$5"; \ - outname="$6"; \ - workdir="/tmp/${name}-plugin-${version}"; \ - rm -rf "$workdir"; \ - git -c advice.detachedHead=false clone "$repo" \ - --branch "$version" \ - --depth 1 \ - --single-branch \ - "$workdir"; \ - cd "$workdir"; \ - make; \ - strip "$binary" || true; \ - mv "$binary" "${ZBX_OUTPUT_DIR}/agent2/sbin/zabbix-agent2-plugin/${outname}"; \ - cp "$conf" "${ZBX_OUTPUT_DIR}/agent2/conf/zabbix_agent2.d/plugins.d/"; \ - make clean; \ - }; \ - build_plugin mongodb "${MONGODB_PLUGIN_SOURCES}" "${MONGODB_PLUGIN_VERSION}" \ - zabbix-agent2-plugin-mongodb mongodb.conf mongodb && \ - build_plugin postgresql "${POSTGRESQL_PLUGIN_SOURCES}" "${POSTGRESQL_PLUGIN_VERSION}" \ - zabbix-agent2-plugin-postgresql postgresql.conf postgresql && \ - build_plugin mssql "${MSSQL_PLUGIN_SOURCES}" "${MSSQL_PLUGIN_VERSION}" \ - zabbix-agent2-plugin-mssql mssql.conf mssql && \ - build_plugin ember "${EMBER_PLUS_PLUGIN_SOURCES}" "${EMBER_PLUS_PLUGIN_VERSION}" \ - zabbix-agent2-plugin-ember-plus ember.conf ember-plus && \ - build_plugin nvidia-gpu "${NVIDIA_GPU_PLUGIN_SOURCES}" "${NVIDIA_GPU_PLUGIN_VERSION}" \ - zabbix-agent2-plugin-nvidia-gpu nvidia.conf nvidia-gpu diff --git a/Dockerfiles/build-sqlite3/ubuntu/README.md b/Dockerfiles/build-sqlite3/ubuntu/README.md deleted file mode 120000 index 32d46ee8..00000000 --- a/Dockerfiles/build-sqlite3/ubuntu/README.md +++ /dev/null @@ -1 +0,0 @@ -../README.md \ No newline at end of file diff --git a/Dockerfiles/build-sqlite3/ubuntu/build.sh b/Dockerfiles/build-sqlite3/ubuntu/build.sh deleted file mode 120000 index 46b20313..00000000 --- a/Dockerfiles/build-sqlite3/ubuntu/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../../build.sh \ No newline at end of file diff --git a/Dockerfiles/build-sqlite3/ubuntu/patches/.gitkeep b/Dockerfiles/build-sqlite3/ubuntu/patches/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/Dockerfiles/java-gateway/README.md b/Dockerfiles/java-gateway/README.md deleted file mode 100644 index 8abb6d6e..00000000 --- a/Dockerfiles/java-gateway/README.md +++ /dev/null @@ -1,138 +0,0 @@ -![logo](https://assets.zabbix.com/img/logo/zabbix_logo_500x131.png) - -# What is Zabbix? - -Zabbix is an enterprise-class open source distributed monitoring solution. - -Zabbix is software that monitors numerous parameters of a network and the health and integrity of servers. Zabbix uses a flexible notification mechanism that allows users to configure e-mail based alerts for virtually any event. This allows a fast reaction to server problems. Zabbix offers excellent reporting and data visualisation features based on the stored data. This makes Zabbix ideal for capacity planning. - -For more information and related downloads for Zabbix components, please visit https://hub.docker.com/u/zabbix/ and https://zabbix.com - -# What is Zabbix Java Gateway? - -Zabbix Java Gateway performs native support for monitoring JMX applications. Java gateway accepts incoming connection from Zabbix server or Zabbix proxy and can only be used as a "passive proxy". - -# Zabbix Java Gateway images - -These are the only official Zabbix Java Gateway Docker images. They are based on Alpine Linux v3.24, Ubuntu 26.04 (resolute), CentOS Stream 10 and Oracle Linux 10 images. The available versions of Zabbix Java Gateway are: - - Zabbix Java Gateway 6.0 (tags: alpine-6.0-latest, ubuntu-6.0-latest, ol-6.0-latest) - Zabbix Java Gateway 6.0.* (tags: alpine-6.0.*, ubuntu-6.0.*, ol-6.0.*) - Zabbix Java Gateway 7.0 (tags: alpine-7.0-latest, ubuntu-7.0-latest, ol-7.0-latest) - Zabbix Java Gateway 7.0.* (tags: alpine-7.0.*, ubuntu-7.0.*, ol-7.0.*) - Zabbix Java Gateway 7.2 (tags: alpine-7.2-latest, ubuntu-7.2-latest, ol-7.2-latest) - Zabbix Java Gateway 7.2.* (tags: alpine-7.2.*, ubuntu-7.2.*, ol-7.2.*) - Zabbix Java Gateway 7.4 (tags: alpine-7.4-latest, ubuntu-7.4-latest, ol-7.4-latest, alpine-latest, ubuntu-latest, ol-latest, latest) - Zabbix Java Gateway 7.4.* (tags: alpine-7.4.*, ubuntu-7.4.*, ol-7.4.*) - Zabbix Java Gateway 8.0 (tags: alpine-trunk, ubuntu-trunk, ol-trunk) - -Images are updated when new releases are published. The image with ``latest`` tag is based on Alpine Linux. - -# How to use this image - -## Start `zabbix-java-gateway` - -Start a Zabbix Java Gateway container as follows: - - docker run --name some-zabbix-java-gateway -d zabbix/zabbix-java-gateway:tag - -Where `some-zabbix-java-gateway` is the name you want to assign to your container and `tag` is the tag specifying the version you want. See the list above for relevant tags, or look at the [full list of tags](https://hub.docker.com/r/zabbix/zabbix-java-gateway/tags/). - -## Linking the container to Zabbix server or Zabbix proxy - - docker run --name some-zabbix-java-gateway --link some-zabbix-server:zabbix-server -d zabbix/zabbix-java-gateway:tag - -## Container shell access and viewing Zabbix Java Gateway logs - -The `docker exec` command allows you to run commands inside a Docker container. The following command line will give you a bash shell inside your `zabbix-java-gateway` container: - -```console -$ docker exec -ti some-zabbix-java-gateway /bin/bash -``` - -The Zabbix Java Gateway log is available through Docker's container log: - -```console -$ docker logs some-zabbix-java-gateway -``` - -## Environment Variables - -When you start the `zabbix-java-gateway` image, you can adjust the configuration of the Zabbix Java Gateway by passing one or more environment variables on the `docker run` command line. - -### `ZBX_SERVER` - -Comma-delimited list of IP addresses, CIDR networks or DNS names of Zabbix servers and proxies allowed to connect to Java Gateway. If unset or empty, connections are accepted from all hosts. - -### `ZBX_START_POLLERS` - -This variable is specified amount of pollers. By default, value is `5`. - -### `ZBX_TIMEOUT` - -This variable is used to specify timeout for outgoing connections. By default, value is `3`. - -### `ZBX_DEBUGLEVEL` - -This variable is used to specify log level. By default, value is `info`. The variable allows next values: ``trace``, ``debug``, ``info``, ``warn``, ``error``, ``all``, ``off`` - -### `ZBX_PROPERTIES_FILE` - -Name of properties file. Can be used to set additional properties using a key-value format in such a way that they are not visible on a command line or to overwrite existing ones. - -### `ZBX_JAVA_OPTS` - -Additional Java Virtual Machine (JVM) options for Zabbix Java Gateway, for example `-Xms128m -Xmx1g`. - -## Allowed volumes for the Zabbix Java Gateway container - -### ``/usr/sbin/zabbix_java/ext_lib`` - -The volume allows include additional JAR files to extend allowed protocols for Zabbix Java Gateway. - -# The image variants - -The `zabbix-java-gateway` images come in many flavors, each designed for a specific use case. - -## `zabbix-java-gateway:alpine-` - -This image is based on the popular [Alpine Linux project](http://alpinelinux.org), available in [the `alpine` official image](https://hub.docker.com/_/alpine). Alpine Linux is much smaller than most distribution base images (~5MB), and thus leads to much slimmer images in general. - -This variant is highly recommended when final image size being as small as possible is desired. The main caveat to note is that it does use [musl libc](http://www.musl-libc.org) instead of [glibc and friends](http://www.etalabs.net/compare_libcs.html), so certain software might run into issues depending on the depth of their libc requirements. However, most software doesn't have an issue with this, so this variant is usually a very safe choice. See [this Hacker News comment thread](https://news.ycombinator.com/item?id=10782897) for more discussion of the issues that might arise and some pro/con comparisons of using Alpine-based images. - -To minimize image size, it's uncommon for additional related tools (such as `git` or `bash`) to be included in Alpine-based images. Using this image as a base, add the things you need in your own Dockerfile (see the [`alpine` image description](https://hub.docker.com/_/alpine/) for examples of how to install packages if you are unfamiliar). - -## `zabbix-java-gateway:ubuntu-` - -This is the defacto image. If you are unsure about what your needs are, you probably want to use this one. It is designed to be used both as a throw away container (mount your source code and start the container to start your app), as well as the base to build other images off of. - -## `zabbix-java-gateway:ol-` - -Oracle Linux is an open-source operating system available under the GNU General Public License (GPLv2). Suitable for general purpose or Oracle workloads, it benefits from rigorous testing of more than 128,000 hours per day with real-world workloads and includes unique innovations such as Ksplice for zero-downtime kernel patching, DTrace for real-time diagnostics, the powerful Btrfs file system, and more. - -# User Feedback - -## Documentation - -Documentation for this image is stored in the [`java-gateway/` directory](https://github.com/zabbix/zabbix-docker/tree/7.4/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.4/README.md) before attempting a pull request. - -## Issues - -If you have any problems with or questions about this image, please contact us through a [GitHub issue](https://github.com/zabbix/zabbix-docker/issues). - -### Known issues - -## Contributing - -You are invited to contribute new features, fixes, or updates, large or small; we are always thrilled to receive pull requests, and do our best to process them as fast as we can. - -Before you start to code, we recommend discussing your plans through a [GitHub issue](https://github.com/zabbix/zabbix-docker/issues), especially for more ambitious contributions. This gives other contributors a chance to point you in the right direction, give you feedback on your design, and help you find out if someone else is working on the same thing. - -## License - -Starting from Zabbix version 7.0, all subsequent Zabbix versions will be released under the GNU Affero General Public License version 3 (AGPLv3). -You can modify the relevant version and propagate such modified version under the terms of the AGPLv3 as published by the Free Software Foundation. -For additional details, including answers to common questions about the AGPLv3, see the generic FAQ from the [Free Software Foundation](http://www.fsf.org/licenses/gpl-faq.html). - -Zabbix is Open Source Software, however, if you use Zabbix in a commercial context we kindly ask you to support the development of Zabbix by purchasing some level of technical support. -All previous Zabbix software versions up to 6.4 are released under the GNU General Public License version 2 (GPLv2). The formal terms of the GPLv2 and AGPLv3 can be found at http://www.fsf.org/licenses/. diff --git a/Dockerfiles/java-gateway/alpine/.dockerignore b/Dockerfiles/java-gateway/alpine/.dockerignore deleted file mode 100644 index 88a84e55..00000000 --- a/Dockerfiles/java-gateway/alpine/.dockerignore +++ /dev/null @@ -1 +0,0 @@ -build.sh diff --git a/Dockerfiles/java-gateway/alpine/Dockerfile b/Dockerfiles/java-gateway/alpine/Dockerfile deleted file mode 100644 index 2ed8c1cb..00000000 --- a/Dockerfiles/java-gateway/alpine/Dockerfile +++ /dev/null @@ -1,82 +0,0 @@ -# syntax=docker/dockerfile:1.6 -ARG OS_BASE_IMAGE=alpine:3.24 -ARG MAJOR_VERSION=7.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.12 -ARG BUILD_BASE_IMAGE=zabbix-build-mysql:alpine-${ZBX_VERSION} - -FROM ${BUILD_BASE_IMAGE} AS builder - -FROM ${OS_BASE_IMAGE} - -ARG MAJOR_VERSION -ARG ZBX_VERSION -ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git - -ENV TERM=xterm \ - ZBX_VERSION=${ZBX_VERSION} \ - ZBX_SOURCES=${ZBX_SOURCES} \ - PATH=${PATH}:/usr/lib/jvm/default-jvm/bin/ JAVA_HOME=/usr/lib/jvm/default-jvm \ - ZABBIX_USER_HOME_DIR=/var/lib/zabbix \ - ZABBIX_CONF_DIR=/etc/zabbix - -LABEL org.opencontainers.image.authors="Alexey Pustovalov " \ - org.opencontainers.image.description="Zabbix Java Gateway performs native support for monitoring JMX applications" \ - org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ - org.opencontainers.image.licenses="AGPL v3.0" \ - org.opencontainers.image.source="${ZBX_SOURCES}" \ - org.opencontainers.image.title="Zabbix Java Gateway" \ - org.opencontainers.image.url="https://zabbix.com/" \ - org.opencontainers.image.vendor="Zabbix SIA" \ - org.opencontainers.image.version="${ZBX_VERSION}" - -STOPSIGNAL SIGTERM - -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/java_gateway/sbin/ /usr/sbin/zabbix_java/ -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/java_gateway/conf/ ${ZABBIX_CONF_DIR}/ - -RUN set -eux && \ - ARCH_SUFFIX="$(apk --print-arch)"; \ - case "$ARCH_SUFFIX" in \ - riscv64) openjdk_packages='openjdk21 openjdk21-jre-headless' ;; \ - *) openjdk_packages='openjdk21 openjdk21-jre-headless' ;; \ - esac; \ - INSTALL_PKGS="bash \ - $openjdk_packages" && \ - apk add \ - --no-cache \ - --clean-protected \ - ${INSTALL_PKGS} && \ - addgroup \ - --system \ - --gid 1995 \ - zabbix && \ - adduser \ - --system \ - --gecos "Zabbix monitoring system" \ - --disabled-password \ - --uid 1997 \ - --ingroup zabbix \ - --shell /sbin/nologin \ - --home ${ZABBIX_USER_HOME_DIR} \ - zabbix && \ - mkdir -p ${ZABBIX_CONF_DIR}/ \ - /usr/sbin/zabbix_java/ext_lib/ && \ - FIX_PERM_LIST="\ - ${ZABBIX_CONF_DIR}/ \ - /usr/sbin/zabbix_java/ext_lib" && \ - chown --quiet -R zabbix:0 ${FIX_PERM_LIST} && \ - chmod -R g=u ${FIX_PERM_LIST} - -RUN --mount=from=entrypoints,target=/tmp/entrypoints,ro \ - set -eux && \ - install -d /usr/lib/docker-entrypoint && \ - install -m 0755 /tmp/entrypoints/java-gateway.sh /usr/bin/docker-entrypoint.sh && \ - install -m 0644 /tmp/entrypoints/lib/*.sh /usr/lib/docker-entrypoint/ - -EXPOSE 10052/tcp - -USER 1997 - -WORKDIR ${ZABBIX_USER_HOME_DIR} - -ENTRYPOINT ["docker-entrypoint.sh"] diff --git a/Dockerfiles/java-gateway/alpine/README.md b/Dockerfiles/java-gateway/alpine/README.md deleted file mode 120000 index 32d46ee8..00000000 --- a/Dockerfiles/java-gateway/alpine/README.md +++ /dev/null @@ -1 +0,0 @@ -../README.md \ No newline at end of file diff --git a/Dockerfiles/java-gateway/alpine/build.sh b/Dockerfiles/java-gateway/alpine/build.sh deleted file mode 120000 index 46b20313..00000000 --- a/Dockerfiles/java-gateway/alpine/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../../build.sh \ No newline at end of file diff --git a/Dockerfiles/java-gateway/centos/.dockerignore b/Dockerfiles/java-gateway/centos/.dockerignore deleted file mode 100644 index 88a84e55..00000000 --- a/Dockerfiles/java-gateway/centos/.dockerignore +++ /dev/null @@ -1 +0,0 @@ -build.sh diff --git a/Dockerfiles/java-gateway/centos/Dockerfile b/Dockerfiles/java-gateway/centos/Dockerfile deleted file mode 100644 index 7490d73c..00000000 --- a/Dockerfiles/java-gateway/centos/Dockerfile +++ /dev/null @@ -1,83 +0,0 @@ -# syntax=docker/dockerfile:1.6 -ARG OS_BASE_IMAGE=quay.io/centos/centos:stream10-minimal -ARG MAJOR_VERSION=7.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.12 -ARG BUILD_BASE_IMAGE=zabbix-build-mysql:centos-${ZBX_VERSION} - -FROM ${BUILD_BASE_IMAGE} AS builder - -FROM ${OS_BASE_IMAGE} - -ARG MAJOR_VERSION -ARG ZBX_VERSION -ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git - -ENV TERM=xterm \ - ZBX_VERSION=${ZBX_VERSION} \ - ZBX_SOURCES=${ZBX_SOURCES} \ - ZABBIX_USER_HOME_DIR=/var/lib/zabbix \ - ZABBIX_CONF_DIR=/etc/zabbix - -LABEL org.opencontainers.image.authors="Alexey Pustovalov " \ - org.opencontainers.image.description="Zabbix Java Gateway performs native support for monitoring JMX applications" \ - org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ - org.opencontainers.image.licenses="AGPL v3.0" \ - org.opencontainers.image.source="${ZBX_SOURCES}" \ - org.opencontainers.image.title="Zabbix Java Gateway" \ - org.opencontainers.image.url="https://zabbix.com/" \ - org.opencontainers.image.vendor="Zabbix SIA" \ - org.opencontainers.image.version="${ZBX_VERSION}" - -STOPSIGNAL SIGTERM - -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/java_gateway/sbin/ /usr/sbin/zabbix_java/ -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/java_gateway/conf/ ${ZABBIX_CONF_DIR}/ - -RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ - --mount=type=tmpfs,target=/var/cache/yum/ \ - set -eux && \ - INSTALL_PKGS="bash \ - shadow-utils \ - java-21-openjdk-headless" && \ - microdnf -y install \ - --disablerepo="*" \ - --enablerepo="baseos" \ - --enablerepo="appstream" \ - --setopt=install_weak_deps=0 \ - --setopt=keepcache=0 \ - --best \ - --nodocs \ - ${INSTALL_PKGS} && \ - groupadd \ - --system \ - --gid 1995 \ - zabbix && \ - useradd \ - --system \ - --comment "Zabbix monitoring system" \ - -g zabbix \ - --uid 1997 \ - --shell /sbin/nologin \ - --home-dir ${ZABBIX_USER_HOME_DIR} \ - zabbix && \ - mkdir -p ${ZABBIX_CONF_DIR}/ \ - /usr/sbin/zabbix_java/ext_lib/ && \ - FIX_PERM_LIST="\ - ${ZABBIX_CONF_DIR}/ \ - /usr/sbin/zabbix_java/ext_lib" && \ - chown --quiet -R zabbix:0 ${FIX_PERM_LIST} && \ - chmod -R g=u ${FIX_PERM_LIST} - -RUN --mount=from=entrypoints,target=/tmp/entrypoints,ro \ - set -eux && \ - install -d /usr/lib/docker-entrypoint && \ - install -m 0755 /tmp/entrypoints/java-gateway.sh /usr/bin/docker-entrypoint.sh && \ - install -m 0644 /tmp/entrypoints/lib/*.sh /usr/lib/docker-entrypoint/ - -EXPOSE 10052/tcp - -USER 1997 - -WORKDIR ${ZABBIX_USER_HOME_DIR} - -ENTRYPOINT ["docker-entrypoint.sh"] diff --git a/Dockerfiles/java-gateway/centos/README.md b/Dockerfiles/java-gateway/centos/README.md deleted file mode 120000 index 32d46ee8..00000000 --- a/Dockerfiles/java-gateway/centos/README.md +++ /dev/null @@ -1 +0,0 @@ -../README.md \ No newline at end of file diff --git a/Dockerfiles/java-gateway/centos/build.sh b/Dockerfiles/java-gateway/centos/build.sh deleted file mode 120000 index 46b20313..00000000 --- a/Dockerfiles/java-gateway/centos/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../../build.sh \ No newline at end of file diff --git a/Dockerfiles/java-gateway/ol/.dockerignore b/Dockerfiles/java-gateway/ol/.dockerignore deleted file mode 100644 index 88a84e55..00000000 --- a/Dockerfiles/java-gateway/ol/.dockerignore +++ /dev/null @@ -1 +0,0 @@ -build.sh diff --git a/Dockerfiles/java-gateway/ol/Dockerfile b/Dockerfiles/java-gateway/ol/Dockerfile deleted file mode 100644 index 6b963c0b..00000000 --- a/Dockerfiles/java-gateway/ol/Dockerfile +++ /dev/null @@ -1,82 +0,0 @@ -# syntax=docker/dockerfile:1.6 -ARG OS_BASE_IMAGE=container-registry.oracle.com/os/oraclelinux:10-slim -ARG MAJOR_VERSION=7.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.12 -ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ol-${ZBX_VERSION} - -FROM ${BUILD_BASE_IMAGE} AS builder - -FROM ${OS_BASE_IMAGE} - -ARG MAJOR_VERSION -ARG ZBX_VERSION -ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git - -ENV TERM=xterm \ - ZBX_VERSION=${ZBX_VERSION} \ - ZBX_SOURCES=${ZBX_SOURCES} \ - ZABBIX_USER_HOME_DIR=/var/lib/zabbix \ - ZABBIX_CONF_DIR=/etc/zabbix - -LABEL org.opencontainers.image.authors="Alexey Pustovalov " \ - org.opencontainers.image.description="Zabbix Java Gateway performs native support for monitoring JMX applications" \ - org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ - org.opencontainers.image.licenses="AGPL v3.0" \ - org.opencontainers.image.source="${ZBX_SOURCES}" \ - org.opencontainers.image.title="Zabbix Java Gateway" \ - org.opencontainers.image.url="https://zabbix.com/" \ - org.opencontainers.image.vendor="Zabbix SIA" \ - org.opencontainers.image.version="${ZBX_VERSION}" - -STOPSIGNAL SIGTERM - -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/java_gateway/sbin/ /usr/sbin/zabbix_java/ -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/java_gateway/conf/ ${ZABBIX_CONF_DIR}/ - -RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ - --mount=type=tmpfs,target=/var/cache/yum/ \ - set -eux && \ - INSTALL_PKGS="bash \ - java-21-openjdk-headless" && \ - microdnf -y install \ - --disablerepo="*" \ - --enablerepo="ol10_baseos_latest" \ - --enablerepo="ol10_appstream" \ - --setopt=install_weak_deps=0 \ - --setopt=keepcache=0 \ - --best \ - --nodocs \ - ${INSTALL_PKGS} && \ - groupadd \ - --system \ - --gid 1995 \ - zabbix && \ - useradd \ - --system \ - --comment "Zabbix monitoring system" \ - -g zabbix \ - --uid 1997 \ - --shell /sbin/nologin \ - --home-dir ${ZABBIX_USER_HOME_DIR} \ - zabbix && \ - mkdir -p ${ZABBIX_CONF_DIR}/ \ - /usr/sbin/zabbix_java/ext_lib/ && \ - FIX_PERM_LIST="\ - ${ZABBIX_CONF_DIR}/ \ - /usr/sbin/zabbix_java/ext_lib" && \ - chown --quiet -R zabbix:0 ${FIX_PERM_LIST} && \ - chmod -R g=u ${FIX_PERM_LIST} - -RUN --mount=from=entrypoints,target=/tmp/entrypoints,ro \ - set -eux && \ - install -d /usr/lib/docker-entrypoint && \ - install -m 0755 /tmp/entrypoints/java-gateway.sh /usr/bin/docker-entrypoint.sh && \ - install -m 0644 /tmp/entrypoints/lib/*.sh /usr/lib/docker-entrypoint/ - -EXPOSE 10052/tcp - -USER 1997 - -WORKDIR ${ZABBIX_USER_HOME_DIR} - -ENTRYPOINT ["docker-entrypoint.sh"] diff --git a/Dockerfiles/java-gateway/ol/README.md b/Dockerfiles/java-gateway/ol/README.md deleted file mode 120000 index 32d46ee8..00000000 --- a/Dockerfiles/java-gateway/ol/README.md +++ /dev/null @@ -1 +0,0 @@ -../README.md \ No newline at end of file diff --git a/Dockerfiles/java-gateway/ol/build.sh b/Dockerfiles/java-gateway/ol/build.sh deleted file mode 120000 index 46b20313..00000000 --- a/Dockerfiles/java-gateway/ol/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../../build.sh \ No newline at end of file diff --git a/Dockerfiles/java-gateway/rhel/.dockerignore b/Dockerfiles/java-gateway/rhel/.dockerignore deleted file mode 100644 index 88a84e55..00000000 --- a/Dockerfiles/java-gateway/rhel/.dockerignore +++ /dev/null @@ -1 +0,0 @@ -build.sh diff --git a/Dockerfiles/java-gateway/rhel/Dockerfile b/Dockerfiles/java-gateway/rhel/Dockerfile deleted file mode 100644 index 17b8743f..00000000 --- a/Dockerfiles/java-gateway/rhel/Dockerfile +++ /dev/null @@ -1,103 +0,0 @@ -# syntax=docker/dockerfile:1.6 -ARG OS_BASE_IMAGE=registry.access.redhat.com/ubi10/ubi-minimal:10.2 -ARG MAJOR_VERSION=7.4 -ARG RELEASE=12 -ARG ZBX_VERSION=${MAJOR_VERSION}.12 -ARG BUILD_BASE_IMAGE=zabbix-build-mysql:rhel-${ZBX_VERSION} - -FROM ${BUILD_BASE_IMAGE} AS builder - -FROM ${OS_BASE_IMAGE} - -ARG MAJOR_VERSION -ARG RELEASE -ARG ZBX_VERSION -ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git - -ENV TERM=xterm \ - ZBX_VERSION=${ZBX_VERSION} \ - ZBX_SOURCES=${ZBX_SOURCES} \ - ZABBIX_USER_HOME_DIR=/var/lib/zabbix \ - ZABBIX_CONF_DIR=/etc/zabbix - -LABEL description="Zabbix Java Gateway performs native support for monitoring JMX applications" \ - maintainer="alexey.pustovalov@zabbix.com" \ - name="zabbix/zabbix-java-gateway-74" \ - release="${RELEASE}" \ - run="docker run --name zabbix-java-gateway -p 10052:10052 -d registry.connect.redhat.com/zabbix/zabbix-java-gateway-74:${ZBX_VERSION}" \ - summary="Zabbix Java Gateway" \ - url="https://www.zabbix.com/" \ - vendor="Zabbix SIA" \ - version="${MAJOR_VERSION}" \ - io.k8s.description="Zabbix Java Gateway performs native support for monitoring JMX applications" \ - io.k8s.display-name="Zabbix Java Gateway" \ - io.openshift.expose-services="10052:10052" \ - 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-74:${ZBX_VERSION}" \ - org.label-schema.license="AGPL v3.0" \ - org.label-schema.name="zabbix-java-gateway-rhel" \ - org.label-schema.schema-version="1.0" \ - org.label-schema.url="https://zabbix.com/" \ - org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ - org.label-schema.vcs-ref="${VCS_REF}" \ - org.label-schema.vcs-url="${ZBX_SOURCES}" \ - org.label-schema.vendor="Zabbix SIA" \ - org.label-schema.version="${ZBX_VERSION}" - -STOPSIGNAL SIGTERM - -COPY ["licenses", "/licenses"] -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/java_gateway/sbin/ /usr/sbin/zabbix_java/ -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/java_gateway/conf/ ${ZABBIX_CONF_DIR}/ - -RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ - --mount=type=tmpfs,target=/var/cache/yum/ \ - set -eux && \ - INSTALL_PKGS="bash \ - shadow-utils \ - java-21-openjdk-headless" && \ - microdnf -y install \ - --disableplugin=subscription-manager \ - --disablerepo="*" \ - --enablerepo="ubi-10-baseos-rpms" \ - --enablerepo="ubi-10-appstream-rpms" \ - --setopt=install_weak_deps=0 \ - --setopt=keepcache=0 \ - --best \ - --setopt=tsflags=nodocs \ - ${INSTALL_PKGS} && \ - groupadd \ - --system \ - --gid 1995 \ - zabbix && \ - useradd \ - --system \ - --comment "Zabbix monitoring system" \ - -g zabbix \ - --uid 1997 \ - --shell /sbin/nologin \ - --home-dir ${ZABBIX_USER_HOME_DIR} \ - zabbix && \ - mkdir -p ${ZABBIX_CONF_DIR}/ \ - /usr/sbin/zabbix_java/ext_lib/ && \ - FIX_PERM_LIST="\ - ${ZABBIX_CONF_DIR}/ \ - /usr/sbin/zabbix_java/ext_lib" && \ - chown --quiet -R zabbix:0 ${FIX_PERM_LIST} && \ - chmod -R g=u ${FIX_PERM_LIST} - -RUN --mount=from=entrypoints,target=/tmp/entrypoints,ro \ - set -eux && \ - install -d /usr/lib/docker-entrypoint && \ - install -m 0755 /tmp/entrypoints/java-gateway.sh /usr/bin/docker-entrypoint.sh && \ - install -m 0644 /tmp/entrypoints/lib/*.sh /usr/lib/docker-entrypoint/ - -EXPOSE 10052/tcp - -USER 1997 - -WORKDIR ${ZABBIX_USER_HOME_DIR} - -ENTRYPOINT ["docker-entrypoint.sh"] diff --git a/Dockerfiles/java-gateway/rhel/README.html b/Dockerfiles/java-gateway/rhel/README.html deleted file mode 100644 index 67602ccd..00000000 --- a/Dockerfiles/java-gateway/rhel/README.html +++ /dev/null @@ -1,46 +0,0 @@ -

What is Zabbix?

-

Zabbix is an enterprise-class open source distributed monitoring solution.

-

Zabbix is software that monitors numerous parameters of a network and the health and integrity of servers. Zabbix uses a flexible notification mechanism that allows users to configure e-mail based alerts for virtually any event. This allows a fast reaction to server problems. Zabbix offers excellent reporting and data visualisation features based on the stored data. This makes Zabbix ideal for capacity planning.

-

For more information and related downloads for Zabbix components, please visit zabbix.com

-

What is Zabbix Java Gateway?

-

Zabbix Java Gateway performs native support for monitoring JMX applications. Java gateway accepts incoming connection from Zabbix server or Zabbix proxy and can only be used as a "passive proxy".

-

Zabbix Java Gateway images

-

Images are updated when new releases are published.

-

How to use this image

-

Start zabbix-java-gateway

-

Start a Zabbix Java Gateway container as follows:

-
podman run \
-    --name some-zabbix-java-gateway \
-    -d registry.connect.redhat.com/zabbix/zabbix-java-gateway-74:tag
-
-

Where some-zabbix-java-gateway is the name you want to assign to your container and tag is the tag specifying the version you want.

-

Linking the container to Zabbix server or Zabbix proxy

-
podman run \
-    --name some-zabbix-java-gateway \
-    --link some-zabbix-server:zabbix-server \
-    -d registry.connect.redhat.com/zabbix/zabbix-java-gateway-74:tag
-
-

Container shell access and viewing Zabbix Java Gateway logs

-

The podman exec command allows you to run commands inside a Podman container. The following command line will give you a bash shell inside your zabbix-java-gateway container:

-
$ podman exec -ti some-zabbix-java-gateway /bin/bash
-
-

The Zabbix Java Gateway log is available through Podman's container log:

-
$ podman logs  some-zabbix-java-gateway
-
-

Environment Variables

-

When you start the zabbix-java-gateway image, you can adjust the configuration of the Zabbix Java Gateway by passing one or more environment variables on the podman run command line.

-

ZBX_SERVER

-

Comma-delimited list of IP addresses, CIDR networks or DNS names of Zabbix servers and proxies allowed to connect to Java Gateway. If unset or empty, connections are accepted from all hosts.

-

ZBX_START_POLLERS

-

This variable is specified amount of pollers. By default, value is 5.

-

ZBX_TIMEOUT

-

This variable is used to specify timeout for outgoing connections. By default, value is 3.

-

ZBX_DEBUGLEVEL

-

This variable is used to specify log level. By default, value is info. The variable allows next values: trace, debug, info, warn, error, all, off

-

ZBX_PROPERTIES_FILE

-

Name of properties file. Can be used to set additional properties using a key-value format in such a way that they are not visible on a command line or to overwrite existing ones.

-

ZBX_JAVA_OPTS

-

Additional Java Virtual Machine (JVM) options for Zabbix Java Gateway, for example -Xms128m -Xmx1g.

-

Allowed volumes for the Zabbix Java Gateway container

-

/usr/sbin/zabbix_java/ext_lib

-

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

diff --git a/Dockerfiles/java-gateway/rhel/build.sh b/Dockerfiles/java-gateway/rhel/build.sh deleted file mode 120000 index 46b20313..00000000 --- a/Dockerfiles/java-gateway/rhel/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../../build.sh \ No newline at end of file diff --git a/Dockerfiles/java-gateway/rhel/licenses/AGPL-v3.0.txt b/Dockerfiles/java-gateway/rhel/licenses/AGPL-v3.0.txt deleted file mode 100644 index be3f7b28..00000000 --- a/Dockerfiles/java-gateway/rhel/licenses/AGPL-v3.0.txt +++ /dev/null @@ -1,661 +0,0 @@ - GNU AFFERO GENERAL PUBLIC LICENSE - Version 3, 19 November 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU Affero General Public License is a free, copyleft license for -software and other kinds of works, specifically designed to ensure -cooperation with the community in the case of network server software. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -our General Public Licenses are intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - Developers that use our General Public Licenses protect your rights -with two steps: (1) assert copyright on the software, and (2) offer -you this License which gives you legal permission to copy, distribute -and/or modify the software. - - A secondary benefit of defending all users' freedom is that -improvements made in alternate versions of the program, if they -receive widespread use, become available for other developers to -incorporate. Many developers of free software are heartened and -encouraged by the resulting cooperation. However, in the case of -software used on network servers, this result may fail to come about. -The GNU General Public License permits making a modified version and -letting the public access it on a server without ever releasing its -source code to the public. - - The GNU Affero General Public License is designed specifically to -ensure that, in such cases, the modified source code becomes available -to the community. It requires the operator of a network server to -provide the source code of the modified version running there to the -users of that server. Therefore, public use of a modified version, on -a publicly accessible server, gives the public access to the source -code of the modified version. - - An older license, called the Affero General Public License and -published by Affero, was designed to accomplish similar goals. This is -a different license, not a version of the Affero GPL, but Affero has -released a new version of the Affero GPL which permits relicensing under -this license. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU Affero General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Remote Network Interaction; Use with the GNU General Public License. - - Notwithstanding any other provision of this License, if you modify the -Program, your modified version must prominently offer all users -interacting with it remotely through a computer network (if your version -supports such interaction) an opportunity to receive the Corresponding -Source of your version by providing access to the Corresponding Source -from a network server at no charge, through some standard or customary -means of facilitating copying of software. This Corresponding Source -shall include the Corresponding Source for any work covered by version 3 -of the GNU General Public License that is incorporated pursuant to the -following paragraph. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the work with which it is combined will remain governed by version -3 of the GNU General Public License. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU Affero General Public License from time to time. Such new versions -will be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU Affero General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU Affero General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU Affero General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Affero General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Affero General Public License for more details. - - You should have received a copy of the GNU Affero General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If your software can interact with users remotely through a computer -network, you should also make sure that it provides a way for users to -get its source. For example, if your program is a web application, its -interface could display a "Source" link that leads users to an archive -of the code. There are many ways you could offer source, and different -solutions will be better for different programs; see section 13 for the -specific requirements. - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU AGPL, see -. diff --git a/Dockerfiles/java-gateway/ubuntu/.dockerignore b/Dockerfiles/java-gateway/ubuntu/.dockerignore deleted file mode 100644 index 88a84e55..00000000 --- a/Dockerfiles/java-gateway/ubuntu/.dockerignore +++ /dev/null @@ -1 +0,0 @@ -build.sh diff --git a/Dockerfiles/java-gateway/ubuntu/Dockerfile b/Dockerfiles/java-gateway/ubuntu/Dockerfile deleted file mode 100644 index 1ce00afb..00000000 --- a/Dockerfiles/java-gateway/ubuntu/Dockerfile +++ /dev/null @@ -1,77 +0,0 @@ -# syntax=docker/dockerfile:1.6 -ARG OS_BASE_IMAGE=ubuntu:resolute -ARG MAJOR_VERSION=7.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.12 -ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION} - -FROM ${BUILD_BASE_IMAGE} AS builder - -FROM ${OS_BASE_IMAGE} - -ARG MAJOR_VERSION -ARG ZBX_VERSION -ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git - -ENV TERM=xterm \ - ZBX_VERSION=${ZBX_VERSION} \ - ZBX_SOURCES=${ZBX_SOURCES} \ - ZABBIX_USER_HOME_DIR=/var/lib/zabbix \ - ZABBIX_CONF_DIR=/etc/zabbix - -LABEL org.opencontainers.image.authors="Alexey Pustovalov " \ - org.opencontainers.image.description="Zabbix Java Gateway performs native support for monitoring JMX applications" \ - org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ - org.opencontainers.image.licenses="AGPL v3.0" \ - org.opencontainers.image.source="${ZBX_SOURCES}" \ - org.opencontainers.image.title="Zabbix Java Gateway" \ - org.opencontainers.image.url="https://zabbix.com/" \ - org.opencontainers.image.vendor="Zabbix SIA" \ - org.opencontainers.image.version="${ZBX_VERSION}" - -STOPSIGNAL SIGTERM - -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/java_gateway/sbin/ /usr/sbin/zabbix_java/ -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/java_gateway/conf/ ${ZABBIX_CONF_DIR}/ - -RUN --mount=type=cache,target=/var/cache/apt/,sharing=locked \ - --mount=type=cache,target=/var/lib/apt/,sharing=locked \ - set -eux && \ - INSTALL_PKGS="bash \ - openjdk-21-jre-headless" && \ - apt-get update && \ - DEBIAN_FRONTEND=noninteractive apt-get install -y \ - --no-install-recommends \ - ${INSTALL_PKGS} && \ - groupadd \ - --system \ - --gid 1995 \ - zabbix && \ - useradd \ - --system \ - --comment "Zabbix monitoring system" \ - -g zabbix \ - --uid 1997 \ - --shell /sbin/nologin \ - --home-dir ${ZABBIX_USER_HOME_DIR} \ - zabbix && \ - mkdir -p ${ZABBIX_CONF_DIR}/ \ - /usr/sbin/zabbix_java/ext_lib/ && \ - FIX_PERM_LIST="\ - ${ZABBIX_CONF_DIR}/ \ - /usr/sbin/zabbix_java/ext_lib" && \ - chown --quiet -R zabbix:0 ${FIX_PERM_LIST} && \ - chmod -R g=u ${FIX_PERM_LIST} - -RUN --mount=from=entrypoints,target=/tmp/entrypoints,ro \ - set -eux && \ - install -d /usr/lib/docker-entrypoint && \ - install -m 0755 /tmp/entrypoints/java-gateway.sh /usr/bin/docker-entrypoint.sh && \ - install -m 0644 /tmp/entrypoints/lib/*.sh /usr/lib/docker-entrypoint/ - -EXPOSE 10052/tcp - -USER 1997 - -WORKDIR ${ZABBIX_USER_HOME_DIR} - -ENTRYPOINT ["docker-entrypoint.sh"] diff --git a/Dockerfiles/java-gateway/ubuntu/README.md b/Dockerfiles/java-gateway/ubuntu/README.md deleted file mode 120000 index 32d46ee8..00000000 --- a/Dockerfiles/java-gateway/ubuntu/README.md +++ /dev/null @@ -1 +0,0 @@ -../README.md \ No newline at end of file diff --git a/Dockerfiles/java-gateway/ubuntu/build.sh b/Dockerfiles/java-gateway/ubuntu/build.sh deleted file mode 120000 index 46b20313..00000000 --- a/Dockerfiles/java-gateway/ubuntu/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../../build.sh \ No newline at end of file diff --git a/Dockerfiles/proxy-mysql/README.md b/Dockerfiles/proxy-mysql/README.md deleted file mode 100644 index be220ad2..00000000 --- a/Dockerfiles/proxy-mysql/README.md +++ /dev/null @@ -1,336 +0,0 @@ -![logo](https://assets.zabbix.com/img/logo/zabbix_logo_500x131.png) - -# What is Zabbix? - -Zabbix is an enterprise-class open source distributed monitoring solution. - -Zabbix is software that monitors numerous parameters of a network and the health and integrity of servers. Zabbix uses a flexible notification mechanism that allows users to configure e-mail based alerts for virtually any event. This allows a fast reaction to server problems. Zabbix offers excellent reporting and data visualisation features based on the stored data. This makes Zabbix ideal for capacity planning. - -For more information and related downloads for Zabbix components, please visit https://hub.docker.com/u/zabbix/ and https://zabbix.com - -# What is Zabbix proxy? - -Zabbix proxy is a process that may collect monitoring data from one or more monitored devices and send the information to the Zabbix server, essentially working on behalf of the server. All collected data is buffered locally and then transferred to the Zabbix server the proxy belongs to. - -# Zabbix proxy images - -These are the only official Zabbix proxy Docker images. They are based on Alpine Linux v3.24, Ubuntu 26.04 (resolute), CentOS Stream 10 and Oracle Linux 10 images. The available versions of Zabbix proxy are: - - Zabbix proxy 6.0 (tags: alpine-6.0-latest, ubuntu-6.0-latest, ol-6.0-latest) - Zabbix proxy 6.0.* (tags: alpine-6.0.*, ubuntu-6.0.*, ol-6.0.*) - Zabbix proxy 7.0 (tags: alpine-7.0-latest, ubuntu-7.0-latest, ol-7.0-latest) - Zabbix proxy 7.0.* (tags: alpine-7.0.*, ubuntu-7.0.*, ol-7.0.*) - Zabbix proxy 7.2 (tags: alpine-7.2-latest, ubuntu-7.2-latest, ol-7.2-latest) - Zabbix proxy 7.2.* (tags: alpine-7.2.*, ubuntu-7.2.*, ol-7.2.*) - Zabbix proxy 7.4 (tags: alpine-7.4-latest, ubuntu-7.4-latest, ol-7.4-latest, alpine-latest, ubuntu-latest, ol-latest, latest) - Zabbix proxy 7.4.* (tags: alpine-7.4.*, ubuntu-7.4.*, ol-7.4.*) - Zabbix proxy 8.0 (tags: alpine-trunk, ubuntu-trunk, ol-trunk) - -Images are updated when new releases are published. The image with ``latest`` tag is based on Alpine Linux. - -The image uses MySQL database to store collected data before sending it to Zabbix server. It uses the next procedure to start: -- Checking database availability -- If ``MYSQL_ROOT_PASSWORD`` or ``MYSQL_ALLOW_EMPTY_PASSWORD`` are specified, the instance tries to create ``MYSQL_USER`` user with ``MYSQL_PASSWORD`` to use these credentials then for Zabbix server. -- Checking of having `MYSQL_DATABASE` database. Creating `MYSQL_DATABASE` database name if it does not exist -- Checking of having `dbversion` table. Creating Zabbix proxy database schema if no `dbversion` table - -# How to use this image - -## Start `zabbix-proxy-mysql` - -Start a Zabbix proxy container as follows: - - docker run --name some-zabbix-proxy-mysql -e DB_SERVER_HOST="some-mysql-server" -e MYSQL_USER="some-user" -e MYSQL_PASSWORD="some-password" -e ZBX_HOSTNAME=some-hostname -e ZBX_SERVER_HOST=some-zabbix-server --init -d zabbix/zabbix-proxy-mysql:tag - -Where `some-zabbix-proxy-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, `some-hostname` is the hostname, it is Hostname parameter in Zabbix proxy configuration file, `some-zabbix-server` is IP or DNS name of Zabbix server and `tag` is the tag specifying the version you want. See the list above for relevant tags, or look at the [full list of tags](https://hub.docker.com/r/zabbix/zabbix-proxy-mysql/tags/). - -> [!NOTE] -> Zabbix server has possibility to execute `fping` utility to perform ICMP checks. When containers are running in rootless mode or with specific restrictions environment, you may face errors related to fping: -> `fping: Operation not permitted` -> or -> lost all packets to all resources -> in this case add `--cap-add=net_raw` to `docker run` or `podman run` commands. -> Additionally fping executing in non-root environments can require sysctl modification: -> `net.ipv4.ping_group_range=0 1995` -> where 1995 is `zabbix` GID. - -## Connects from Zabbix server (Passive proxy) - -This image exposes the standard Zabbix proxy port (10051) and can operate as Passive proxy in case `ZBX_PROXYMODE` = `1`. Start Zabbix server container like this in order to link it to the Zabbix proxy container: - -```console -$ docker run --name some-zabbix-server --link some-zabbix-proxy-mysql:zabbix-proxy-mysql --init -d zabbix/zabbix-server:latest -``` - -## Connect to Zabbix server (Active proxy) - -This image can operate as Active proxy (`default` mode). Start your application container like this in order to link Zabbix proxy to Zabbix server containers: - -```console -$ docker run --name some-zabbix-proxy-mysql --link some-zabbix-server:zabbix-server --init -d zabbix/zabbix-proxy-mysql:latest -``` - -## Container shell access and viewing Zabbix proxy logs - -The `docker exec` command allows you to run commands inside a Docker container. The following command line will give you a bash shell inside your `zabbix-proxy-mysql` container: - -```console -$ docker exec -ti some-zabbix-proxy-mysql /bin/bash -``` - -The Zabbix proxy log is available through Docker's container log: - -```console -$ docker logs some-zabbix-proxy-mysql -``` - -## Environment Variables - -When you start the `zabbix-proxy-mysql` image, you can adjust the configuration of the Zabbix proxy by passing one or more environment variables on the `docker run` command line. - -### `ZBX_PROXYMODE` - -The variable allows to switch Zabbix proxy mode. By default, value is `0` - active proxy. Allowed values are `0` - active proxy and `1` - passive proxy. - -### `ZBX_HOSTNAME` - -This variable is unique, case sensitive hostname. By default, value is `zabbix-proxy-mysql` of the container. It is ``Hostname`` parameter in ``zabbix_proxy.conf``. - -### `ZBX_SERVER_HOST` - -This variable is IP or DNS name of Zabbix server. By default, value is `zabbix-server`. It is ``Server`` parameter in ``zabbix_proxy.conf``. For a non-default port, append it to the host using ``host:port`` syntax. - -### `DB_SERVER_HOST` - -This variable is IP or DNS name of MySQL server. By default, value is 'mysql-server' - -### `DB_SERVER_PORT` - -This variable is port of MySQL server. By default, value is '3306'. - -### `MYSQL_USER`, `MYSQL_PASSWORD`, `MYSQL_USER_FILE`, `MYSQL_PASSWORD_FILE` - -These variables are used by Zabbix proxy to connect to Zabbix database. With the `_FILE` variables you can instead provide the path to a file which contains the user / the password instead. Without Docker Swarm or Kubernetes you also have to map the files. Those are exclusive so you can just provide one type - either `MYSQL_USER` or `MYSQL_USER_FILE`! - -```console -docker run --name some-zabbix-proxy-mysql -e DB_SERVER_HOST="some-mysql-server" -v ./.MYSQL_USER:/run/secrets/MYSQL_USER -e MYSQL_USER_FILE=/run/secrets/MYSQL_USER -v ./.MYSQL_PASSWORD:/run/secrets/MYSQL_PASSWORD -e MYSQL_PASSWORD_FILE=/var/run/secrets/MYSQL_PASSWORD -e ZBX_HOSTNAME=some-hostname -e ZBX_SERVER_HOST=some-zabbix-server --init -d zabbix/zabbix-proxy-mysql:tag -``` - -With Docker Swarm or Kubernetes this works with secrets. That way it is replicated in your cluster! - -```console -printf "zabbix" | docker secret create MYSQL_USER - -printf "zabbix" | docker secret create MYSQL_PASSWORD - -docker run --name some-zabbix-proxy-mysql -e DB_SERVER_HOST="some-mysql-server" -e MYSQL_USER_FILE=/run/secrets/MYSQL_USER -e MYSQL_PASSWORD_FILE=/run/secrets/MYSQL_PASSWORD -e ZBX_SERVER_HOST="some-zabbix-server" -e ZBX_HOSTNAME=some-hostname --init -d zabbix/zabbix-proxy-mysql:tag -``` - -This method is also applicable for `MYSQL_ROOT_PASSWORD` with `MYSQL_ROOT_PASSWORD_FILE`. - -By default, values for `MYSQL_USER` and `MYSQL_PASSWORD` are `zabbix`, `zabbix`. - -### `MYSQL_DATABASE` - -The variable is Zabbix database name. By default, value is `zabbix_proxy`. - -### `ZBX_LOADMODULE` - -The variable is list of comma separated loadable Zabbix modules. It works with volume ``/var/lib/zabbix/modules``. The syntax of the variable is ``dummy1.so,dummy2.so``. - -### ``ZBX_DEBUGLEVEL`` - -The variable is used to specify debug level. By default, value is ``3``. It is ``DebugLevel`` parameter in ``zabbix_server.conf``. Allowed values are listed below: -- ``0`` - basic information about starting and stopping of Zabbix processes; -- ``1`` - critical information -- ``2`` - error information -- ``3`` - warnings -- ``4`` - for debugging (produces lots of information) -- ``5`` - extended debugging (produces even more information) - -### `ZBX_TIMEOUT` - -The variable is used to specify timeout for processing checks. By default, value is ``4``. - -### Other variables - -Additionally the image allows to specify many other environment variables listed below: - -``` -ZBX_ALLOWUNSUPPORTEDDBVERSIONS=0 # Available since 6.0.0 -ZBX_DBTLSCONNECT= # Available since 5.0.0 -ZBX_DBTLSCAFILE= # Available since 5.0.0 -ZBX_DBTLSCERTFILE= # Available since 5.0.0 -ZBX_DBTLSKEYFILE= # Available since 5.0.0 -ZBX_DBTLSCIPHER= # Available since 5.0.0 -ZBX_DBTLSCIPHER13= # Available since 5.0.0 -ZBX_VAULT=HashiCorp # Allowed values: HashiCorp, CyberArk. Required when Vault is used. Available since 6.2.0 -ZBX_VAULTDBPATH= # Available since 5.2.0 -ZBX_VAULTPREFIX= # Available since 7.0.0 -ZBX_VAULTURL=https://127.0.0.1:8200 # Available since 5.2.0 -VAULT_TOKEN= # Available since 5.2.0 -ZBX_VAULTTLSCERTFILE= # Available since 6.2.0 -ZBX_VAULTTLSKEYFILE= # Available since 6.2.0 -ZBX_ENABLEREMOTECOMMANDS=0 # Available since 3.4.0 -ZBX_LOGREMOTECOMMANDS=0 # Available since 3.4.0 -ZBX_HOSTNAMEITEM=system.hostname -ZBX_SOURCEIP= -ZBX_PROXYLOCALBUFFER=0 -ZBX_PROXYOFFLINEBUFFER=1 -ZBX_PROXYBUFFERMODE=disk # Available since 7.0.0 -ZBX_PROXYMEMORYBUFFERAGE=0 # Available since 7.0.0 -ZBX_PROXYMEMORYBUFFERSIZE=0 # Available since 7.0.0 -ZBX_PROXYCONFIGFREQUENCY=10 # Available since 6.4.0 -ZBX_DATASENDERFREQUENCY=1 -ZBX_MAXCONCURRENTCHECKSPERPOLLER=1000 # Available since 7.0.0 -ZBX_STARTAGENTPOLLERS=1 # Available since 7.0.0 -ZBX_STARTHTTPAGENTPOLLERS=1 # Available since 7.0.0 -ZBX_STARTPOLLERS=5 -ZBX_STARTPREPROCESSORS=16 # Available since 4.2.0 -ZBX_STARTIPMIPOLLERS=0 -ZBX_STARTPOLLERSUNREACHABLE=1 -ZBX_STARTTRAPPERS=5 -ZBX_STARTPINGERS=1 -ZBX_STARTDISCOVERERS=5 -ZBX_STARTHTTPPOLLERS=1 -ZBX_STARTODBCPOLLERS=1 # Available since 6.0.0 -ZBX_JAVAGATEWAY=zabbix-java-gateway -ZBX_JAVAGATEWAYPORT=10052 -ZBX_STARTJAVAPOLLERS=0 -ZBX_STATSALLOWEDIP= # Available since 4.0.5 -ZBX_STARTVMWARECOLLECTORS=0 -ZBX_VMWAREFREQUENCY=60 -ZBX_VMWAREPERFFREQUENCY=60 -ZBX_VMWARECACHESIZE=8M -ZBX_VMWARETIMEOUT=10 -ZBX_ENABLE_SNMP_TRAPS=false -ZBX_LISTENIP= -ZBX_LISTENPORT=10051 -ZBX_LISTENBACKLOG= -ZBX_HOUSEKEEPINGFREQUENCY=1 -ZBX_CACHESIZE=32M -ZBX_STARTDBSYNCERS=4 -ZBX_HISTORYCACHESIZE=16M -ZBX_HISTORYINDEXCACHESIZE=4M -ZBX_TRAPPERTIMEOUT=300 -ZBX_UNREACHABLEPERIOD=45 -ZBX_UNAVAILABLEDELAY=60 -ZBX_UNREACHABLEDELAY=15 -ZBX_LOGSLOWQUERIES=3000 -ZBX_TLSLISTEN= # Available since 7.4.0 -ZBX_TLSCONNECT=unencrypted -ZBX_TLSACCEPT=unencrypted -ZBX_TLSCAFILE= -ZBX_TLSCA= -ZBX_TLSCRLFILE= -ZBX_TLSCRL= -ZBX_TLSSERVERCERTISSUER= -ZBX_TLSSERVERCERTSUBJECT= -ZBX_TLSCERTFILE= -ZBX_TLSCERT= -ZBX_TLSKEYFILE= -ZBX_TLSKEY= -ZBX_TLSPSKIDENTITY= -ZBX_TLSPSKFILE= -ZBX_TLSPSK= -ZBX_TLSCIPHERALL= # Available since 4.4.7 -ZBX_TLSCIPHERALL13= # Available since 4.4.7 -ZBX_TLSCIPHERCERT= # Available since 4.4.7 -ZBX_TLSCIPHERCERT13= # Available since 4.4.7 -ZBX_TLSCIPHERPSK= # Available since 4.4.7 -ZBX_TLSCIPHERPSK13= # Available since 4.4.7 -ZBX_WEBDRIVERURL= # Available since 7.0.0 -ZBX_STARTBROWSERPOLLERS=1 # Available since 7.0.0 -ZBX_STARTSNMPPOLLERS=1 # Available since 7.0.0 - -``` - -Default values of these variables are specified after equal sign. - -The allowed variables are identical of parameters in official ``zabbix_proxy.conf``. For example, ``ZBX_LOGSLOWQUERIES`` = ``LogSlowQueries``. - -Please use official documentation for [``zabbix_proxy.conf``](https://www.zabbix.com/documentation/current/manual/appendix/config/zabbix_proxy) to get more information about the variables. - -## Allowed volumes for the Zabbix proxy container - -### ``/usr/lib/zabbix/externalscripts`` - -The volume is used by External checks (type of items). It is `ExternalScripts` parameter in ``zabbix_proxy.conf``. - -### ``/var/lib/zabbix/modules`` - -The volume allows load additional modules and extend Zabbix proxy using ``LoadModule`` feature. - -### ``/var/lib/zabbix/enc`` - -The volume is used to store TLS related files. These file names are specified using ``ZBX_TLSCAFILE``, ``ZBX_TLSCRLFILE``, ``ZBX_TLSCERTFILE``, ``ZBX_TLSKEYFILE`` and ``ZBX_TLSPSKFILE`` variables. Additionally it is possible to use environment variables ``ZBX_TLSCA``, ``ZBX_TLSCRL``, ``ZBX_TLSCERT``, ``ZBX_TLSKEY`` and ``ZBX_TLSPSK`` with plaintext values. - -### ``/var/lib/zabbix/ssh_keys`` - -The volume is used as location of public and private keys for SSH checks and actions. It is `SSHKeyLocation` parameter in ``zabbix_proxy.conf``. - -### ``/var/lib/zabbix/ssl/certs`` - -The volume is used as location of SSL client certificate files for client authentication. It is `SSLCertLocation` parameter in ``zabbix_proxy.conf``. - -### ``/var/lib/zabbix/ssl/keys`` - -The volume is used as location of SSL private key files for client authentication. It is `SSLKeyLocation` parameter in ``zabbix_proxy.conf``. - -### ``/var/lib/zabbix/ssl/ssl_ca`` - -The volume is used as location of certificate authority (CA) files for SSL server certificate verification. It is `SSLCALocation` parameter in ``zabbix_proxy.conf``. - -### ``/var/lib/zabbix/snmptraps`` - -The volume is used as location of ``snmptraps.log`` file. It could be shared by ``zabbix-snmptraps`` container and inherited using `volumes_from` Docker option while creating new instance of Zabbix proxy. -SNMP traps processing feature could be enabled using shared volume and switched ``ZBX_ENABLE_SNMP_TRAPS`` environment variable to `true`. - -### ``/var/lib/zabbix/mibs`` - -The volume allows to add new MIB files. It does not support subdirectories, all MIBs must be placed in ``/var/lib/zabbix/mibs``. - -# The image variants - -The `zabbix-proxy-mysql` images come in many flavors, each designed for a specific use case. - -## `zabbix-proxy-mysql:alpine-` - -This image is based on the popular [Alpine Linux project](http://alpinelinux.org), available in [the `alpine` official image](https://hub.docker.com/_/alpine). Alpine Linux is much smaller than most distribution base images (~5MB), and thus leads to much slimmer images in general. - -This variant is highly recommended when final image size being as small as possible is desired. The main caveat to note is that it does use [musl libc](http://www.musl-libc.org) instead of [glibc and friends](http://www.etalabs.net/compare_libcs.html), so certain software might run into issues depending on the depth of their libc requirements. However, most software doesn't have an issue with this, so this variant is usually a very safe choice. See [this Hacker News comment thread](https://news.ycombinator.com/item?id=10782897) for more discussion of the issues that might arise and some pro/con comparisons of using Alpine-based images. - -To minimize image size, it's uncommon for additional related tools (such as `git` or `bash`) to be included in Alpine-based images. Using this image as a base, add the things you need in your own Dockerfile (see the [`alpine` image description](https://hub.docker.com/_/alpine/) for examples of how to install packages if you are unfamiliar). - -## `zabbix-proxy-mysql:ubuntu-` - -This is the defacto image. If you are unsure about what your needs are, you probably want to use this one. It is designed to be used both as a throw away container (mount your source code and start the container to start your app), as well as the base to build other images off of. - -## `zabbix-proxy-mysql:ol-` - -Oracle Linux is an open-source operating system available under the GNU General Public License (GPLv2). Suitable for general purpose or Oracle workloads, it benefits from rigorous testing of more than 128,000 hours per day with real-world workloads and includes unique innovations such as Ksplice for zero-downtime kernel patching, DTrace for real-time diagnostics, the powerful Btrfs file system, and more. - -# User Feedback - -## Documentation - -Documentation for this image is stored in the [`proxy-mysql/` directory](https://github.com/zabbix/zabbix-docker/tree/7.4/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.4/README.md) before attempting a pull request. - -## Issues - -If you have any problems with or questions about this image, please contact us through a [GitHub issue](https://github.com/zabbix/zabbix-docker/issues). - -### Known issues - -## Contributing - -You are invited to contribute new features, fixes, or updates, large or small; we are always thrilled to receive pull requests, and do our best to process them as fast as we can. - -Before you start to code, we recommend discussing your plans through a [GitHub issue](https://github.com/zabbix/zabbix-docker/issues), especially for more ambitious contributions. This gives other contributors a chance to point you in the right direction, give you feedback on your design, and help you find out if someone else is working on the same thing. - -## License - -Starting from Zabbix version 7.0, all subsequent Zabbix versions will be released under the GNU Affero General Public License version 3 (AGPLv3). -You can modify the relevant version and propagate such modified version under the terms of the AGPLv3 as published by the Free Software Foundation. -For additional details, including answers to common questions about the AGPLv3, see the generic FAQ from the [Free Software Foundation](http://www.fsf.org/licenses/gpl-faq.html). - -Zabbix is Open Source Software, however, if you use Zabbix in a commercial context we kindly ask you to support the development of Zabbix by purchasing some level of technical support. -All previous Zabbix software versions up to 6.4 are released under the GNU General Public License version 2 (GPLv2). The formal terms of the GPLv2 and AGPLv3 can be found at http://www.fsf.org/licenses/. diff --git a/Dockerfiles/proxy-mysql/alpine/.dockerignore b/Dockerfiles/proxy-mysql/alpine/.dockerignore deleted file mode 100644 index 88a84e55..00000000 --- a/Dockerfiles/proxy-mysql/alpine/.dockerignore +++ /dev/null @@ -1 +0,0 @@ -build.sh diff --git a/Dockerfiles/proxy-mysql/alpine/Dockerfile b/Dockerfiles/proxy-mysql/alpine/Dockerfile deleted file mode 100644 index a6e8fc27..00000000 --- a/Dockerfiles/proxy-mysql/alpine/Dockerfile +++ /dev/null @@ -1,135 +0,0 @@ -# syntax=docker/dockerfile:1.6 -ARG OS_BASE_IMAGE=alpine:3.24 -ARG MAJOR_VERSION=7.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.12 -ARG BUILD_BASE_IMAGE=zabbix-build-mysql:alpine-${ZBX_VERSION} - -FROM ${BUILD_BASE_IMAGE} AS builder - -FROM ${OS_BASE_IMAGE} - -ARG MAJOR_VERSION -ARG ZBX_VERSION -ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git - -ENV TERM=xterm \ - ZBX_VERSION=${ZBX_VERSION} \ - ZBX_SOURCES=${ZBX_SOURCES} \ - MIBDIRS=/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL \ - NMAP_PRIVILEGED= \ - MARIADB_TLS_DISABLE_PEER_VERIFICATION=1 \ - ZABBIX_USER_HOME_DIR=/var/lib/zabbix \ - ZABBIX_CONF_DIR=/etc/zabbix - -ENV DB_ENGINE=mariadb \ - ZBX_DB_NAME=dummy_db_name \ - ZBX_FPINGLOCATION=/usr/sbin/fping \ - ZBX_LOADMODULEPATH=${ZABBIX_USER_HOME_DIR}/modules \ - ZBX_SNMPTRAPPERFILE=${ZABBIX_USER_HOME_DIR}/snmptraps/snmptraps.log \ - ZBX_SSHKEYLOCATION=${ZABBIX_USER_HOME_DIR}/ssh_keys/ \ - ZBX_SSLCERTLOCATION=${ZABBIX_USER_HOME_DIR}/ssl/certs/ \ - ZBX_SSLKEYLOCATION=${ZABBIX_USER_HOME_DIR}/ssl/keys/ \ - ZBX_SSLCALOCATION=${ZABBIX_USER_HOME_DIR}/ssl/ssl_ca/ - -LABEL org.opencontainers.image.authors="Alexey Pustovalov " \ - org.opencontainers.image.description="Zabbix proxy with MySQL database support" \ - org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ - org.opencontainers.image.licenses="AGPL v3.0" \ - org.opencontainers.image.source="${ZBX_SOURCES}" \ - org.opencontainers.image.title="Zabbix proxy (MySQL)" \ - org.opencontainers.image.url="https://zabbix.com/" \ - org.opencontainers.image.vendor="Zabbix SIA" \ - org.opencontainers.image.version="${ZBX_VERSION}" - -STOPSIGNAL SIGTERM - -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/proxy/sbin/zabbix_proxy /usr/sbin/zabbix_proxy -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/general/bin/zabbix_get /usr/bin/ -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/general/bin/zabbix_sender /usr/bin/ -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/proxy/conf/ ${ZABBIX_CONF_DIR}/ -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/proxy/database/mysql/ /usr/share/doc/zabbix-proxy-mysql/ - -RUN set -eux && \ - INSTALL_PKGS="bash \ - gzip \ - tzdata \ - c-ares \ - krb5 \ - libcap \ - libcurl \ - libevent \ - libldap \ - libssh \ - libxml2 \ - mariadb-connector-c \ - net-snmp-agent-libs \ - openipmi-libs \ - openssl \ - pcre2 \ - unixodbc \ - zlib \ - fping \ - iputils \ - nmap \ - traceroute \ - mariadb-client" && \ - apk add \ - --no-cache \ - --clean-protected \ - ${INSTALL_PKGS} && \ - addgroup \ - --system \ - --gid 1995 \ - zabbix && \ - adduser \ - --system \ - --gecos "Zabbix monitoring system" \ - --disabled-password \ - --uid 1997 \ - --ingroup zabbix \ - --shell /sbin/nologin \ - --home ${ZABBIX_USER_HOME_DIR} \ - zabbix && \ - chgrp zabbix /usr/bin/nmap && \ - setcap cap_net_raw+eip /usr/bin/nmap && \ - chmod u+s /usr/sbin/fping && \ - mkdir -p ${ZABBIX_CONF_DIR} \ - ${ZABBIX_USER_HOME_DIR} \ - ${ZABBIX_USER_HOME_DIR}/enc \ - ${ZABBIX_USER_HOME_DIR}/enc_internal \ - ${ZABBIX_USER_HOME_DIR}/mibs \ - ${ZABBIX_USER_HOME_DIR}/modules \ - ${ZABBIX_USER_HOME_DIR}/snmptraps \ - ${ZABBIX_USER_HOME_DIR}/ssh_keys \ - ${ZABBIX_USER_HOME_DIR}/ssl \ - ${ZABBIX_USER_HOME_DIR}/ssl/certs \ - ${ZABBIX_USER_HOME_DIR}/ssl/keys \ - ${ZABBIX_USER_HOME_DIR}/ssl/ssl_ca \ - /usr/lib/zabbix/externalscripts \ - /usr/share/doc/zabbix-proxy-mysql && \ - FIX_PERM_LIST="\ - ${ZABBIX_CONF_DIR}/zabbix_proxy_modules.conf \ - ${ZABBIX_USER_HOME_DIR}/" && \ - chown --quiet -R zabbix:0 ${FIX_PERM_LIST} && \ - chmod -R g=u ${FIX_PERM_LIST} && \ - chown --quiet zabbix:0 ${ZABBIX_CONF_DIR}/ && \ - chmod g=u ${ZABBIX_CONF_DIR} && \ - /usr/sbin/zabbix_proxy -V - -RUN --mount=from=entrypoints,target=/tmp/entrypoints,ro \ - set -eux && \ - install -d /usr/lib/docker-entrypoint && \ - install -m 0755 /tmp/entrypoints/proxy-mysql.sh /usr/bin/docker-entrypoint.sh && \ - install -m 0644 /tmp/entrypoints/lib/*.sh /usr/lib/docker-entrypoint/ - -EXPOSE 10051/tcp - -WORKDIR ${ZABBIX_USER_HOME_DIR} - -VOLUME ["${ZABBIX_USER_HOME_DIR}/snmptraps"] - -USER 1997 - -ENTRYPOINT ["/usr/bin/docker-entrypoint.sh"] - -CMD ["/usr/sbin/zabbix_proxy", "--foreground", "-c", "/etc/zabbix/zabbix_proxy.conf"] diff --git a/Dockerfiles/proxy-mysql/alpine/README.md b/Dockerfiles/proxy-mysql/alpine/README.md deleted file mode 120000 index 32d46ee8..00000000 --- a/Dockerfiles/proxy-mysql/alpine/README.md +++ /dev/null @@ -1 +0,0 @@ -../README.md \ No newline at end of file diff --git a/Dockerfiles/proxy-mysql/alpine/build.sh b/Dockerfiles/proxy-mysql/alpine/build.sh deleted file mode 120000 index 46b20313..00000000 --- a/Dockerfiles/proxy-mysql/alpine/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../../build.sh \ No newline at end of file diff --git a/Dockerfiles/proxy-mysql/centos/.dockerignore b/Dockerfiles/proxy-mysql/centos/.dockerignore deleted file mode 100644 index 88a84e55..00000000 --- a/Dockerfiles/proxy-mysql/centos/.dockerignore +++ /dev/null @@ -1 +0,0 @@ -build.sh diff --git a/Dockerfiles/proxy-mysql/centos/Dockerfile b/Dockerfiles/proxy-mysql/centos/Dockerfile deleted file mode 100644 index 7e2a4196..00000000 --- a/Dockerfiles/proxy-mysql/centos/Dockerfile +++ /dev/null @@ -1,149 +0,0 @@ -# syntax=docker/dockerfile:1.6 -ARG OS_BASE_IMAGE=quay.io/centos/centos:stream10-minimal -ARG MAJOR_VERSION=7.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.12 -ARG BUILD_BASE_IMAGE=zabbix-build-mysql:centos-${ZBX_VERSION} - -FROM ${BUILD_BASE_IMAGE} AS builder - -FROM ${OS_BASE_IMAGE} - -ARG MAJOR_VERSION -ARG ZBX_VERSION -ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git - -ENV TERM=xterm \ - ZBX_VERSION=${ZBX_VERSION} \ - ZBX_SOURCES=${ZBX_SOURCES} \ - MIBDIRS=/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL \ - NMAP_PRIVILEGED= \ - ZABBIX_USER_HOME_DIR=/var/lib/zabbix \ - ZABBIX_CONF_DIR=/etc/zabbix - -ENV DB_ENGINE=mysql \ - ZBX_DB_NAME=dummy_db_name \ - ZBX_FPINGLOCATION=/usr/sbin/fping \ - ZBX_LOADMODULEPATH=${ZABBIX_USER_HOME_DIR}/modules \ - ZBX_SNMPTRAPPERFILE=${ZABBIX_USER_HOME_DIR}/snmptraps/snmptraps.log \ - ZBX_SSHKEYLOCATION=${ZABBIX_USER_HOME_DIR}/ssh_keys/ \ - ZBX_SSLCERTLOCATION=${ZABBIX_USER_HOME_DIR}/ssl/certs/ \ - ZBX_SSLKEYLOCATION=${ZABBIX_USER_HOME_DIR}/ssl/keys/ \ - ZBX_SSLCALOCATION=${ZABBIX_USER_HOME_DIR}/ssl/ssl_ca/ - -LABEL org.opencontainers.image.authors="Alexey Pustovalov " \ - org.opencontainers.image.description="Zabbix proxy with MySQL database support" \ - org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ - org.opencontainers.image.licenses="AGPL v3.0" \ - org.opencontainers.image.source="${ZBX_SOURCES}" \ - org.opencontainers.image.title="Zabbix proxy (MySQL)" \ - org.opencontainers.image.url="https://zabbix.com/" \ - org.opencontainers.image.vendor="Zabbix SIA" \ - org.opencontainers.image.version="${ZBX_VERSION}" - -STOPSIGNAL SIGTERM - -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/proxy/sbin/zabbix_proxy /usr/sbin/zabbix_proxy -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/general/bin/zabbix_get /usr/bin/ -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/general/bin/zabbix_sender /usr/bin/ -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/proxy/conf/ ${ZABBIX_CONF_DIR}/ -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/proxy/database/mysql/ /usr/share/doc/zabbix-proxy-mysql/ - -RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ - --mount=type=tmpfs,target=/var/cache/yum/ \ - set -eux && \ - INSTALL_PKGS="bash \ - gzip \ - shadow-utils \ - c-ares \ - file-libs \ - libevent \ - libssh \ - libxml2 \ - mysql8.4-libs \ - net-snmp-libs \ - OpenIPMI-libs \ - openldap \ - openssl \ - openssl-libs \ - pcre2 \ - unixODBC \ - zlib \ - fping \ - iputils \ - krb5-workstation \ - nmap \ - traceroute \ - mysql8.4" && \ - microdnf -y install \ - --disablerepo="*" \ - --enablerepo="extras-common" \ - --setopt=install_weak_deps=0 \ - --setopt=keepcache=0 \ - --best \ - --nodocs \ - epel-release && \ - microdnf -y install \ - --disablerepo="*" \ - --enablerepo="baseos" \ - --enablerepo="appstream" \ - --enablerepo="crb" \ - --enablerepo="epel" \ - --setopt=install_weak_deps=0 \ - --setopt=keepcache=0 \ - --best \ - --nodocs \ - ${INSTALL_PKGS} && \ - groupadd \ - --system \ - --gid 1995 \ - zabbix && \ - useradd \ - --system \ - --comment "Zabbix monitoring system" \ - -g zabbix \ - --uid 1997 \ - --shell /sbin/nologin \ - --home-dir ${ZABBIX_USER_HOME_DIR} \ - zabbix && \ - chgrp zabbix /usr/bin/nmap && \ - setcap cap_net_raw+eip /usr/bin/nmap && \ - mkdir -p ${ZABBIX_CONF_DIR} \ - ${ZABBIX_USER_HOME_DIR} \ - ${ZABBIX_USER_HOME_DIR}/enc \ - ${ZABBIX_USER_HOME_DIR}/enc_internal \ - ${ZABBIX_USER_HOME_DIR}/mibs \ - ${ZABBIX_USER_HOME_DIR}/modules \ - ${ZABBIX_USER_HOME_DIR}/snmptraps \ - ${ZABBIX_USER_HOME_DIR}/ssh_keys \ - ${ZABBIX_USER_HOME_DIR}/ssl \ - ${ZABBIX_USER_HOME_DIR}/ssl/certs \ - ${ZABBIX_USER_HOME_DIR}/ssl/keys \ - ${ZABBIX_USER_HOME_DIR}/ssl/ssl_ca \ - /usr/lib/zabbix/externalscripts \ - /usr/share/doc/zabbix-proxy-mysql && \ - FIX_PERM_LIST="\ - ${ZABBIX_CONF_DIR}/zabbix_proxy_modules.conf \ - ${ZABBIX_USER_HOME_DIR}/" && \ - chown --quiet -R zabbix:0 ${FIX_PERM_LIST} && \ - chmod -R g=u ${FIX_PERM_LIST} && \ - chown --quiet zabbix:0 ${ZABBIX_CONF_DIR}/ && \ - chmod g=u ${ZABBIX_CONF_DIR} && \ - /usr/sbin/zabbix_proxy -V - -RUN --mount=from=entrypoints,target=/tmp/entrypoints,ro \ - set -eux && \ - install -d /usr/lib/docker-entrypoint && \ - install -m 0755 /tmp/entrypoints/proxy-mysql.sh /usr/bin/docker-entrypoint.sh && \ - install -m 0644 /tmp/entrypoints/lib/*.sh /usr/lib/docker-entrypoint/ - -EXPOSE 10051/tcp - -WORKDIR ${ZABBIX_USER_HOME_DIR} - -VOLUME ["${ZABBIX_USER_HOME_DIR}/snmptraps"] - -USER 1997 - -ENTRYPOINT ["/usr/bin/docker-entrypoint.sh"] - -CMD ["/usr/sbin/zabbix_proxy", "--foreground", "-c", "/etc/zabbix/zabbix_proxy.conf"] diff --git a/Dockerfiles/proxy-mysql/centos/README.md b/Dockerfiles/proxy-mysql/centos/README.md deleted file mode 120000 index 32d46ee8..00000000 --- a/Dockerfiles/proxy-mysql/centos/README.md +++ /dev/null @@ -1 +0,0 @@ -../README.md \ No newline at end of file diff --git a/Dockerfiles/proxy-mysql/centos/build.sh b/Dockerfiles/proxy-mysql/centos/build.sh deleted file mode 120000 index 46b20313..00000000 --- a/Dockerfiles/proxy-mysql/centos/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../../build.sh \ No newline at end of file diff --git a/Dockerfiles/proxy-mysql/ol/.dockerignore b/Dockerfiles/proxy-mysql/ol/.dockerignore deleted file mode 100644 index 88a84e55..00000000 --- a/Dockerfiles/proxy-mysql/ol/.dockerignore +++ /dev/null @@ -1 +0,0 @@ -build.sh diff --git a/Dockerfiles/proxy-mysql/ol/Dockerfile b/Dockerfiles/proxy-mysql/ol/Dockerfile deleted file mode 100644 index 214a4041..00000000 --- a/Dockerfiles/proxy-mysql/ol/Dockerfile +++ /dev/null @@ -1,149 +0,0 @@ -# syntax=docker/dockerfile:1.6 -ARG OS_BASE_IMAGE=container-registry.oracle.com/os/oraclelinux:10-slim -ARG MAJOR_VERSION=7.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.12 -ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ol-${ZBX_VERSION} - -FROM ${BUILD_BASE_IMAGE} AS builder - -FROM ${OS_BASE_IMAGE} - -ARG MAJOR_VERSION -ARG ZBX_VERSION -ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git - -ENV TERM=xterm \ - ZBX_VERSION=${ZBX_VERSION} \ - ZBX_SOURCES=${ZBX_SOURCES} \ - MIBDIRS=/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL \ - NMAP_PRIVILEGED= \ - ZABBIX_USER_HOME_DIR=/var/lib/zabbix \ - ZABBIX_CONF_DIR=/etc/zabbix - -ENV DB_ENGINE=mysql \ - ZBX_DB_NAME=dummy_db_name \ - ZBX_FPINGLOCATION=/usr/sbin/fping \ - ZBX_LOADMODULEPATH=${ZABBIX_USER_HOME_DIR}/modules \ - ZBX_SNMPTRAPPERFILE=${ZABBIX_USER_HOME_DIR}/snmptraps/snmptraps.log \ - ZBX_SSHKEYLOCATION=${ZABBIX_USER_HOME_DIR}/ssh_keys/ \ - ZBX_SSLCERTLOCATION=${ZABBIX_USER_HOME_DIR}/ssl/certs/ \ - ZBX_SSLKEYLOCATION=${ZABBIX_USER_HOME_DIR}/ssl/keys/ \ - ZBX_SSLCALOCATION=${ZABBIX_USER_HOME_DIR}/ssl/ssl_ca/ - -LABEL org.opencontainers.image.authors="Alexey Pustovalov " \ - org.opencontainers.image.description="Zabbix proxy with MySQL database support" \ - org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ - org.opencontainers.image.licenses="AGPL v3.0" \ - org.opencontainers.image.source="${ZBX_SOURCES}" \ - org.opencontainers.image.title="Zabbix proxy (MySQL)" \ - org.opencontainers.image.url="https://zabbix.com/" \ - org.opencontainers.image.vendor="Zabbix SIA" \ - org.opencontainers.image.version="${ZBX_VERSION}" - -STOPSIGNAL SIGTERM - -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/proxy/sbin/zabbix_proxy /usr/sbin/zabbix_proxy -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/general/bin/zabbix_get /usr/bin/ -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/general/bin/zabbix_sender /usr/bin/ -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/proxy/conf/ ${ZABBIX_CONF_DIR}/ -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/proxy/database/mysql/ /usr/share/doc/zabbix-proxy-mysql/ - -RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ - --mount=type=tmpfs,target=/var/cache/yum/ \ - set -eux && \ - INSTALL_PKGS="bash \ - gzip \ - c-ares \ - file-libs \ - libcurl \ - libevent \ - libssh \ - libxml2 \ - mysql8.4-libs \ - net-snmp-libs \ - OpenIPMI-libs \ - openldap \ - openssl \ - openssl-libs \ - pcre2 \ - unixODBC \ - zlib \ - fping \ - iputils \ - krb5-workstation \ - nmap \ - traceroute \ - mysql8.4" && \ - microdnf -y install \ - --disablerepo="*" \ - --enablerepo="ol10_baseos_latest" \ - --setopt=install_weak_deps=0 \ - --setopt=keepcache=0 \ - --best \ - --nodocs \ - oracle-epel-release-el10 && \ - microdnf -y install \ - --disablerepo="*" \ - --enablerepo="ol10_baseos_latest" \ - --enablerepo="ol10_appstream" \ - --enablerepo="ol10_codeready_builder" \ - --enablerepo="ol10_u1_developer_EPEL" \ - --setopt=install_weak_deps=0 \ - --setopt=keepcache=0 \ - --best \ - --nodocs \ - ${INSTALL_PKGS} && \ - groupadd \ - --system \ - --gid 1995 \ - zabbix && \ - useradd \ - --system \ - --comment "Zabbix monitoring system" \ - -g zabbix \ - --uid 1997 \ - --shell /sbin/nologin \ - --home-dir ${ZABBIX_USER_HOME_DIR} \ - zabbix && \ - chgrp zabbix /usr/bin/nmap && \ - setcap cap_net_raw+eip /usr/bin/nmap && \ - mkdir -p ${ZABBIX_CONF_DIR} \ - ${ZABBIX_USER_HOME_DIR} \ - ${ZABBIX_USER_HOME_DIR}/enc \ - ${ZABBIX_USER_HOME_DIR}/enc_internal \ - ${ZABBIX_USER_HOME_DIR}/mibs \ - ${ZABBIX_USER_HOME_DIR}/modules \ - ${ZABBIX_USER_HOME_DIR}/snmptraps \ - ${ZABBIX_USER_HOME_DIR}/ssh_keys \ - ${ZABBIX_USER_HOME_DIR}/ssl \ - ${ZABBIX_USER_HOME_DIR}/ssl/certs \ - ${ZABBIX_USER_HOME_DIR}/ssl/keys \ - ${ZABBIX_USER_HOME_DIR}/ssl/ssl_ca \ - /usr/lib/zabbix/externalscripts \ - /usr/share/doc/zabbix-proxy-mysql && \ - FIX_PERM_LIST="\ - ${ZABBIX_CONF_DIR}/zabbix_proxy_modules.conf \ - ${ZABBIX_USER_HOME_DIR}/" && \ - chown --quiet -R zabbix:0 ${FIX_PERM_LIST} && \ - chmod -R g=u ${FIX_PERM_LIST} && \ - chown --quiet zabbix:0 ${ZABBIX_CONF_DIR}/ && \ - chmod g=u ${ZABBIX_CONF_DIR} && \ - /usr/sbin/zabbix_proxy -V - -RUN --mount=from=entrypoints,target=/tmp/entrypoints,ro \ - set -eux && \ - install -d /usr/lib/docker-entrypoint && \ - install -m 0755 /tmp/entrypoints/proxy-mysql.sh /usr/bin/docker-entrypoint.sh && \ - install -m 0644 /tmp/entrypoints/lib/*.sh /usr/lib/docker-entrypoint/ - -EXPOSE 10051/tcp - -WORKDIR ${ZABBIX_USER_HOME_DIR} - -VOLUME ["${ZABBIX_USER_HOME_DIR}/snmptraps"] - -USER 1997 - -ENTRYPOINT ["/usr/bin/docker-entrypoint.sh"] - -CMD ["/usr/sbin/zabbix_proxy", "--foreground", "-c", "/etc/zabbix/zabbix_proxy.conf"] diff --git a/Dockerfiles/proxy-mysql/ol/README.md b/Dockerfiles/proxy-mysql/ol/README.md deleted file mode 120000 index 32d46ee8..00000000 --- a/Dockerfiles/proxy-mysql/ol/README.md +++ /dev/null @@ -1 +0,0 @@ -../README.md \ No newline at end of file diff --git a/Dockerfiles/proxy-mysql/ol/build.sh b/Dockerfiles/proxy-mysql/ol/build.sh deleted file mode 120000 index 46b20313..00000000 --- a/Dockerfiles/proxy-mysql/ol/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../../build.sh \ No newline at end of file diff --git a/Dockerfiles/proxy-mysql/rhel/.dockerignore b/Dockerfiles/proxy-mysql/rhel/.dockerignore deleted file mode 100644 index 88a84e55..00000000 --- a/Dockerfiles/proxy-mysql/rhel/.dockerignore +++ /dev/null @@ -1 +0,0 @@ -build.sh diff --git a/Dockerfiles/proxy-mysql/rhel/Dockerfile b/Dockerfiles/proxy-mysql/rhel/Dockerfile deleted file mode 100644 index 0d4e66b3..00000000 --- a/Dockerfiles/proxy-mysql/rhel/Dockerfile +++ /dev/null @@ -1,165 +0,0 @@ -# syntax=docker/dockerfile:1.6 -ARG OS_BASE_IMAGE=registry.access.redhat.com/ubi10/ubi-minimal:10.2 -ARG MAJOR_VERSION=7.4 -ARG RELEASE=12 -ARG ZBX_VERSION=${MAJOR_VERSION}.12 -ARG BUILD_BASE_IMAGE=zabbix-build-mysql:rhel-${ZBX_VERSION} - -FROM ${BUILD_BASE_IMAGE} AS builder - -FROM ${OS_BASE_IMAGE} - -ARG MAJOR_VERSION -ARG RELEASE -ARG ZBX_VERSION -ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git - -ENV TERM=xterm \ - ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \ - MIBDIRS=/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL \ - NMAP_PRIVILEGED= \ - ZABBIX_USER_HOME_DIR=/var/lib/zabbix \ - ZABBIX_CONF_DIR=/etc/zabbix - -ENV DB_ENGINE=mysql \ - ZBX_DB_NAME=dummy_db_name \ - ZBX_FPINGLOCATION=/usr/sbin/fping \ - ZBX_LOADMODULEPATH=${ZABBIX_USER_HOME_DIR}/modules \ - ZBX_SNMPTRAPPERFILE=${ZABBIX_USER_HOME_DIR}/snmptraps/snmptraps.log \ - ZBX_SSHKEYLOCATION=${ZABBIX_USER_HOME_DIR}/ssh_keys/ \ - ZBX_SSLCERTLOCATION=${ZABBIX_USER_HOME_DIR}/ssl/certs/ \ - ZBX_SSLKEYLOCATION=${ZABBIX_USER_HOME_DIR}/ssl/keys/ \ - ZBX_SSLCALOCATION=${ZABBIX_USER_HOME_DIR}/ssl/ssl_ca/ - -LABEL description="Zabbix proxy with MySQL database support" \ - maintainer="alexey.pustovalov@zabbix.com" \ - name="zabbix/zabbix-proxy-mysql-74" \ - 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-74:${ZBX_VERSION}" \ - summary="Zabbix proxy (MySQL)" \ - url="https://www.zabbix.com/" \ - vendor="Zabbix SIA" \ - version="${MAJOR_VERSION}" \ - io.k8s.description="Zabbix proxy with MySQL database support" \ - io.k8s.display-name="Zabbix proxy (MySQL)" \ - io.openshift.expose-services="10051:10051" \ - 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-74:${ZBX_VERSION}" \ - org.label-schema.license="AGPL v3.0" \ - org.label-schema.name="zabbix-proxy-mysql-rhel" \ - org.label-schema.schema-version="1.0" \ - org.label-schema.url="https://zabbix.com/" \ - org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ - org.label-schema.vcs-ref="${VCS_REF}" \ - org.label-schema.vcs-url="${ZBX_SOURCES}" \ - org.label-schema.vendor="Zabbix SIA" \ - org.label-schema.version="${ZBX_VERSION}" - -STOPSIGNAL SIGTERM - -COPY licenses /licenses/ -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/proxy/sbin/zabbix_proxy /usr/sbin/zabbix_proxy -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/general/bin/zabbix_get /usr/bin/ -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/general/bin/zabbix_sender /usr/bin/ -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/proxy/conf/ ${ZABBIX_CONF_DIR}/ -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/proxy/database/mysql/ /usr/share/doc/zabbix-proxy-mysql/ - -RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ - --mount=type=tmpfs,target=/var/cache/yum/ \ - set -eux && \ - INSTALL_PKGS="bash \ - gzip \ - shadow-utils \ - tzdata \ - c-ares \ - libcurl-minimal \ - libevent \ - libssh \ - libxml2 \ - mysql8.4-libs \ - net-snmp-agent-libs \ - OpenIPMI-libs \ - openldap \ - openssl \ - pcre2 \ - unixODBC \ - zlib \ - fping \ - iputils \ - krb5-workstation \ - nmap \ - traceroute \ - mysql8.4" && \ - curl --tlsv1.2 -sSf -L https://dl.fedoraproject.org/pub/epel/epel-release-latest-10.noarch.rpm -o /tmp/epel-release-latest-10.noarch.rpm && \ - rpm -ivh /tmp/epel-release-latest-10.noarch.rpm && \ - rm -rf /tmp/epel-release-latest-10.noarch.rpm && \ - ARCH_SUFFIX="$(arch)"; \ - microdnf -y install \ - --disablerepo="*" \ - --enablerepo="ubi-10-baseos-rpms" \ - --enablerepo="ubi-10-appstream-rpms" \ - --enablerepo="rhel-10-for-$ARCH_SUFFIX-baseos-rpms" \ - --enablerepo="rhel-10-for-$ARCH_SUFFIX-appstream-rpms" \ - --enablerepo="codeready-builder-for-rhel-10-$ARCH_SUFFIX-rpms" \ - --enablerepo="epel" \ - --setopt=install_weak_deps=0 \ - --setopt=keepcache=0 \ - --best \ - --setopt=tsflags=nodocs \ - ${INSTALL_PKGS} && \ - groupadd \ - --system \ - --gid 1995 \ - zabbix && \ - useradd \ - --system \ - --comment "Zabbix monitoring system" \ - -g zabbix \ - --uid 1997 \ - --shell /sbin/nologin \ - --home-dir ${ZABBIX_USER_HOME_DIR} \ - zabbix && \ - chgrp zabbix /usr/bin/nmap && \ - setcap cap_net_raw+eip /usr/bin/nmap && \ - mkdir -p ${ZABBIX_CONF_DIR} \ - ${ZABBIX_USER_HOME_DIR} \ - ${ZABBIX_USER_HOME_DIR}/enc \ - ${ZABBIX_USER_HOME_DIR}/enc_internal \ - ${ZABBIX_USER_HOME_DIR}/mibs \ - ${ZABBIX_USER_HOME_DIR}/modules \ - ${ZABBIX_USER_HOME_DIR}/snmptraps \ - ${ZABBIX_USER_HOME_DIR}/ssh_keys \ - ${ZABBIX_USER_HOME_DIR}/ssl \ - ${ZABBIX_USER_HOME_DIR}/ssl/certs \ - ${ZABBIX_USER_HOME_DIR}/ssl/keys \ - ${ZABBIX_USER_HOME_DIR}/ssl/ssl_ca \ - /usr/lib/zabbix/externalscripts \ - /usr/share/doc/zabbix-proxy-mysql && \ - FIX_PERM_LIST="\ - ${ZABBIX_CONF_DIR}/zabbix_proxy_modules.conf \ - ${ZABBIX_USER_HOME_DIR}/" && \ - chown --quiet -R zabbix:0 ${FIX_PERM_LIST} && \ - chmod -R g=u ${FIX_PERM_LIST} && \ - chown --quiet zabbix:0 ${ZABBIX_CONF_DIR}/ && \ - chmod g=u ${ZABBIX_CONF_DIR} && \ - /usr/sbin/zabbix_proxy -V - -RUN --mount=from=entrypoints,target=/tmp/entrypoints,ro \ - set -eux && \ - install -d /usr/lib/docker-entrypoint && \ - install -m 0755 /tmp/entrypoints/proxy-mysql.sh /usr/bin/docker-entrypoint.sh && \ - install -m 0644 /tmp/entrypoints/lib/*.sh /usr/lib/docker-entrypoint/ - -EXPOSE 10051/tcp - -WORKDIR ${ZABBIX_USER_HOME_DIR} - -VOLUME ["${ZABBIX_USER_HOME_DIR}/snmptraps"] - -USER 1997 - -ENTRYPOINT ["/usr/bin/docker-entrypoint.sh"] - -CMD ["/usr/sbin/zabbix_proxy", "--foreground", "-c", "/etc/zabbix/zabbix_proxy.conf"] diff --git a/Dockerfiles/proxy-mysql/rhel/README.html b/Dockerfiles/proxy-mysql/rhel/README.html deleted file mode 100644 index 6359230b..00000000 --- a/Dockerfiles/proxy-mysql/rhel/README.html +++ /dev/null @@ -1,232 +0,0 @@ -

What is Zabbix?

-

Zabbix is an enterprise-class open source distributed monitoring solution.

-

Zabbix is software that monitors numerous parameters of a network and the health and integrity of servers. Zabbix uses a flexible notification mechanism that allows users to configure e-mail based alerts for virtually any event. This allows a fast reaction to server problems. Zabbix offers excellent reporting and data visualisation features based on the stored data. This makes Zabbix ideal for capacity planning.

-

For more information and related downloads for Zabbix components, please visit zabbix.com

-

What is Zabbix proxy?

-

Zabbix proxy is a process that may collect monitoring data from one or more monitored devices and send the information to the Zabbix server, essentially working on behalf of the server. All collected data is buffered locally and then transferred to the Zabbix server the proxy belongs to.

-

Zabbix proxy images

-

Images are updated when new releases are published.

-

The image uses MySQL database to store collected data before sending it to Zabbix server. It uses the next procedure to start:

-
    -
  • Checking database availability
    • -
  • If MYSQL_ROOT_PASSWORD or MYSQL_ALLOW_EMPTY_PASSWORD are specified, the instance tries to create MYSQL_USER user with MYSQL_PASSWORD to use these credentials then for Zabbix server.
    • -
  • Checking of having MYSQL_DATABASE database. Creating MYSQL_DATABASE database name if it does not exist
    • -
  • Checking of having dbversion table. Creating Zabbix proxy database schema if no dbversion table
    • -
-

How to use this image

-

Start zabbix-proxy-mysql

-

Start a Zabbix proxy container as follows:

-
podman run \
-    --name some-zabbix-proxy-mysql \
-    -e DB_SERVER_HOST="some-mysql-server" \
-    -e MYSQL_USER="some-user" \
-    -e MYSQL_PASSWORD="some-password" \
-    -e ZBX_HOSTNAME=some-hostname \
-    -e ZBX_SERVER_HOST=some-zabbix-server \
-    --init \
-    -d registry.connect.redhat.com/zabbix/zabbix-proxy-mysql-74:tag
-
-

Where some-zabbix-proxy-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, some-hostname is the hostname, it is Hostname parameter in Zabbix proxy configuration file, some-zabbix-server is IP or DNS name of Zabbix server and tag is the tag specifying the version you want.

-
-

Note: -Zabbix server has possibility to execute fping utility to perform ICMP checks. When containers are running in rootless mode or with specific restrictions environment, you may face errors related to fping: -fping: Operation not permitted -or -lost all packets to all resources -in this case add --cap-add=net_raw to podman run commands. -Additionally fping executing in non-root environments can require sysctl modification: -net.ipv4.ping_group_range=0 1995 -where 1995 is zabbix GID.

-
-

Connects from Zabbix server (Passive proxy)

-

This image exposes the standard Zabbix proxy port (10051) and can operate as Passive proxy in case ZBX_PROXYMODE = 1. Start Zabbix server container like this in order to link it to the Zabbix proxy container:

-
$ podman run \
-    --name some-zabbix-server \
-    --link some-zabbix-proxy-mysql:zabbix-proxy-mysql \
-    --init \
-    -d zabbix/zabbix-server:latest
-
-

Connect to Zabbix server (Active proxy)

-

This image can operate as Active proxy (default mode). Start your application container like this in order to link Zabbix proxy to Zabbix server containers:

-
$ podman run \
-    --name some-zabbix-proxy-mysql \
-    --link some-zabbix-server:zabbix-server \
-    --init \
-    -d registry.connect.redhat.com/zabbix/zabbix-proxy-mysql-74:latest
-
-

Container shell access and viewing Zabbix proxy logs

-

The podman exec command allows you to run commands inside a Podman container. The following command line will give you a bash shell inside your zabbix-proxy-mysql container:

-
$ podman exec -ti some-zabbix-proxy-mysql /bin/bash
-
-

The Zabbix proxy log is available through Podman's container log:

-
$ podman logs some-zabbix-proxy-mysql
-
-

Environment Variables

-

When you start the zabbix-proxy-mysql image, you can adjust the configuration of the Zabbix proxy by passing one or more environment variables on the podman run command line.

-

ZBX_PROXYMODE

-

The variable allows to switch Zabbix proxy mode. By default, value is 0 - active proxy. Allowed values are 0 - active proxy and 1 - passive proxy.

-

ZBX_HOSTNAME

-

This variable is unique, case sensitive hostname. By default, value is zabbix-proxy-mysql of the container. It is Hostname parameter in zabbix_proxy.conf.

-

ZBX_SERVER_HOST

-

This variable is IP or DNS name of Zabbix server. By default, value is zabbix-server. It is Server parameter in zabbix_proxy.conf. For a non-default port, append it to the host using host:port syntax.

-

DB_SERVER_HOST

-

This variable is IP or DNS name of MySQL server. By default, value is 'mysql-server'

-

DB_SERVER_PORT

-

This variable is port of MySQL server. By default, value is '3306'.

-

MYSQL_USER, MYSQL_PASSWORD, MYSQL_USER_FILE, MYSQL_PASSWORD_FILE

-

These variables are used by Zabbix proxy to connect to Zabbix database. With the _FILE variables you can instead provide the path to a file which contains the user / the password instead. When secrets are not managed by an orchestrator, you also have to mount the files. Those are exclusive so you can just provide one type - either MYSQL_USER or MYSQL_USER_FILE!

-
podman run \
-    --name some-zabbix-proxy-mysql \
-    -e DB_SERVER_HOST="some-mysql-server" \
-    -v ./.MYSQL_USER:/run/secrets/MYSQL_USER \
-    -e MYSQL_USER_FILE=/run/secrets/MYSQL_USER \
-    -v ./.MYSQL_PASSWORD:/run/secrets/MYSQL_PASSWORD \
-    -e MYSQL_PASSWORD_FILE=/var/run/secrets/MYSQL_PASSWORD \
-    -e ZBX_HOSTNAME=some-hostname \
-    -e ZBX_SERVER_HOST=some-zabbix-server \
-    --init \
-    -d registry.connect.redhat.com/zabbix/zabbix-proxy-mysql-74:tag
-
-

Podman secrets can be used to avoid exposing credentials in the command line:

-
printf "zabbix" | podman secret create MYSQL_USER -
-printf "zabbix" | podman secret create MYSQL_PASSWORD -
-podman run \
-    --name some-zabbix-proxy-mysql \
-    -e DB_SERVER_HOST="some-mysql-server" \
-    -e MYSQL_USER_FILE=/run/secrets/MYSQL_USER \
-    -e MYSQL_PASSWORD_FILE=/run/secrets/MYSQL_PASSWORD \
-    -e ZBX_SERVER_HOST="some-zabbix-server" \
-    -e ZBX_HOSTNAME=some-hostname \
-    --init \
-    -d registry.connect.redhat.com/zabbix/zabbix-proxy-mysql-74:tag
-
-

This method is also applicable for MYSQL_ROOT_PASSWORD with MYSQL_ROOT_PASSWORD_FILE.

-

By default, values for MYSQL_USER and MYSQL_PASSWORD are zabbix, zabbix.

-

MYSQL_DATABASE

-

The variable is Zabbix database name. By default, value is zabbix_proxy.

-

ZBX_LOADMODULE

-

The variable is list of comma separated loadable Zabbix modules. It works with volume /var/lib/zabbix/modules. The syntax of the variable is dummy1.so,dummy2.so.

-

ZBX_DEBUGLEVEL

-

The variable is used to specify debug level. By default, value is 3. It is DebugLevel parameter in zabbix_server.conf. Allowed values are listed below:

-
    -
  • 0 - basic information about starting and stopping of Zabbix processes;
    • -
  • 1 - critical information
    • -
  • 2 - error information
    • -
  • 3 - warnings
    • -
  • 4 - for debugging (produces lots of information)
    • -
  • 5 - extended debugging (produces even more information)
    • -
-

ZBX_TIMEOUT

-

The variable is used to specify timeout for processing checks. By default, value is 4.

-

Other variables

-

Additionally the image allows to specify many other environment variables listed below:

-
ZBX_ALLOWUNSUPPORTEDDBVERSIONS=0 # Available since 6.0.0
-ZBX_DBTLSCONNECT= # Available since 5.0.0
-ZBX_DBTLSCAFILE= # Available since 5.0.0
-ZBX_DBTLSCERTFILE= # Available since 5.0.0
-ZBX_DBTLSKEYFILE= # Available since 5.0.0
-ZBX_DBTLSCIPHER= # Available since 5.0.0
-ZBX_DBTLSCIPHER13= # Available since 5.0.0
-ZBX_VAULT=HashiCorp # Allowed values: HashiCorp, CyberArk. Required when Vault is used. Available since 6.2.0
-ZBX_VAULTDBPATH= # Available since 5.2.0
-ZBX_VAULTPREFIX= # Available since 7.0.0
-ZBX_VAULTURL=https://127.0.0.1:8200 # Available since 5.2.0
-VAULT_TOKEN= # Available since 5.2.0
-ZBX_VAULTTLSCERTFILE= # Available since 6.2.0
-ZBX_VAULTTLSKEYFILE= # Available since 6.2.0
-ZBX_ENABLEREMOTECOMMANDS=0 # Available since 3.4.0
-ZBX_LOGREMOTECOMMANDS=0 # Available since 3.4.0
-ZBX_HOSTNAMEITEM=system.hostname
-ZBX_SOURCEIP=
-ZBX_PROXYLOCALBUFFER=0
-ZBX_PROXYOFFLINEBUFFER=1
-ZBX_PROXYBUFFERMODE=disk # Available since 7.0.0
-ZBX_PROXYMEMORYBUFFERAGE=0 # Available since 7.0.0
-ZBX_PROXYMEMORYBUFFERSIZE=0 # Available since 7.0.0
-ZBX_PROXYCONFIGFREQUENCY=10 # Available since 6.4.0
-ZBX_DATASENDERFREQUENCY=1
-ZBX_MAXCONCURRENTCHECKSPERPOLLER=1000 # Available since 7.0.0
-ZBX_STARTAGENTPOLLERS=1 # Available since 7.0.0
-ZBX_STARTHTTPAGENTPOLLERS=1 # Available since 7.0.0
-ZBX_STARTPOLLERS=5
-ZBX_STARTPREPROCESSORS=16 # Available since 4.2.0
-ZBX_STARTIPMIPOLLERS=0
-ZBX_STARTPOLLERSUNREACHABLE=1
-ZBX_STARTTRAPPERS=5
-ZBX_STARTPINGERS=1
-ZBX_STARTDISCOVERERS=5
-ZBX_STARTHTTPPOLLERS=1
-ZBX_STARTODBCPOLLERS=1 # Available since 6.0.0
-ZBX_JAVAGATEWAY=zabbix-java-gateway
-ZBX_JAVAGATEWAYPORT=10052
-ZBX_STARTJAVAPOLLERS=0
-ZBX_STATSALLOWEDIP= # Available since 4.0.5
-ZBX_STARTVMWARECOLLECTORS=0
-ZBX_VMWAREFREQUENCY=60
-ZBX_VMWAREPERFFREQUENCY=60
-ZBX_VMWARECACHESIZE=8M
-ZBX_VMWARETIMEOUT=10
-ZBX_ENABLE_SNMP_TRAPS=false
-ZBX_LISTENIP=
-ZBX_LISTENPORT=10051
-ZBX_LISTENBACKLOG=
-ZBX_HOUSEKEEPINGFREQUENCY=1
-ZBX_CACHESIZE=32M
-ZBX_STARTDBSYNCERS=4
-ZBX_HISTORYCACHESIZE=16M
-ZBX_HISTORYINDEXCACHESIZE=4M
-ZBX_TRAPPERTIMEOUT=300
-ZBX_UNREACHABLEPERIOD=45
-ZBX_UNAVAILABLEDELAY=60
-ZBX_UNREACHABLEDELAY=15
-ZBX_LOGSLOWQUERIES=3000
-ZBX_TLSLISTEN= # Available since 7.4.0
-ZBX_TLSCONNECT=unencrypted
-ZBX_TLSACCEPT=unencrypted
-ZBX_TLSCAFILE=
-ZBX_TLSCA=
-ZBX_TLSCRLFILE=
-ZBX_TLSCRL=
-ZBX_TLSSERVERCERTISSUER=
-ZBX_TLSSERVERCERTSUBJECT=
-ZBX_TLSCERTFILE=
-ZBX_TLSCERT=
-ZBX_TLSKEYFILE=
-ZBX_TLSKEY=
-ZBX_TLSPSKIDENTITY=
-ZBX_TLSPSKFILE=
-ZBX_TLSPSK=
-ZBX_TLSCIPHERALL= # Available since 4.4.7
-ZBX_TLSCIPHERALL13= # Available since 4.4.7
-ZBX_TLSCIPHERCERT= # Available since 4.4.7
-ZBX_TLSCIPHERCERT13= # Available since 4.4.7
-ZBX_TLSCIPHERPSK= # Available since 4.4.7
-ZBX_TLSCIPHERPSK13= # Available since 4.4.7
-ZBX_WEBDRIVERURL= # Available since 7.0.0
-ZBX_STARTBROWSERPOLLERS=1 # Available since 7.0.0
-ZBX_STARTSNMPPOLLERS=1 # Available since 7.0.0
-
-
-

Default values of these variables are specified after equal sign.

-

The allowed variables are identical of parameters in official zabbix_proxy.conf. For example, ZBX_LOGSLOWQUERIES = LogSlowQueries.

-

Please use official documentation for zabbix_proxy.conf to get more information about the variables.

-

Allowed volumes for the Zabbix proxy container

-

/usr/lib/zabbix/externalscripts

-

The volume is used by External checks (type of items). It is ExternalScripts parameter in zabbix_proxy.conf.

-

/var/lib/zabbix/modules

-

The volume allows load additional modules and extend Zabbix proxy using LoadModule feature.

-

/var/lib/zabbix/enc

-

The volume is used to store TLS related files. These file names are specified using ZBX_TLSCAFILE, ZBX_TLSCRLFILE, ZBX_TLSCERTFILE, ZBX_TLSKEYFILE and ZBX_TLSPSKFILE variables. Additionally it is possible to use environment variables ZBX_TLSCA, ZBX_TLSCRL, ZBX_TLSCERT, ZBX_TLSKEY and ZBX_TLSPSK with plaintext values.

-

/var/lib/zabbix/ssh_keys

-

The volume is used as location of public and private keys for SSH checks and actions. It is SSHKeyLocation parameter in zabbix_proxy.conf.

-

/var/lib/zabbix/ssl/certs

-

The volume is used as location of SSL client certificate files for client authentication. It is SSLCertLocation parameter in zabbix_proxy.conf.

-

/var/lib/zabbix/ssl/keys

-

The volume is used as location of SSL private key files for client authentication. It is SSLKeyLocation parameter in zabbix_proxy.conf.

-

/var/lib/zabbix/ssl/ssl_ca

-

The volume is used as location of certificate authority (CA) files for SSL server certificate verification. It is SSLCALocation parameter in zabbix_proxy.conf.

-

/var/lib/zabbix/snmptraps

-

The volume is used as location of snmptraps.log file. It could be shared by zabbix-snmptraps container and inherited using volumes_from Podman option while creating new instance of Zabbix proxy. -SNMP traps processing feature could be enabled using shared volume and switched ZBX_ENABLE_SNMP_TRAPS environment variable to true.

-

/var/lib/zabbix/mibs

-

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

diff --git a/Dockerfiles/proxy-mysql/rhel/build.sh b/Dockerfiles/proxy-mysql/rhel/build.sh deleted file mode 120000 index 46b20313..00000000 --- a/Dockerfiles/proxy-mysql/rhel/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../../build.sh \ No newline at end of file diff --git a/Dockerfiles/proxy-mysql/rhel/licenses/AGPL-v3.0.txt b/Dockerfiles/proxy-mysql/rhel/licenses/AGPL-v3.0.txt deleted file mode 100644 index be3f7b28..00000000 --- a/Dockerfiles/proxy-mysql/rhel/licenses/AGPL-v3.0.txt +++ /dev/null @@ -1,661 +0,0 @@ - GNU AFFERO GENERAL PUBLIC LICENSE - Version 3, 19 November 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU Affero General Public License is a free, copyleft license for -software and other kinds of works, specifically designed to ensure -cooperation with the community in the case of network server software. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -our General Public Licenses are intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - Developers that use our General Public Licenses protect your rights -with two steps: (1) assert copyright on the software, and (2) offer -you this License which gives you legal permission to copy, distribute -and/or modify the software. - - A secondary benefit of defending all users' freedom is that -improvements made in alternate versions of the program, if they -receive widespread use, become available for other developers to -incorporate. Many developers of free software are heartened and -encouraged by the resulting cooperation. However, in the case of -software used on network servers, this result may fail to come about. -The GNU General Public License permits making a modified version and -letting the public access it on a server without ever releasing its -source code to the public. - - The GNU Affero General Public License is designed specifically to -ensure that, in such cases, the modified source code becomes available -to the community. It requires the operator of a network server to -provide the source code of the modified version running there to the -users of that server. Therefore, public use of a modified version, on -a publicly accessible server, gives the public access to the source -code of the modified version. - - An older license, called the Affero General Public License and -published by Affero, was designed to accomplish similar goals. This is -a different license, not a version of the Affero GPL, but Affero has -released a new version of the Affero GPL which permits relicensing under -this license. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU Affero General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Remote Network Interaction; Use with the GNU General Public License. - - Notwithstanding any other provision of this License, if you modify the -Program, your modified version must prominently offer all users -interacting with it remotely through a computer network (if your version -supports such interaction) an opportunity to receive the Corresponding -Source of your version by providing access to the Corresponding Source -from a network server at no charge, through some standard or customary -means of facilitating copying of software. This Corresponding Source -shall include the Corresponding Source for any work covered by version 3 -of the GNU General Public License that is incorporated pursuant to the -following paragraph. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the work with which it is combined will remain governed by version -3 of the GNU General Public License. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU Affero General Public License from time to time. Such new versions -will be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU Affero General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU Affero General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU Affero General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Affero General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Affero General Public License for more details. - - You should have received a copy of the GNU Affero General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If your software can interact with users remotely through a computer -network, you should also make sure that it provides a way for users to -get its source. For example, if your program is a web application, its -interface could display a "Source" link that leads users to an archive -of the code. There are many ways you could offer source, and different -solutions will be better for different programs; see section 13 for the -specific requirements. - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU AGPL, see -. diff --git a/Dockerfiles/proxy-mysql/ubuntu/.dockerignore b/Dockerfiles/proxy-mysql/ubuntu/.dockerignore deleted file mode 100644 index 88a84e55..00000000 --- a/Dockerfiles/proxy-mysql/ubuntu/.dockerignore +++ /dev/null @@ -1 +0,0 @@ -build.sh diff --git a/Dockerfiles/proxy-mysql/ubuntu/Dockerfile b/Dockerfiles/proxy-mysql/ubuntu/Dockerfile deleted file mode 100644 index 80819cfd..00000000 --- a/Dockerfiles/proxy-mysql/ubuntu/Dockerfile +++ /dev/null @@ -1,148 +0,0 @@ -# syntax=docker/dockerfile:1.6 -ARG OS_BASE_IMAGE=ubuntu:resolute -ARG MAJOR_VERSION=7.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.12 -ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION} - -FROM ${BUILD_BASE_IMAGE} AS builder - -FROM ${OS_BASE_IMAGE} - -ARG MAJOR_VERSION -ARG ZBX_VERSION -ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git - -ENV TERM=xterm \ - ZBX_VERSION=${ZBX_VERSION} \ - ZBX_SOURCES=${ZBX_SOURCES} \ - MIBDIRS=/var/lib/mibs/ietf:/var/lib/mibs/iana:/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL \ - NMAP_PRIVILEGED= \ - ZABBIX_USER_HOME_DIR=/var/lib/zabbix \ - ZABBIX_CONF_DIR=/etc/zabbix - -ENV DB_ENGINE=mysql \ - ZBX_DB_NAME=dummy_db_name \ - ZBX_FPINGLOCATION=/usr/bin/fping \ - ZBX_LOADMODULEPATH=${ZABBIX_USER_HOME_DIR}/modules \ - ZBX_SNMPTRAPPERFILE=${ZABBIX_USER_HOME_DIR}/snmptraps/snmptraps.log \ - ZBX_SSHKEYLOCATION=${ZABBIX_USER_HOME_DIR}/ssh_keys/ \ - ZBX_SSLCERTLOCATION=${ZABBIX_USER_HOME_DIR}/ssl/certs/ \ - ZBX_SSLKEYLOCATION=${ZABBIX_USER_HOME_DIR}/ssl/keys/ \ - ZBX_SSLCALOCATION=${ZABBIX_USER_HOME_DIR}/ssl/ssl_ca/ - -LABEL org.opencontainers.image.authors="Alexey Pustovalov " \ - org.opencontainers.image.description="Zabbix proxy with MySQL database support" \ - org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ - org.opencontainers.image.licenses="AGPL v3.0" \ - org.opencontainers.image.source="${ZBX_SOURCES}" \ - org.opencontainers.image.title="Zabbix proxy (MySQL)" \ - org.opencontainers.image.url="https://zabbix.com/" \ - org.opencontainers.image.vendor="Zabbix SIA" \ - org.opencontainers.image.version="${ZBX_VERSION}" - -STOPSIGNAL SIGTERM - -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/proxy/sbin/zabbix_proxy /usr/sbin/zabbix_proxy -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/general/bin/zabbix_get /usr/bin/ -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/general/bin/zabbix_sender /usr/bin/ -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/proxy/conf/ ${ZABBIX_CONF_DIR}/ -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/proxy/database/mysql/ /usr/share/doc/zabbix-proxy-mysql/ - -RUN --mount=type=cache,target=/var/cache/apt/,sharing=locked \ - --mount=type=cache,target=/var/lib/apt/,sharing=locked \ - set -eux && \ - INSTALL_PKGS="bash \ - ca-certificates \ - gzip \ - tzdata \ - libc6 \ - libcares2 \ - libcurl4t64 \ - libevent-2.1 \ - libevent-extra-2.1 \ - libevent-pthreads-2.1 \ - libmysqlclient24 \ - libopenipmi0t64 \ - libpcre2-8-0 \ - libsnmp40t64 \ - libssh-4 \ - libssl3t64 \ - libxml2-16 \ - openssl \ - unixodbc \ - zlib1g \ - fping \ - iputils-ping \ - krb5-user \ - nmap \ - snmp-mibs-downloader \ - traceroute \ - mysql-client" && \ - apt-get update && \ - DEBIAN_FRONTEND=noninteractive apt-get install -y \ - --no-install-recommends \ - ${INSTALL_PKGS} && \ - rm -f \ - /var/lib/mibs/ietf/VM-MIB \ - /var/lib/mibs/ietf/TRILL-OAM-MIB \ - /var/lib/mibs/ietf/SMF-MIB \ - /var/lib/mibs/ietf/ENERGY-OBJECT-MIB \ - /var/lib/mibs/ietf/POWER-ATTRIBUTES-MIB \ - /var/lib/mibs/ietf/OLSRv2-MIB \ - /var/lib/mibs/ietf/ENERGY-OBJECT-CONTEXT-MIB \ - /var/lib/mibs/ietf/BFD-STD-MIB \ - /var/lib/mibs/ietf/SNMPv2-PDU && \ - groupadd \ - --system \ - --gid 1995 \ - zabbix && \ - useradd \ - --system \ - --comment "Zabbix monitoring system" \ - -g zabbix \ - --uid 1997 \ - --shell /sbin/nologin \ - --home-dir ${ZABBIX_USER_HOME_DIR} \ - zabbix && \ - chgrp zabbix /usr/bin/nmap && \ - setcap cap_net_raw+eip /usr/bin/nmap && \ - mkdir -p ${ZABBIX_CONF_DIR} \ - ${ZABBIX_USER_HOME_DIR} \ - ${ZABBIX_USER_HOME_DIR}/enc \ - ${ZABBIX_USER_HOME_DIR}/enc_internal \ - ${ZABBIX_USER_HOME_DIR}/mibs \ - ${ZABBIX_USER_HOME_DIR}/modules \ - ${ZABBIX_USER_HOME_DIR}/snmptraps \ - ${ZABBIX_USER_HOME_DIR}/ssh_keys \ - ${ZABBIX_USER_HOME_DIR}/ssl \ - ${ZABBIX_USER_HOME_DIR}/ssl/certs \ - ${ZABBIX_USER_HOME_DIR}/ssl/keys \ - ${ZABBIX_USER_HOME_DIR}/ssl/ssl_ca \ - /usr/lib/zabbix/externalscripts \ - /usr/share/doc/zabbix-proxy-mysql && \ - FIX_PERM_LIST="\ - ${ZABBIX_CONF_DIR}/zabbix_proxy_modules.conf \ - ${ZABBIX_USER_HOME_DIR}/" && \ - chown --quiet -R zabbix:0 ${FIX_PERM_LIST} && \ - chmod -R g=u ${FIX_PERM_LIST} && \ - chown --quiet zabbix:0 ${ZABBIX_CONF_DIR}/ && \ - chmod g=u ${ZABBIX_CONF_DIR} && \ - /usr/sbin/zabbix_proxy -V - -RUN --mount=from=entrypoints,target=/tmp/entrypoints,ro \ - set -eux && \ - install -d /usr/lib/docker-entrypoint && \ - install -m 0755 /tmp/entrypoints/proxy-mysql.sh /usr/bin/docker-entrypoint.sh && \ - install -m 0644 /tmp/entrypoints/lib/*.sh /usr/lib/docker-entrypoint/ - -EXPOSE 10051/tcp - -WORKDIR ${ZABBIX_USER_HOME_DIR} - -VOLUME ["${ZABBIX_USER_HOME_DIR}/snmptraps"] - -USER 1997 - -ENTRYPOINT ["/usr/bin/docker-entrypoint.sh"] - -CMD ["/usr/sbin/zabbix_proxy", "--foreground", "-c", "/etc/zabbix/zabbix_proxy.conf"] diff --git a/Dockerfiles/proxy-mysql/ubuntu/README.md b/Dockerfiles/proxy-mysql/ubuntu/README.md deleted file mode 120000 index 32d46ee8..00000000 --- a/Dockerfiles/proxy-mysql/ubuntu/README.md +++ /dev/null @@ -1 +0,0 @@ -../README.md \ No newline at end of file diff --git a/Dockerfiles/proxy-mysql/ubuntu/build.sh b/Dockerfiles/proxy-mysql/ubuntu/build.sh deleted file mode 120000 index 46b20313..00000000 --- a/Dockerfiles/proxy-mysql/ubuntu/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../../build.sh \ No newline at end of file diff --git a/Dockerfiles/proxy-sqlite3/README.md b/Dockerfiles/proxy-sqlite3/README.md deleted file mode 100644 index 6fb9d069..00000000 --- a/Dockerfiles/proxy-sqlite3/README.md +++ /dev/null @@ -1,290 +0,0 @@ -![logo](https://assets.zabbix.com/img/logo/zabbix_logo_500x131.png) - -# What is Zabbix? - -Zabbix is an enterprise-class open source distributed monitoring solution. - -Zabbix is software that monitors numerous parameters of a network and the health and integrity of servers. Zabbix uses a flexible notification mechanism that allows users to configure e-mail based alerts for virtually any event. This allows a fast reaction to server problems. Zabbix offers excellent reporting and data visualisation features based on the stored data. This makes Zabbix ideal for capacity planning. - -For more information and related downloads for Zabbix components, please visit https://hub.docker.com/u/zabbix/ and https://zabbix.com - -# What is Zabbix proxy? - -Zabbix proxy is a process that may collect monitoring data from one or more monitored devices and send the information to the Zabbix server, essentially working on behalf of the server. All collected data is buffered locally and then transferred to the Zabbix server the proxy belongs to. - -# Zabbix proxy images - -These are the only official Zabbix proxy Docker images. They are based on Alpine Linux v3.24, Ubuntu 26.04 (resolute), CentOS Stream 10 and Oracle Linux 10 images. The available versions of Zabbix proxy are: - - Zabbix proxy 6.0 (tags: alpine-6.0-latest, ubuntu-6.0-latest, ol-6.0-latest) - Zabbix proxy 6.0.* (tags: alpine-6.0.*, ubuntu-6.0.*, ol-6.0.*) - Zabbix proxy 7.0 (tags: alpine-7.0-latest, ubuntu-7.0-latest, ol-7.0-latest) - Zabbix proxy 7.0.* (tags: alpine-7.0.*, ubuntu-7.0.*, ol-7.0.*) - Zabbix proxy 7.2 (tags: alpine-7.2-latest, ubuntu-7.2-latest, ol-7.2-latest) - Zabbix proxy 7.2.* (tags: alpine-7.2.*, ubuntu-7.2.*, ol-7.2.*) - Zabbix proxy 7.4 (tags: alpine-7.4-latest, ubuntu-7.4-latest, ol-7.4-latest, alpine-latest, ubuntu-latest, ol-latest, latest) - Zabbix proxy 7.4.* (tags: alpine-7.4.*, ubuntu-7.4.*, ol-7.4.*) - Zabbix proxy 8.0 (tags: alpine-trunk, ubuntu-trunk, ol-trunk) - -Images are updated when new releases are published. The image with ``latest`` tag is based on Alpine Linux. - -The image uses SQLite3 database to store collected data before sending it to Zabbix server. - -# How to use this image - -## Start `zabbix-proxy-sqlite3` - -Start a Zabbix proxy container as follows: - - docker run --name some-zabbix-proxy-sqlite3 -e ZBX_HOSTNAME=some-hostname -e ZBX_SERVER_HOST=some-zabbix-server --init -d zabbix/zabbix-proxy-sqlite3:tag - -Where `some-zabbix-proxy-sqlite3` is the name you want to assign to your container, `some-hostname` is the hostname, it is Hostname parameter in Zabbix proxy configuration file, `some-zabbix-server` is IP or DNS name of Zabbix server and `tag` is the tag specifying the version you want. See the list above for relevant tags, or look at the [full list of tags](https://hub.docker.com/r/zabbix/zabbix-proxy-sqlite3/tags/). - -> [!NOTE] -> Zabbix server has possibility to execute `fping` utility to perform ICMP checks. When containers are running in rootless mode or with specific restrictions environment, you may face errors related to fping: -> `fping: Operation not permitted` -> or -> lost all packets to all resources -> in this case add `--cap-add=net_raw` to `docker run` or `podman run` commands. -> Additionally fping executing in non-root environments can require sysctl modification: -> `net.ipv4.ping_group_range=0 1995` -> where 1995 is `zabbix` GID. - -## Connects from Zabbix server (Passive proxy) - -This image exposes the standard Zabbix proxy port (10051) and can operate as Passive proxy in case `ZBX_PROXYMODE` = `1`. Start Zabbix server container like this in order to link it to the Zabbix proxy container: - -```console -$ docker run --name some-zabbix-server --link some-zabbix-proxy-sqlite3:zabbix-proxy-sqlite3 --init -d zabbix/zabbix-server:latest -``` - -## Connect to Zabbix server (Active proxy) - -This image can operate as Active proxy (`default` mode). Start your application container like this in order to link Zabbix proxy to Zabbix server containters: - -```console -$ docker run --name some-zabbix-proxy-sqlite3 --link some-zabbix-server:zabbix-server --init -d zabbix/zabbix-proxy-sqlite3:latest -``` - -## Container shell access and viewing Zabbix proxy logs - -The `docker exec` command allows you to run commands inside a Docker container. The following command line will give you a bash shell inside your `zabbix-proxy-sqlite3` container: - -```console -$ docker exec -ti some-zabbix-proxy-sqlite3 /bin/bash -``` - -The Zabbix proxy log is available through Docker's container log: - -```console -$ docker logs some-zabbix-proxy-sqlite3 -``` - -## Environment Variables - -When you start the `zabbix-proxy-sqlite3` image, you can adjust the configuration of the Zabbix proxy by passing one or more environment variables on the `docker run` command line. - -### `ZBX_PROXYMODE` - -The variable allows to switch Zabbix proxy mode. Bu default, value is `0` - active proxy. Allowed values are `0` - active proxy and `1` - passive proxy. - -### `ZBX_HOSTNAME` - -This variable is unique, case sensitive hostname. By default, value is `zabbix-proxy-sqlite3` of the container. It is ``Hostname`` parameter in ``zabbix_proxy.conf``. - -### `ZBX_SERVER_HOST` - -This variable is IP or DNS name of Zabbix server. By default, value is `zabbix-server`. It is ``Server`` parameter in ``zabbix_proxy.conf``. For a non-default port, append it to the host using ``host:port`` syntax. - -### `ZBX_LOADMODULE` - -The variable is list of comma separated loadable Zabbix modules. It works with volume ``/var/lib/zabbix/modules``. The syntax of the variable is ``dummy1.so,dummy2.so``. - -### `ZBX_DEBUGLEVEL` - -The variable is used to specify debug level. By default, value is ``3``. It is ``DebugLevel`` parameter in ``zabbix_server.conf``. Allowed values are listed below: -- ``0`` - basic information about starting and stopping of Zabbix processes; -- ``1`` - critical information -- ``2`` - error information -- ``3`` - warnings -- ``4`` - for debugging (produces lots of information) -- ``5`` - extended debugging (produces even more information) - -### `ZBX_TIMEOUT` - -The variable is used to specify timeout for processing checks. By default, value is ``4``. - -### Other variables - -Additionally the image allows to specify many other environment variables listed below: - -``` -ZBX_USE_NODE_NAME_AS_DB_NAME=false -ZBX_ENABLEREMOTECOMMANDS=0 # Available since 3.4.0 -ZBX_LOGREMOTECOMMANDS=0 # Available since 3.4.0 -ZBX_SOURCEIP= -ZBX_HOSTNAMEITEM=system.hostname -ZBX_PROXYLOCALBUFFER=0 -ZBX_PROXYOFFLINEBUFFER=1 -ZBX_PROXYBUFFERMODE=disk # Available since 7.0.0 -ZBX_PROXYMEMORYBUFFERAGE=0 # Available since 7.0.0 -ZBX_PROXYMEMORYBUFFERSIZE=0 # Available since 7.0.0 -ZBX_PROXYCONFIGFREQUENCY=10 # Available since 6.4.0 -ZBX_DATASENDERFREQUENCY=1 -ZBX_MAXCONCURRENTCHECKSPERPOLLER=1000 # Available since 7.0.0 -ZBX_STARTAGENTPOLLERS=1 # Available since 7.0.0 -ZBX_STARTHTTPAGENTPOLLERS=1 # Available since 7.0.0 -ZBX_STARTPOLLERS=5 -ZBX_STARTPREPROCESSORS=16 # Available since 4.2.0 -ZBX_STARTIPMIPOLLERS=0 -ZBX_STARTPOLLERSUNREACHABLE=1 -ZBX_STARTTRAPPERS=5 -ZBX_STARTPINGERS=1 -ZBX_STARTDISCOVERERS=5 -ZBX_STARTHTTPPOLLERS=1 -ZBX_STARTODBCPOLLERS=1 # Available since 6.0.0 -ZBX_JAVAGATEWAY=zabbix-java-gateway -ZBX_JAVAGATEWAYPORT=10052 -ZBX_STARTJAVAPOLLERS=0 -ZBX_STATSALLOWEDIP= # Available since 4.0.5 -ZBX_STARTVMWARECOLLECTORS=0 -ZBX_VMWAREFREQUENCY=60 -ZBX_VMWAREPERFFREQUENCY=60 -ZBX_VMWARECACHESIZE=8M -ZBX_VMWARETIMEOUT=10 -ZBX_ENABLE_SNMP_TRAPS=false -ZBX_LISTENIP= -ZBX_LISTENPORT=10051 -ZBX_LISTENBACKLOG= -ZBX_HOUSEKEEPINGFREQUENCY=1 -ZBX_CACHESIZE=32M -ZBX_STARTDBSYNCERS=4 -ZBX_HISTORYCACHESIZE=16M -ZBX_HISTORYINDEXCACHESIZE=4M -ZBX_TRAPPERTIMEOUT=300 -ZBX_UNREACHABLEPERIOD=45 -ZBX_UNAVAILABLEDELAY=60 -ZBX_UNREACHABLEDELAY=15 -ZBX_LOGSLOWQUERIES=3000 -ZBX_TLSLISTEN= # Available since 7.4.0 -ZBX_TLSCONNECT=unencrypted -ZBX_TLSACCEPT=unencrypted -ZBX_TLSCAFILE= -ZBX_TLSCA= -ZBX_TLSCRLFILE= -ZBX_TLSCRL= -ZBX_TLSSERVERCERTISSUER= -ZBX_TLSSERVERCERTSUBJECT= -ZBX_TLSCERTFILE= -ZBX_TLSCERT= -ZBX_TLSKEYFILE= -ZBX_TLSKEY= -ZBX_TLSPSKIDENTITY= -ZBX_TLSPSKFILE= -ZBX_TLSPSK= -ZBX_TLSCIPHERALL= # Available since 4.4.7 -ZBX_TLSCIPHERALL13= # Available since 4.4.7 -ZBX_TLSCIPHERCERT= # Available since 4.4.7 -ZBX_TLSCIPHERCERT13= # Available since 4.4.7 -ZBX_TLSCIPHERPSK= # Available since 4.4.7 -ZBX_TLSCIPHERPSK13= # Available since 4.4.7 -ZBX_WEBDRIVERURL= # Available since 7.0.0 -ZBX_STARTBROWSERPOLLERS=1 # Available since 7.0.0 -ZBX_STARTSNMPPOLLERS=1 # Available since 7.0.0 -``` - -Default values of these variables are specified after equal sign. - -The allowed variables are identical of parameters in official ``zabbix_proxy.conf``. For example, ``ZBX_LOGSLOWQUERIES`` = ``LogSlowQueries``. - -Please use official documentation for [``zabbix_proxy.conf``](https://www.zabbix.com/documentation/current/manual/appendix/config/zabbix_proxy) to get more information about the variables. - -## Allowed volumes for the Zabbix proxy container - -### ``/usr/lib/zabbix/externalscripts`` - -The volume is used by External checks (type of items). It is `ExternalScripts` parameter in ``zabbix_proxy.conf``. - -### ``/var/lib/zabbix/db_data`` - -The volume stores SQLite3 database file and could be used for external database file storage. - -### ``/var/lib/zabbix/modules`` - -The volume allows load additional modules and extend Zabbix proxy using ``LoadModule`` feature. - -### ``/var/lib/zabbix/enc`` - -The volume is used to store TLS related files. These file names are specified using ``ZBX_TLSCAFILE``, ``ZBX_TLSCRLFILE``, ``ZBX_TLSCERTFILE``, ``ZBX_TLSKEYFILE`` and ``ZBX_TLSPSKFILE`` variables. Additionally it is possible to use environment variables ``ZBX_TLSCA``, ``ZBX_TLSCRL``, ``ZBX_TLSCERT``, ``ZBX_TLSKEY`` and ``ZBX_TLSPSK`` with plaintext values. - -### ``/var/lib/zabbix/ssh_keys`` - -The volume is used as location of public and private keys for SSH checks and actions. It is `SSHKeyLocation` parameter in ``zabbix_proxy.conf``. - -### ``/var/lib/zabbix/ssl/certs`` - -The volume is used as location of SSL client certificate files for client authentication. It is `SSLCertLocation` parameter in ``zabbix_proxy.conf``. - -### ``/var/lib/zabbix/ssl/keys`` - -The volume is used as location of SSL private key files for client authentication. It is `SSLKeyLocation` parameter in ``zabbix_proxy.conf``. - -### ``/var/lib/zabbix/ssl/ssl_ca`` - -The volume is used as location of certificate authority (CA) files for SSL server certificate verification. It is `SSLCALocation` parameter in ``zabbix_proxy.conf``. - -### ``/var/lib/zabbix/snmptraps`` - -The volume is used as location of ``snmptraps.log`` file. It could be shared by ``zabbix-snmptraps`` container and inherited using `volumes_from` Docker option while creating new instance of Zabbix proxy. -SNMP traps processing feature could be enabled using shared volume and switched ``ZBX_ENABLE_SNMP_TRAPS`` environment variable to `true`. - -### ``/var/lib/zabbix/mibs`` - -The volume allows to add new MIB files. It does not support subdirectories, all MIBs must be placed in ``/var/lib/zabbix/mibs``. - -# The image variants - -The `zabbix-proxy-sqlite3` images come in many flavors, each designed for a specific use case. - -## `zabbix-proxy-sqlite3:alpine-` - -This image is based on the popular [Alpine Linux project](http://alpinelinux.org), available in [the `alpine` official image](https://hub.docker.com/_/alpine). Alpine Linux is much smaller than most distribution base images (~5MB), and thus leads to much slimmer images in general. - -This variant is highly recommended when final image size being as small as possible is desired. The main caveat to note is that it does use [musl libc](http://www.musl-libc.org) instead of [glibc and friends](http://www.etalabs.net/compare_libcs.html), so certain software might run into issues depending on the depth of their libc requirements. However, most software doesn't have an issue with this, so this variant is usually a very safe choice. See [this Hacker News comment thread](https://news.ycombinator.com/item?id=10782897) for more discussion of the issues that might arise and some pro/con comparisons of using Alpine-based images. - -To minimize image size, it's uncommon for additional related tools (such as `git` or `bash`) to be included in Alpine-based images. Using this image as a base, add the things you need in your own Dockerfile (see the [`alpine` image description](https://hub.docker.com/_/alpine/) for examples of how to install packages if you are unfamiliar). - -## `zabbix-proxy-sqlite3:ubuntu-` - -This is the defacto image. If you are unsure about what your needs are, you probably want to use this one. It is designed to be used both as a throw away container (mount your source code and start the container to start your app), as well as the base to build other images off of. - -## `zabbix-proxy-sqlite3:ol-` - -Oracle Linux is an open-source operating system available under the GNU General Public License (GPLv2). Suitable for general purpose or Oracle workloads, it benefits from rigorous testing of more than 128,000 hours per day with real-world workloads and includes unique innovations such as Ksplice for zero-downtime kernel patching, DTrace for real-time diagnostics, the powerful Btrfs file system, and more. - -# User Feedback - -## Documentation - -Documentation for this image is stored in the [`proxy-sqlite3/` directory](https://github.com/zabbix/zabbix-docker/tree/7.4/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.4/README.md) before attempting a pull request. - -## Issues - -If you have any problems with or questions about this image, please contact us through a [GitHub issue](https://github.com/zabbix/zabbix-docker/issues). - -### Known issues - -## Contributing - -You are invited to contribute new features, fixes, or updates, large or small; we are always thrilled to receive pull requests, and do our best to process them as fast as we can. - -Before you start to code, we recommend discussing your plans through a [GitHub issue](https://github.com/zabbix/zabbix-docker/issues), especially for more ambitious contributions. This gives other contributors a chance to point you in the right direction, give you feedback on your design, and help you find out if someone else is working on the same thing. - -## License - -Starting from Zabbix version 7.0, all subsequent Zabbix versions will be released under the GNU Affero General Public License version 3 (AGPLv3). -You can modify the relevant version and propagate such modified version under the terms of the AGPLv3 as published by the Free Software Foundation. -For additional details, including answers to common questions about the AGPLv3, see the generic FAQ from the [Free Software Foundation](http://www.fsf.org/licenses/gpl-faq.html). - -Zabbix is Open Source Software, however, if you use Zabbix in a commercial context we kindly ask you to support the development of Zabbix by purchasing some level of technical support. -All previous Zabbix software versions up to 6.4 are released under the GNU General Public License version 2 (GPLv2). The formal terms of the GPLv2 and AGPLv3 can be found at http://www.fsf.org/licenses/. diff --git a/Dockerfiles/proxy-sqlite3/alpine/.dockerignore b/Dockerfiles/proxy-sqlite3/alpine/.dockerignore deleted file mode 100644 index 88a84e55..00000000 --- a/Dockerfiles/proxy-sqlite3/alpine/.dockerignore +++ /dev/null @@ -1 +0,0 @@ -build.sh diff --git a/Dockerfiles/proxy-sqlite3/alpine/Dockerfile b/Dockerfiles/proxy-sqlite3/alpine/Dockerfile deleted file mode 100644 index 4218ced3..00000000 --- a/Dockerfiles/proxy-sqlite3/alpine/Dockerfile +++ /dev/null @@ -1,131 +0,0 @@ -# syntax=docker/dockerfile:1.6 -ARG OS_BASE_IMAGE=alpine:3.24 -ARG MAJOR_VERSION=7.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.12 -ARG BUILD_BASE_IMAGE=zabbix-build-sqlite3:alpine-${ZBX_VERSION} - -FROM ${BUILD_BASE_IMAGE} AS builder - -FROM ${OS_BASE_IMAGE} - -ARG MAJOR_VERSION -ARG ZBX_VERSION -ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git - -ENV TERM=xterm \ - ZBX_VERSION=${ZBX_VERSION} \ - ZBX_SOURCES=${ZBX_SOURCES} \ - MIBDIRS=/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL \ - NMAP_PRIVILEGED= \ - ZABBIX_USER_HOME_DIR=/var/lib/zabbix \ - ZABBIX_CONF_DIR=/etc/zabbix - -ENV ZBX_FPINGLOCATION=/usr/sbin/fping \ - ZBX_LOADMODULEPATH=${ZABBIX_USER_HOME_DIR}/modules \ - ZBX_SNMPTRAPPERFILE=${ZABBIX_USER_HOME_DIR}/snmptraps/snmptraps.log \ - ZBX_SSHKEYLOCATION=${ZABBIX_USER_HOME_DIR}/ssh_keys/ \ - ZBX_SSLCERTLOCATION=${ZABBIX_USER_HOME_DIR}/ssl/certs/ \ - ZBX_SSLKEYLOCATION=${ZABBIX_USER_HOME_DIR}/ssl/keys/ \ - ZBX_SSLCALOCATION=${ZABBIX_USER_HOME_DIR}/ssl/ssl_ca/ - -LABEL org.opencontainers.image.authors="Alexey Pustovalov " \ - org.opencontainers.image.description="Zabbix proxy with SQLite3 database support" \ - org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ - org.opencontainers.image.licenses="AGPL v3.0" \ - org.opencontainers.image.source="${ZBX_SOURCES}" \ - org.opencontainers.image.title="Zabbix proxy (SQLite3)" \ - org.opencontainers.image.url="https://zabbix.com/" \ - org.opencontainers.image.vendor="Zabbix SIA" \ - org.opencontainers.image.version="${ZBX_VERSION}" - -STOPSIGNAL SIGTERM - -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/proxy/sbin/zabbix_proxy /usr/sbin/zabbix_proxy -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/general/bin/zabbix_get /usr/bin/ -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/general/bin/zabbix_sender /usr/bin/ -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/proxy/conf/ ${ZABBIX_CONF_DIR}/ -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/proxy/database/sqlite3/ /usr/share/doc/zabbix-proxy-sqlite3/ - -RUN set -eux && \ - INSTALL_PKGS="bash \ - tzdata \ - c-ares \ - krb5 \ - libcap \ - libcurl \ - libevent \ - libldap \ - libssh \ - libxml2 \ - net-snmp-agent-libs \ - openipmi-libs \ - openssl \ - pcre2 \ - sqlite-libs \ - unixodbc \ - zlib \ - fping \ - iputils \ - nmap \ - traceroute \ - sqlite" && \ - apk add \ - --no-cache \ - --clean-protected \ - ${INSTALL_PKGS} && \ - addgroup \ - --system \ - --gid 1995 \ - zabbix && \ - adduser \ - --system \ - --gecos "Zabbix monitoring system" \ - --disabled-password \ - --uid 1997 \ - --ingroup zabbix \ - --shell /sbin/nologin \ - --home ${ZABBIX_USER_HOME_DIR} \ - zabbix && \ - chgrp zabbix /usr/bin/nmap && \ - setcap cap_net_raw+eip /usr/bin/nmap && \ - chmod u+s /usr/sbin/fping && \ - mkdir -p ${ZABBIX_CONF_DIR} \ - ${ZABBIX_USER_HOME_DIR} \ - ${ZABBIX_USER_HOME_DIR}/db_data \ - ${ZABBIX_USER_HOME_DIR}/enc \ - ${ZABBIX_USER_HOME_DIR}/enc_internal \ - ${ZABBIX_USER_HOME_DIR}/mibs \ - ${ZABBIX_USER_HOME_DIR}/modules \ - ${ZABBIX_USER_HOME_DIR}/snmptraps \ - ${ZABBIX_USER_HOME_DIR}/ssh_keys \ - ${ZABBIX_USER_HOME_DIR}/ssl \ - ${ZABBIX_USER_HOME_DIR}/ssl/certs \ - ${ZABBIX_USER_HOME_DIR}/ssl/keys \ - ${ZABBIX_USER_HOME_DIR}/ssl/ssl_ca \ - /usr/lib/zabbix/externalscripts && \ - FIX_PERM_LIST="\ - ${ZABBIX_CONF_DIR}/zabbix_proxy_modules.conf \ - ${ZABBIX_USER_HOME_DIR}/" && \ - chown --quiet -R zabbix:0 ${FIX_PERM_LIST} && \ - chmod -R g=u ${FIX_PERM_LIST} && \ - chown --quiet zabbix:0 ${ZABBIX_CONF_DIR}/ && \ - chmod g=u ${ZABBIX_CONF_DIR} && \ - /usr/sbin/zabbix_proxy -V - -RUN --mount=from=entrypoints,target=/tmp/entrypoints,ro \ - set -eux && \ - install -d /usr/lib/docker-entrypoint && \ - install -m 0755 /tmp/entrypoints/proxy-sqlite3.sh /usr/bin/docker-entrypoint.sh && \ - install -m 0644 /tmp/entrypoints/lib/*.sh /usr/lib/docker-entrypoint/ - -EXPOSE 10051/tcp - -WORKDIR ${ZABBIX_USER_HOME_DIR} - -VOLUME ["${ZABBIX_USER_HOME_DIR}/snmptraps"] - -USER 1997 - -ENTRYPOINT ["/usr/bin/docker-entrypoint.sh"] - -CMD ["/usr/sbin/zabbix_proxy", "--foreground", "-c", "/etc/zabbix/zabbix_proxy.conf"] diff --git a/Dockerfiles/proxy-sqlite3/alpine/README.md b/Dockerfiles/proxy-sqlite3/alpine/README.md deleted file mode 120000 index 32d46ee8..00000000 --- a/Dockerfiles/proxy-sqlite3/alpine/README.md +++ /dev/null @@ -1 +0,0 @@ -../README.md \ No newline at end of file diff --git a/Dockerfiles/proxy-sqlite3/alpine/build.sh b/Dockerfiles/proxy-sqlite3/alpine/build.sh deleted file mode 120000 index 46b20313..00000000 --- a/Dockerfiles/proxy-sqlite3/alpine/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../../build.sh \ No newline at end of file diff --git a/Dockerfiles/proxy-sqlite3/centos/.dockerignore b/Dockerfiles/proxy-sqlite3/centos/.dockerignore deleted file mode 100644 index 88a84e55..00000000 --- a/Dockerfiles/proxy-sqlite3/centos/.dockerignore +++ /dev/null @@ -1 +0,0 @@ -build.sh diff --git a/Dockerfiles/proxy-sqlite3/centos/Dockerfile b/Dockerfiles/proxy-sqlite3/centos/Dockerfile deleted file mode 100644 index fb626290..00000000 --- a/Dockerfiles/proxy-sqlite3/centos/Dockerfile +++ /dev/null @@ -1,146 +0,0 @@ -# syntax=docker/dockerfile:1.6 -ARG OS_BASE_IMAGE=quay.io/centos/centos:stream10-minimal -ARG MAJOR_VERSION=7.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.12 -ARG BUILD_BASE_IMAGE=zabbix-build-sqlite3:centos-${ZBX_VERSION} - -FROM ${BUILD_BASE_IMAGE} AS builder - -FROM ${OS_BASE_IMAGE} - -ARG MAJOR_VERSION -ARG ZBX_VERSION -ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git - -ENV TERM=xterm \ - ZBX_VERSION=${ZBX_VERSION} \ - ZBX_SOURCES=${ZBX_SOURCES} \ - MIBDIRS=/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL \ - NMAP_PRIVILEGED= \ - ZABBIX_USER_HOME_DIR=/var/lib/zabbix \ - ZABBIX_CONF_DIR=/etc/zabbix - -ENV ZBX_FPINGLOCATION=/usr/sbin/fping \ - ZBX_LOADMODULEPATH=${ZABBIX_USER_HOME_DIR}/modules \ - ZBX_SNMPTRAPPERFILE=${ZABBIX_USER_HOME_DIR}/snmptraps/snmptraps.log \ - ZBX_SSHKEYLOCATION=${ZABBIX_USER_HOME_DIR}/ssh_keys/ \ - ZBX_SSLCERTLOCATION=${ZABBIX_USER_HOME_DIR}/ssl/certs/ \ - ZBX_SSLKEYLOCATION=${ZABBIX_USER_HOME_DIR}/ssl/keys/ \ - ZBX_SSLCALOCATION=${ZABBIX_USER_HOME_DIR}/ssl/ssl_ca/ - -LABEL org.opencontainers.image.authors="Alexey Pustovalov " \ - org.opencontainers.image.description="Zabbix proxy with SQLite3 database support" \ - org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ - org.opencontainers.image.licenses="AGPL v3.0" \ - org.opencontainers.image.source="${ZBX_SOURCES}" \ - org.opencontainers.image.title="Zabbix proxy (SQLite3)" \ - org.opencontainers.image.url="https://zabbix.com/" \ - org.opencontainers.image.vendor="Zabbix SIA" \ - org.opencontainers.image.version="${ZBX_VERSION}" - -STOPSIGNAL SIGTERM - -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/proxy/sbin/zabbix_proxy /usr/sbin/zabbix_proxy -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/general/bin/zabbix_get /usr/bin/ -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/general/bin/zabbix_sender /usr/bin/ -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/proxy/conf/ ${ZABBIX_CONF_DIR}/ -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/proxy/database/sqlite3/ /usr/share/doc/zabbix-proxy-sqlite3/ - -RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ - --mount=type=tmpfs,target=/var/cache/yum/ \ - set -eux && \ - INSTALL_PKGS="bash \ - gzip \ - shadow-utils \ - c-ares \ - file-libs \ - libevent \ - libssh \ - libxml2 \ - net-snmp-libs \ - OpenIPMI-libs \ - openldap \ - openssl \ - openssl-libs \ - pcre2 \ - sqlite-libs \ - unixODBC \ - zlib \ - fping \ - iputils \ - krb5-workstation \ - nmap \ - traceroute \ - sqlite" && \ - microdnf -y install \ - --disablerepo="*" \ - --enablerepo="extras-common" \ - --setopt=install_weak_deps=0 \ - --setopt=keepcache=0 \ - --best \ - --nodocs \ - epel-release && \ - microdnf -y install \ - --disablerepo="*" \ - --enablerepo="baseos" \ - --enablerepo="appstream" \ - --enablerepo="epel" \ - --setopt=install_weak_deps=0 \ - --setopt=keepcache=0 \ - --best \ - --nodocs \ - ${INSTALL_PKGS} && \ - groupadd \ - --system \ - --gid 1995 \ - zabbix && \ - useradd \ - --system \ - --comment "Zabbix monitoring system" \ - -g zabbix \ - --uid 1997 \ - --shell /sbin/nologin \ - --home-dir ${ZABBIX_USER_HOME_DIR} \ - zabbix && \ - chgrp zabbix /usr/bin/nmap && \ - setcap cap_net_raw+eip /usr/bin/nmap && \ - mkdir -p ${ZABBIX_CONF_DIR} \ - ${ZABBIX_USER_HOME_DIR} \ - ${ZABBIX_USER_HOME_DIR}/db_data \ - ${ZABBIX_USER_HOME_DIR}/enc \ - ${ZABBIX_USER_HOME_DIR}/enc_internal \ - ${ZABBIX_USER_HOME_DIR}/mibs \ - ${ZABBIX_USER_HOME_DIR}/modules \ - ${ZABBIX_USER_HOME_DIR}/snmptraps \ - ${ZABBIX_USER_HOME_DIR}/ssh_keys \ - ${ZABBIX_USER_HOME_DIR}/ssl \ - ${ZABBIX_USER_HOME_DIR}/ssl/certs \ - ${ZABBIX_USER_HOME_DIR}/ssl/keys \ - ${ZABBIX_USER_HOME_DIR}/ssl/ssl_ca \ - /usr/lib/zabbix/externalscripts && \ - FIX_PERM_LIST="\ - ${ZABBIX_CONF_DIR}/zabbix_proxy_modules.conf \ - ${ZABBIX_USER_HOME_DIR}/" && \ - chown --quiet -R zabbix:0 ${FIX_PERM_LIST} && \ - chmod -R g=u ${FIX_PERM_LIST} && \ - chown --quiet zabbix:0 ${ZABBIX_CONF_DIR}/ && \ - chmod g=u ${ZABBIX_CONF_DIR} && \ - /usr/sbin/zabbix_proxy -V - -RUN --mount=from=entrypoints,target=/tmp/entrypoints,ro \ - set -eux && \ - install -d /usr/lib/docker-entrypoint && \ - install -m 0755 /tmp/entrypoints/proxy-sqlite3.sh /usr/bin/docker-entrypoint.sh && \ - install -m 0644 /tmp/entrypoints/lib/*.sh /usr/lib/docker-entrypoint/ - -EXPOSE 10051/tcp - -WORKDIR ${ZABBIX_USER_HOME_DIR} - -VOLUME ["${ZABBIX_USER_HOME_DIR}/snmptraps"] - -USER 1997 - -ENTRYPOINT ["/usr/bin/docker-entrypoint.sh"] - -CMD ["/usr/sbin/zabbix_proxy", "--foreground", "-c", "/etc/zabbix/zabbix_proxy.conf"] diff --git a/Dockerfiles/proxy-sqlite3/centos/README.md b/Dockerfiles/proxy-sqlite3/centos/README.md deleted file mode 120000 index 32d46ee8..00000000 --- a/Dockerfiles/proxy-sqlite3/centos/README.md +++ /dev/null @@ -1 +0,0 @@ -../README.md \ No newline at end of file diff --git a/Dockerfiles/proxy-sqlite3/centos/build.sh b/Dockerfiles/proxy-sqlite3/centos/build.sh deleted file mode 120000 index 46b20313..00000000 --- a/Dockerfiles/proxy-sqlite3/centos/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../../build.sh \ No newline at end of file diff --git a/Dockerfiles/proxy-sqlite3/ol/.dockerignore b/Dockerfiles/proxy-sqlite3/ol/.dockerignore deleted file mode 100644 index 88a84e55..00000000 --- a/Dockerfiles/proxy-sqlite3/ol/.dockerignore +++ /dev/null @@ -1 +0,0 @@ -build.sh diff --git a/Dockerfiles/proxy-sqlite3/ol/Dockerfile b/Dockerfiles/proxy-sqlite3/ol/Dockerfile deleted file mode 100644 index 1f2ae450..00000000 --- a/Dockerfiles/proxy-sqlite3/ol/Dockerfile +++ /dev/null @@ -1,145 +0,0 @@ -# syntax=docker/dockerfile:1.6 -ARG OS_BASE_IMAGE=container-registry.oracle.com/os/oraclelinux:10-slim -ARG MAJOR_VERSION=7.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.12 -ARG BUILD_BASE_IMAGE=zabbix-build-sqlite3:ol-${ZBX_VERSION} - -FROM ${BUILD_BASE_IMAGE} AS builder - -FROM ${OS_BASE_IMAGE} - -ARG MAJOR_VERSION -ARG ZBX_VERSION -ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git - -ENV TERM=xterm \ - ZBX_VERSION=${ZBX_VERSION} \ - ZBX_SOURCES=${ZBX_SOURCES} \ - MIBDIRS=/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL \ - NMAP_PRIVILEGED= \ - ZABBIX_USER_HOME_DIR=/var/lib/zabbix \ - ZABBIX_CONF_DIR=/etc/zabbix - -ENV ZBX_FPINGLOCATION=/usr/sbin/fping \ - ZBX_LOADMODULEPATH=${ZABBIX_USER_HOME_DIR}/modules \ - ZBX_SNMPTRAPPERFILE=${ZABBIX_USER_HOME_DIR}/snmptraps/snmptraps.log \ - ZBX_SSHKEYLOCATION=${ZABBIX_USER_HOME_DIR}/ssh_keys/ \ - ZBX_SSLCERTLOCATION=${ZABBIX_USER_HOME_DIR}/ssl/certs/ \ - ZBX_SSLKEYLOCATION=${ZABBIX_USER_HOME_DIR}/ssl/keys/ \ - ZBX_SSLCALOCATION=${ZABBIX_USER_HOME_DIR}/ssl/ssl_ca/ - -LABEL org.opencontainers.image.authors="Alexey Pustovalov " \ - org.opencontainers.image.description="Zabbix proxy with SQLite3 database support" \ - org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ - org.opencontainers.image.licenses="AGPL v3.0" \ - org.opencontainers.image.source="${ZBX_SOURCES}" \ - org.opencontainers.image.title="Zabbix proxy (SQLite3)" \ - org.opencontainers.image.url="https://zabbix.com/" \ - org.opencontainers.image.vendor="Zabbix SIA" \ - org.opencontainers.image.version="${ZBX_VERSION}" - -STOPSIGNAL SIGTERM - -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/proxy/sbin/zabbix_proxy /usr/sbin/zabbix_proxy -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/general/bin/zabbix_get /usr/bin/ -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/general/bin/zabbix_sender /usr/bin/ -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/proxy/conf/ ${ZABBIX_CONF_DIR}/ -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/proxy/database/sqlite3/ /usr/share/doc/zabbix-proxy-sqlite3/ - -RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ - --mount=type=tmpfs,target=/var/cache/yum/ \ - set -eux && \ - INSTALL_PKGS="bash \ - gzip \ - c-ares \ - file-libs \ - libevent \ - libssh \ - libxml2 \ - net-snmp-libs \ - OpenIPMI-libs \ - openldap \ - openssl \ - openssl-libs \ - pcre2 \ - sqlite-libs \ - unixODBC \ - zlib \ - fping \ - iputils \ - krb5-workstation \ - nmap \ - traceroute \ - sqlite" && \ - microdnf -y install \ - --disablerepo="*" \ - --enablerepo="ol10_baseos_latest" \ - --setopt=install_weak_deps=0 \ - --setopt=keepcache=0 \ - --best \ - --nodocs \ - oracle-epel-release-el10 && \ - microdnf -y install \ - --disablerepo="*" \ - --enablerepo="ol10_baseos_latest" \ - --enablerepo="ol10_appstream" \ - --enablerepo="ol10_u1_developer_EPEL" \ - --setopt=install_weak_deps=0 \ - --setopt=keepcache=0 \ - --best \ - --nodocs \ - ${INSTALL_PKGS} && \ - groupadd \ - --system \ - --gid 1995 \ - zabbix && \ - useradd \ - --system \ - --comment "Zabbix monitoring system" \ - -g zabbix \ - --uid 1997 \ - --shell /sbin/nologin \ - --home-dir ${ZABBIX_USER_HOME_DIR} \ - zabbix && \ - chgrp zabbix /usr/bin/nmap && \ - setcap cap_net_raw+eip /usr/bin/nmap && \ - mkdir -p ${ZABBIX_CONF_DIR} \ - ${ZABBIX_USER_HOME_DIR} \ - ${ZABBIX_USER_HOME_DIR}/db_data \ - ${ZABBIX_USER_HOME_DIR}/enc \ - ${ZABBIX_USER_HOME_DIR}/enc_internal \ - ${ZABBIX_USER_HOME_DIR}/mibs \ - ${ZABBIX_USER_HOME_DIR}/modules \ - ${ZABBIX_USER_HOME_DIR}/snmptraps \ - ${ZABBIX_USER_HOME_DIR}/ssh_keys \ - ${ZABBIX_USER_HOME_DIR}/ssl \ - ${ZABBIX_USER_HOME_DIR}/ssl/certs \ - ${ZABBIX_USER_HOME_DIR}/ssl/keys \ - ${ZABBIX_USER_HOME_DIR}/ssl/ssl_ca \ - /usr/lib/zabbix/externalscripts && \ - FIX_PERM_LIST="\ - ${ZABBIX_CONF_DIR}/zabbix_proxy_modules.conf \ - ${ZABBIX_USER_HOME_DIR}/" && \ - chown --quiet -R zabbix:0 ${FIX_PERM_LIST} && \ - chmod -R g=u ${FIX_PERM_LIST} && \ - chown --quiet zabbix:0 ${ZABBIX_CONF_DIR}/ && \ - chmod g=u ${ZABBIX_CONF_DIR} && \ - /usr/sbin/zabbix_proxy -V - -RUN --mount=from=entrypoints,target=/tmp/entrypoints,ro \ - set -eux && \ - install -d /usr/lib/docker-entrypoint && \ - install -m 0755 /tmp/entrypoints/proxy-sqlite3.sh /usr/bin/docker-entrypoint.sh && \ - install -m 0644 /tmp/entrypoints/lib/*.sh /usr/lib/docker-entrypoint/ - -EXPOSE 10051/tcp - -WORKDIR ${ZABBIX_USER_HOME_DIR} - -VOLUME ["${ZABBIX_USER_HOME_DIR}/snmptraps"] - -USER 1997 - -ENTRYPOINT ["/usr/bin/docker-entrypoint.sh"] - -CMD ["/usr/sbin/zabbix_proxy", "--foreground", "-c", "/etc/zabbix/zabbix_proxy.conf"] diff --git a/Dockerfiles/proxy-sqlite3/ol/README.md b/Dockerfiles/proxy-sqlite3/ol/README.md deleted file mode 120000 index 32d46ee8..00000000 --- a/Dockerfiles/proxy-sqlite3/ol/README.md +++ /dev/null @@ -1 +0,0 @@ -../README.md \ No newline at end of file diff --git a/Dockerfiles/proxy-sqlite3/ol/build.sh b/Dockerfiles/proxy-sqlite3/ol/build.sh deleted file mode 120000 index 46b20313..00000000 --- a/Dockerfiles/proxy-sqlite3/ol/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../../build.sh \ No newline at end of file diff --git a/Dockerfiles/proxy-sqlite3/rhel/.dockerignore b/Dockerfiles/proxy-sqlite3/rhel/.dockerignore deleted file mode 100644 index 88a84e55..00000000 --- a/Dockerfiles/proxy-sqlite3/rhel/.dockerignore +++ /dev/null @@ -1 +0,0 @@ -build.sh diff --git a/Dockerfiles/proxy-sqlite3/rhel/Dockerfile b/Dockerfiles/proxy-sqlite3/rhel/Dockerfile deleted file mode 100644 index 2e478136..00000000 --- a/Dockerfiles/proxy-sqlite3/rhel/Dockerfile +++ /dev/null @@ -1,163 +0,0 @@ -# syntax=docker/dockerfile:1.6 -ARG OS_BASE_IMAGE=registry.access.redhat.com/ubi10/ubi-minimal:10.2 -ARG MAJOR_VERSION=7.4 -ARG RELEASE=12 -ARG ZBX_VERSION=${MAJOR_VERSION}.12 -ARG BUILD_BASE_IMAGE=zabbix-build-sqlite3:rhel-${ZBX_VERSION} - -FROM ${BUILD_BASE_IMAGE} AS builder - -FROM ${OS_BASE_IMAGE} - -ARG MAJOR_VERSION -ARG RELEASE -ARG ZBX_VERSION -ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git - -ENV TERM=xterm \ - ZBX_VERSION=${ZBX_VERSION} \ - ZBX_SOURCES=${ZBX_SOURCES} \ - MIBDIRS=/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL \ - NMAP_PRIVILEGED= \ - ZABBIX_USER_HOME_DIR=/var/lib/zabbix \ - ZABBIX_CONF_DIR=/etc/zabbix - -ENV ZBX_FPINGLOCATION=/usr/sbin/fping \ - ZBX_LOADMODULEPATH=${ZABBIX_USER_HOME_DIR}/modules \ - ZBX_SNMPTRAPPERFILE=${ZABBIX_USER_HOME_DIR}/snmptraps/snmptraps.log \ - ZBX_SSHKEYLOCATION=${ZABBIX_USER_HOME_DIR}/ssh_keys/ \ - ZBX_SSLCERTLOCATION=${ZABBIX_USER_HOME_DIR}/ssl/certs/ \ - ZBX_SSLKEYLOCATION=${ZABBIX_USER_HOME_DIR}/ssl/keys/ \ - ZBX_SSLCALOCATION=${ZABBIX_USER_HOME_DIR}/ssl/ssl_ca/ - -LABEL description="Zabbix proxy with SQLite3 database support" \ - maintainer="alexey.pustovalov@zabbix.com" \ - name="zabbix/zabbix-proxy-sqlite-74" \ - release="${RELEASE}" \ - run="docker run --name zabbix-proxy -p 10051:10051 -d registry.connect.redhat.com/zabbix/zabbix-proxy-sqlite-74:${ZBX_VERSION}" \ - summary="Zabbix proxy (SQLite3)" \ - url="https://www.zabbix.com/" \ - vendor="Zabbix SIA" \ - version="${MAJOR_VERSION}" \ - io.k8s.description="Zabbix proxy with SQLite3 database support" \ - io.k8s.display-name="Zabbix proxy (SQLite3)" \ - io.openshift.expose-services="10051:10051" \ - io.openshift.tags="zabbix,zabbix-proxy,sqlite3" \ - 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-sqlite-74:${ZBX_VERSION}" \ - org.label-schema.license="AGPL v3.0" \ - org.label-schema.name="zabbix-proxy-sqlite3-rhel" \ - org.label-schema.schema-version="1.0" \ - org.label-schema.url="https://zabbix.com/" \ - org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ - org.label-schema.vcs-ref="${VCS_REF}" \ - org.label-schema.vcs-url="${ZBX_SOURCES}" \ - org.label-schema.vendor="Zabbix SIA" \ - org.label-schema.version="${ZBX_VERSION}" - -STOPSIGNAL SIGTERM - -COPY licenses /licenses/ -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/proxy/sbin/zabbix_proxy /usr/sbin/zabbix_proxy -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/general/bin/zabbix_get /usr/bin/ -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/general/bin/zabbix_sender /usr/bin/ -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/proxy/conf/ ${ZABBIX_CONF_DIR}/ -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/proxy/database/sqlite3/ /usr/share/doc/zabbix-proxy-sqlite3/ - -RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ - --mount=type=tmpfs,target=/var/cache/yum/ \ - set -eux && \ - INSTALL_PKGS="bash \ - gzip \ - shadow-utils \ - tzdata \ - c-ares \ - libcurl-minimal \ - libevent \ - libssh \ - libxml2 \ - net-snmp-agent-libs \ - OpenIPMI-libs \ - openldap \ - openssl \ - pcre2 \ - sqlite-libs \ - unixODBC \ - zlib \ - fping \ - iputils \ - krb5-workstation \ - nmap \ - traceroute \ - sqlite" && \ - curl --tlsv1.2 -sSf -L https://dl.fedoraproject.org/pub/epel/epel-release-latest-10.noarch.rpm -o /tmp/epel-release-latest-10.noarch.rpm && \ - rpm -ivh /tmp/epel-release-latest-10.noarch.rpm && \ - rm -rf /tmp/epel-release-latest-10.noarch.rpm && \ - ARCH_SUFFIX="$(arch)"; \ - microdnf -y install \ - --disablerepo="*" \ - --enablerepo="ubi-10-baseos-rpms" \ - --enablerepo="ubi-10-appstream-rpms" \ - --enablerepo="rhel-10-for-$ARCH_SUFFIX-baseos-rpms" \ - --enablerepo="rhel-10-for-$ARCH_SUFFIX-appstream-rpms" \ - --enablerepo="epel" \ - --setopt=install_weak_deps=0 \ - --setopt=keepcache=0 \ - --best \ - --setopt=tsflags=nodocs \ - ${INSTALL_PKGS} && \ - groupadd \ - --system \ - --gid 1995 \ - zabbix && \ - useradd \ - --system \ - --comment "Zabbix monitoring system" \ - -g zabbix \ - --uid 1997 \ - --shell /sbin/nologin \ - --home-dir ${ZABBIX_USER_HOME_DIR} \ - zabbix && \ - chgrp zabbix /usr/bin/nmap && \ - setcap cap_net_raw+eip /usr/bin/nmap && \ - mkdir -p ${ZABBIX_CONF_DIR} \ - ${ZABBIX_USER_HOME_DIR} \ - ${ZABBIX_USER_HOME_DIR}/db_data \ - ${ZABBIX_USER_HOME_DIR}/enc \ - ${ZABBIX_USER_HOME_DIR}/enc_internal \ - ${ZABBIX_USER_HOME_DIR}/mibs \ - ${ZABBIX_USER_HOME_DIR}/modules \ - ${ZABBIX_USER_HOME_DIR}/snmptraps \ - ${ZABBIX_USER_HOME_DIR}/ssh_keys \ - ${ZABBIX_USER_HOME_DIR}/ssl \ - ${ZABBIX_USER_HOME_DIR}/ssl/certs \ - ${ZABBIX_USER_HOME_DIR}/ssl/keys \ - ${ZABBIX_USER_HOME_DIR}/ssl/ssl_ca \ - /usr/lib/zabbix/externalscripts && \ - FIX_PERM_LIST="\ - ${ZABBIX_CONF_DIR}/zabbix_proxy_modules.conf \ - ${ZABBIX_USER_HOME_DIR}/" && \ - chown --quiet -R zabbix:0 ${FIX_PERM_LIST} && \ - chmod -R g=u ${FIX_PERM_LIST} && \ - chown --quiet zabbix:0 ${ZABBIX_CONF_DIR}/ && \ - chmod g=u ${ZABBIX_CONF_DIR} && \ - /usr/sbin/zabbix_proxy -V - -RUN --mount=from=entrypoints,target=/tmp/entrypoints,ro \ - set -eux && \ - install -d /usr/lib/docker-entrypoint && \ - install -m 0755 /tmp/entrypoints/proxy-sqlite3.sh /usr/bin/docker-entrypoint.sh && \ - install -m 0644 /tmp/entrypoints/lib/*.sh /usr/lib/docker-entrypoint/ - -EXPOSE 10051/tcp - -WORKDIR ${ZABBIX_USER_HOME_DIR} - -VOLUME ["${ZABBIX_USER_HOME_DIR}/snmptraps"] - -USER 1997 - -ENTRYPOINT ["/usr/bin/docker-entrypoint.sh"] - -CMD ["/usr/sbin/zabbix_proxy", "--foreground", "-c", "/etc/zabbix/zabbix_proxy.conf"] diff --git a/Dockerfiles/proxy-sqlite3/rhel/README.html b/Dockerfiles/proxy-sqlite3/rhel/README.html deleted file mode 100644 index 99b9d40b..00000000 --- a/Dockerfiles/proxy-sqlite3/rhel/README.html +++ /dev/null @@ -1,176 +0,0 @@ -

What is Zabbix?

-

Zabbix is an enterprise-class open source distributed monitoring solution.

-

Zabbix is software that monitors numerous parameters of a network and the health and integrity of servers. Zabbix uses a flexible notification mechanism that allows users to configure e-mail based alerts for virtually any event. This allows a fast reaction to server problems. Zabbix offers excellent reporting and data visualisation features based on the stored data. This makes Zabbix ideal for capacity planning.

-

For more information and related downloads for Zabbix components, please visit zabbix.com

-

What is Zabbix proxy?

-

Zabbix proxy is a process that may collect monitoring data from one or more monitored devices and send the information to the Zabbix server, essentially working on behalf of the server. All collected data is buffered locally and then transferred to the Zabbix server the proxy belongs to.

-

Zabbix proxy images

-

Images are updated when new releases are published.

-

The image uses SQLite3 database to store collected data before sending it to Zabbix server.

-

How to use this image

-

Start zabbix-proxy-sqlite3

-

Start a Zabbix proxy container as follows:

-
podman run \
-    --name some-zabbix-proxy-sqlite3 \
-    -e ZBX_HOSTNAME=some-hostname \
-    -e ZBX_SERVER_HOST=some-zabbix-server \
-    --init \
-    -d registry.connect.redhat.com/zabbix/zabbix-proxy-sqlite-74:tag
-
-

Where some-zabbix-proxy-sqlite3 is the name you want to assign to your container, some-hostname is the hostname, it is Hostname parameter in Zabbix proxy configuration file, some-zabbix-server is IP or DNS name of Zabbix server and tag is the tag specifying the version you want.

-
-

Note: -Zabbix server has possibility to execute fping utility to perform ICMP checks. When containers are running in rootless mode or with specific restrictions environment, you may face errors related to fping: -fping: Operation not permitted -or -lost all packets to all resources -in this case add --cap-add=net_raw to podman run commands. -Additionally fping executing in non-root environments can require sysctl modification: -net.ipv4.ping_group_range=0 1995 -where 1995 is zabbix GID.

-
-

Connects from Zabbix server (Passive proxy)

-

This image exposes the standard Zabbix proxy port (10051) and can operate as Passive proxy in case ZBX_PROXYMODE = 1. Start Zabbix server container like this in order to link it to the Zabbix proxy container:

-
$ podman run \
-    --name some-zabbix-server \
-    --link some-zabbix-proxy-sqlite3:zabbix-proxy-sqlite3 \
-    --init \
-    -d zabbix/zabbix-server:latest
-
-

Connect to Zabbix server (Active proxy)

-

This image can operate as Active proxy (default mode). Start your application container like this in order to link Zabbix proxy to Zabbix server containters:

-
$ podman run \
-    --name some-zabbix-proxy-sqlite3 \
-    --link some-zabbix-server:zabbix-server \
-    --init \
-    -d registry.connect.redhat.com/zabbix/zabbix-proxy-sqlite-74:latest
-
-

Container shell access and viewing Zabbix proxy logs

-

The podman exec command allows you to run commands inside a Podman container. The following command line will give you a bash shell inside your zabbix-proxy-sqlite3 container:

-
$ podman exec -ti some-zabbix-proxy-sqlite3 /bin/bash
-
-

The Zabbix proxy log is available through Podman's container log:

-
$ podman logs some-zabbix-proxy-sqlite3
-
-

Environment Variables

-

When you start the zabbix-proxy-sqlite3 image, you can adjust the configuration of the Zabbix proxy by passing one or more environment variables on the podman run command line.

-

ZBX_PROXYMODE

-

The variable allows to switch Zabbix proxy mode. Bu default, value is 0 - active proxy. Allowed values are 0 - active proxy and 1 - passive proxy.

-

ZBX_HOSTNAME

-

This variable is unique, case sensitive hostname. By default, value is zabbix-proxy-sqlite3 of the container. It is Hostname parameter in zabbix_proxy.conf.

-

ZBX_SERVER_HOST

-

This variable is IP or DNS name of Zabbix server. By default, value is zabbix-server. It is Server parameter in zabbix_proxy.conf. For a non-default port, append it to the host using host:port syntax.

-

ZBX_LOADMODULE

-

The variable is list of comma separated loadable Zabbix modules. It works with volume /var/lib/zabbix/modules. The syntax of the variable is dummy1.so,dummy2.so.

-

ZBX_DEBUGLEVEL

-

The variable is used to specify debug level. By default, value is 3. It is DebugLevel parameter in zabbix_server.conf. Allowed values are listed below:

-
    -
  • 0 - basic information about starting and stopping of Zabbix processes;
    • -
  • 1 - critical information
    • -
  • 2 - error information
    • -
  • 3 - warnings
    • -
  • 4 - for debugging (produces lots of information)
    • -
  • 5 - extended debugging (produces even more information)
    • -
-

ZBX_TIMEOUT

-

The variable is used to specify timeout for processing checks. By default, value is 4.

-

Other variables

-

Additionally the image allows to specify many other environment variables listed below:

-
ZBX_USE_NODE_NAME_AS_DB_NAME=false
-ZBX_ENABLEREMOTECOMMANDS=0 # Available since 3.4.0
-ZBX_LOGREMOTECOMMANDS=0 # Available since 3.4.0
-ZBX_SOURCEIP=
-ZBX_HOSTNAMEITEM=system.hostname
-ZBX_PROXYLOCALBUFFER=0
-ZBX_PROXYOFFLINEBUFFER=1
-ZBX_PROXYBUFFERMODE=disk # Available since 7.0.0
-ZBX_PROXYMEMORYBUFFERAGE=0 # Available since 7.0.0
-ZBX_PROXYMEMORYBUFFERSIZE=0 # Available since 7.0.0
-ZBX_PROXYCONFIGFREQUENCY=10 # Available since 6.4.0
-ZBX_DATASENDERFREQUENCY=1
-ZBX_MAXCONCURRENTCHECKSPERPOLLER=1000 # Available since 7.0.0
-ZBX_STARTAGENTPOLLERS=1 # Available since 7.0.0
-ZBX_STARTHTTPAGENTPOLLERS=1 # Available since 7.0.0
-ZBX_STARTPOLLERS=5
-ZBX_STARTPREPROCESSORS=16 # Available since 4.2.0
-ZBX_STARTIPMIPOLLERS=0
-ZBX_STARTPOLLERSUNREACHABLE=1
-ZBX_STARTTRAPPERS=5
-ZBX_STARTPINGERS=1
-ZBX_STARTDISCOVERERS=5
-ZBX_STARTHTTPPOLLERS=1
-ZBX_STARTODBCPOLLERS=1 # Available since 6.0.0
-ZBX_JAVAGATEWAY=zabbix-java-gateway
-ZBX_JAVAGATEWAYPORT=10052
-ZBX_STARTJAVAPOLLERS=0
-ZBX_STATSALLOWEDIP= # Available since 4.0.5
-ZBX_STARTVMWARECOLLECTORS=0
-ZBX_VMWAREFREQUENCY=60
-ZBX_VMWAREPERFFREQUENCY=60
-ZBX_VMWARECACHESIZE=8M
-ZBX_VMWARETIMEOUT=10
-ZBX_ENABLE_SNMP_TRAPS=false
-ZBX_LISTENIP=
-ZBX_LISTENPORT=10051
-ZBX_LISTENBACKLOG=
-ZBX_HOUSEKEEPINGFREQUENCY=1
-ZBX_CACHESIZE=32M
-ZBX_STARTDBSYNCERS=4
-ZBX_HISTORYCACHESIZE=16M
-ZBX_HISTORYINDEXCACHESIZE=4M
-ZBX_TRAPPERTIMEOUT=300
-ZBX_UNREACHABLEPERIOD=45
-ZBX_UNAVAILABLEDELAY=60
-ZBX_UNREACHABLEDELAY=15
-ZBX_LOGSLOWQUERIES=3000
-ZBX_TLSLISTEN= # Available since 7.4.0
-ZBX_TLSCONNECT=unencrypted
-ZBX_TLSACCEPT=unencrypted
-ZBX_TLSCAFILE=
-ZBX_TLSCA=
-ZBX_TLSCRLFILE=
-ZBX_TLSCRL=
-ZBX_TLSSERVERCERTISSUER=
-ZBX_TLSSERVERCERTSUBJECT=
-ZBX_TLSCERTFILE=
-ZBX_TLSCERT=
-ZBX_TLSKEYFILE=
-ZBX_TLSKEY=
-ZBX_TLSPSKIDENTITY=
-ZBX_TLSPSKFILE=
-ZBX_TLSPSK=
-ZBX_TLSCIPHERALL= # Available since 4.4.7
-ZBX_TLSCIPHERALL13= # Available since 4.4.7
-ZBX_TLSCIPHERCERT= # Available since 4.4.7
-ZBX_TLSCIPHERCERT13= # Available since 4.4.7
-ZBX_TLSCIPHERPSK= # Available since 4.4.7
-ZBX_TLSCIPHERPSK13= # Available since 4.4.7
-ZBX_WEBDRIVERURL= # Available since 7.0.0
-ZBX_STARTBROWSERPOLLERS=1 # Available since 7.0.0
-ZBX_STARTSNMPPOLLERS=1 # Available since 7.0.0
-
-

Default values of these variables are specified after equal sign.

-

The allowed variables are identical of parameters in official zabbix_proxy.conf. For example, ZBX_LOGSLOWQUERIES = LogSlowQueries.

-

Please use official documentation for zabbix_proxy.conf to get more information about the variables.

-

Allowed volumes for the Zabbix proxy container

-

/usr/lib/zabbix/externalscripts

-

The volume is used by External checks (type of items). It is ExternalScripts parameter in zabbix_proxy.conf.

-

/var/lib/zabbix/db_data

-

The volume stores SQLite3 database file and could be used for external database file storage.

-

/var/lib/zabbix/modules

-

The volume allows load additional modules and extend Zabbix proxy using LoadModule feature.

-

/var/lib/zabbix/enc

-

The volume is used to store TLS related files. These file names are specified using ZBX_TLSCAFILE, ZBX_TLSCRLFILE, ZBX_TLSCERTFILE, ZBX_TLSKEYFILE and ZBX_TLSPSKFILE variables. Additionally it is possible to use environment variables ZBX_TLSCA, ZBX_TLSCRL, ZBX_TLSCERT, ZBX_TLSKEY and ZBX_TLSPSK with plaintext values.

-

/var/lib/zabbix/ssh_keys

-

The volume is used as location of public and private keys for SSH checks and actions. It is SSHKeyLocation parameter in zabbix_proxy.conf.

-

/var/lib/zabbix/ssl/certs

-

The volume is used as location of SSL client certificate files for client authentication. It is SSLCertLocation parameter in zabbix_proxy.conf.

-

/var/lib/zabbix/ssl/keys

-

The volume is used as location of SSL private key files for client authentication. It is SSLKeyLocation parameter in zabbix_proxy.conf.

-

/var/lib/zabbix/ssl/ssl_ca

-

The volume is used as location of certificate authority (CA) files for SSL server certificate verification. It is SSLCALocation parameter in zabbix_proxy.conf.

-

/var/lib/zabbix/snmptraps

-

The volume is used as location of snmptraps.log file. It could be shared by zabbix-snmptraps container and inherited using volumes_from Podman option while creating new instance of Zabbix proxy. -SNMP traps processing feature could be enabled using shared volume and switched ZBX_ENABLE_SNMP_TRAPS environment variable to true.

-

/var/lib/zabbix/mibs

-

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

diff --git a/Dockerfiles/proxy-sqlite3/rhel/build.sh b/Dockerfiles/proxy-sqlite3/rhel/build.sh deleted file mode 120000 index 46b20313..00000000 --- a/Dockerfiles/proxy-sqlite3/rhel/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../../build.sh \ No newline at end of file diff --git a/Dockerfiles/proxy-sqlite3/rhel/licenses/AGPL-v3.0.txt b/Dockerfiles/proxy-sqlite3/rhel/licenses/AGPL-v3.0.txt deleted file mode 100644 index be3f7b28..00000000 --- a/Dockerfiles/proxy-sqlite3/rhel/licenses/AGPL-v3.0.txt +++ /dev/null @@ -1,661 +0,0 @@ - GNU AFFERO GENERAL PUBLIC LICENSE - Version 3, 19 November 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU Affero General Public License is a free, copyleft license for -software and other kinds of works, specifically designed to ensure -cooperation with the community in the case of network server software. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -our General Public Licenses are intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - Developers that use our General Public Licenses protect your rights -with two steps: (1) assert copyright on the software, and (2) offer -you this License which gives you legal permission to copy, distribute -and/or modify the software. - - A secondary benefit of defending all users' freedom is that -improvements made in alternate versions of the program, if they -receive widespread use, become available for other developers to -incorporate. Many developers of free software are heartened and -encouraged by the resulting cooperation. However, in the case of -software used on network servers, this result may fail to come about. -The GNU General Public License permits making a modified version and -letting the public access it on a server without ever releasing its -source code to the public. - - The GNU Affero General Public License is designed specifically to -ensure that, in such cases, the modified source code becomes available -to the community. It requires the operator of a network server to -provide the source code of the modified version running there to the -users of that server. Therefore, public use of a modified version, on -a publicly accessible server, gives the public access to the source -code of the modified version. - - An older license, called the Affero General Public License and -published by Affero, was designed to accomplish similar goals. This is -a different license, not a version of the Affero GPL, but Affero has -released a new version of the Affero GPL which permits relicensing under -this license. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU Affero General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Remote Network Interaction; Use with the GNU General Public License. - - Notwithstanding any other provision of this License, if you modify the -Program, your modified version must prominently offer all users -interacting with it remotely through a computer network (if your version -supports such interaction) an opportunity to receive the Corresponding -Source of your version by providing access to the Corresponding Source -from a network server at no charge, through some standard or customary -means of facilitating copying of software. This Corresponding Source -shall include the Corresponding Source for any work covered by version 3 -of the GNU General Public License that is incorporated pursuant to the -following paragraph. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the work with which it is combined will remain governed by version -3 of the GNU General Public License. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU Affero General Public License from time to time. Such new versions -will be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU Affero General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU Affero General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU Affero General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Affero General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Affero General Public License for more details. - - You should have received a copy of the GNU Affero General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If your software can interact with users remotely through a computer -network, you should also make sure that it provides a way for users to -get its source. For example, if your program is a web application, its -interface could display a "Source" link that leads users to an archive -of the code. There are many ways you could offer source, and different -solutions will be better for different programs; see section 13 for the -specific requirements. - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU AGPL, see -. diff --git a/Dockerfiles/proxy-sqlite3/ubuntu/.dockerignore b/Dockerfiles/proxy-sqlite3/ubuntu/.dockerignore deleted file mode 100644 index 88a84e55..00000000 --- a/Dockerfiles/proxy-sqlite3/ubuntu/.dockerignore +++ /dev/null @@ -1 +0,0 @@ -build.sh diff --git a/Dockerfiles/proxy-sqlite3/ubuntu/Dockerfile b/Dockerfiles/proxy-sqlite3/ubuntu/Dockerfile deleted file mode 100644 index ed522e01..00000000 --- a/Dockerfiles/proxy-sqlite3/ubuntu/Dockerfile +++ /dev/null @@ -1,145 +0,0 @@ -# syntax=docker/dockerfile:1.6 -ARG OS_BASE_IMAGE=ubuntu:resolute -ARG MAJOR_VERSION=7.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.12 -ARG BUILD_BASE_IMAGE=zabbix-build-sqlite3:ubuntu-${ZBX_VERSION} - -FROM ${BUILD_BASE_IMAGE} AS builder - -FROM ${OS_BASE_IMAGE} - -ARG MAJOR_VERSION -ARG ZBX_VERSION -ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git - -ENV TERM=xterm \ - ZBX_VERSION=${ZBX_VERSION} \ - ZBX_SOURCES=${ZBX_SOURCES} \ - MIBDIRS=/var/lib/mibs/ietf:/var/lib/mibs/iana:/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL \ - NMAP_PRIVILEGED= \ - ZABBIX_USER_HOME_DIR=/var/lib/zabbix \ - ZABBIX_CONF_DIR=/etc/zabbix - -ENV ZBX_FPINGLOCATION=/usr/bin/fping \ - ZBX_LOADMODULEPATH=${ZABBIX_USER_HOME_DIR}/modules \ - ZBX_SNMPTRAPPERFILE=${ZABBIX_USER_HOME_DIR}/snmptraps/snmptraps.log \ - ZBX_SSHKEYLOCATION=${ZABBIX_USER_HOME_DIR}/ssh_keys/ \ - ZBX_SSLCERTLOCATION=${ZABBIX_USER_HOME_DIR}/ssl/certs/ \ - ZBX_SSLKEYLOCATION=${ZABBIX_USER_HOME_DIR}/ssl/keys/ \ - ZBX_SSLCALOCATION=${ZABBIX_USER_HOME_DIR}/ssl/ssl_ca/ - -LABEL org.opencontainers.image.authors="Alexey Pustovalov " \ - org.opencontainers.image.description="Zabbix proxy with SQLite3 database support" \ - org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ - org.opencontainers.image.licenses="AGPL v3.0" \ - org.opencontainers.image.source="${ZBX_SOURCES}" \ - org.opencontainers.image.title="Zabbix proxy (SQLite3)" \ - org.opencontainers.image.url="https://zabbix.com/" \ - org.opencontainers.image.vendor="Zabbix SIA" \ - org.opencontainers.image.version="${ZBX_VERSION}" - -STOPSIGNAL SIGTERM - -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/proxy/sbin/zabbix_proxy /usr/sbin/zabbix_proxy -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/general/bin/zabbix_get /usr/bin/ -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/general/bin/zabbix_sender /usr/bin/ -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/proxy/conf/ ${ZABBIX_CONF_DIR}/ -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/proxy/database/sqlite3/ /usr/share/doc/zabbix-proxy-sqlite3/ - -RUN --mount=type=cache,target=/var/cache/apt/,sharing=locked \ - --mount=type=cache,target=/var/lib/apt/,sharing=locked \ - set -eux && \ - INSTALL_PKGS="bash \ - ca-certificates \ - tzdata \ - libc6 \ - libcares2 \ - libcurl4t64 \ - libevent-2.1 \ - libevent-extra-2.1 \ - libevent-pthreads-2.1 \ - libopenipmi0t64 \ - libpcre2-8-0 \ - libsnmp40t64 \ - libsqlite3-0 \ - libssh-4 \ - libssl3t64 \ - libxml2-16 \ - openssl \ - unixodbc \ - zlib1g \ - fping \ - iputils-ping \ - krb5-user \ - nmap \ - snmp-mibs-downloader \ - traceroute \ - sqlite3" && \ - apt-get update && \ - DEBIAN_FRONTEND=noninteractive apt-get install -y \ - --no-install-recommends \ - ${INSTALL_PKGS} && \ - rm -f \ - /var/lib/mibs/ietf/VM-MIB \ - /var/lib/mibs/ietf/TRILL-OAM-MIB \ - /var/lib/mibs/ietf/SMF-MIB \ - /var/lib/mibs/ietf/ENERGY-OBJECT-MIB \ - /var/lib/mibs/ietf/POWER-ATTRIBUTES-MIB \ - /var/lib/mibs/ietf/OLSRv2-MIB \ - /var/lib/mibs/ietf/ENERGY-OBJECT-CONTEXT-MIB \ - /var/lib/mibs/ietf/BFD-STD-MIB \ - /var/lib/mibs/ietf/SNMPv2-PDU && \ - groupadd \ - --system \ - --gid 1995 \ - zabbix && \ - useradd \ - --system \ - --comment "Zabbix monitoring system" \ - -g zabbix \ - --uid 1997 \ - --shell /sbin/nologin \ - --home-dir ${ZABBIX_USER_HOME_DIR} \ - zabbix && \ - chgrp zabbix /usr/bin/nmap && \ - setcap cap_net_raw+eip /usr/bin/nmap && \ - mkdir -p ${ZABBIX_CONF_DIR} \ - ${ZABBIX_USER_HOME_DIR} \ - ${ZABBIX_USER_HOME_DIR}/db_data \ - ${ZABBIX_USER_HOME_DIR}/enc \ - ${ZABBIX_USER_HOME_DIR}/enc_internal \ - ${ZABBIX_USER_HOME_DIR}/mibs \ - ${ZABBIX_USER_HOME_DIR}/modules \ - ${ZABBIX_USER_HOME_DIR}/snmptraps \ - ${ZABBIX_USER_HOME_DIR}/ssh_keys \ - ${ZABBIX_USER_HOME_DIR}/ssl \ - ${ZABBIX_USER_HOME_DIR}/ssl/certs \ - ${ZABBIX_USER_HOME_DIR}/ssl/keys \ - ${ZABBIX_USER_HOME_DIR}/ssl/ssl_ca \ - /usr/lib/zabbix/externalscripts && \ - FIX_PERM_LIST="\ - ${ZABBIX_CONF_DIR}/zabbix_proxy_modules.conf \ - ${ZABBIX_USER_HOME_DIR}/" && \ - chown --quiet -R zabbix:0 ${FIX_PERM_LIST} && \ - chmod -R g=u ${FIX_PERM_LIST} && \ - chown --quiet zabbix:0 ${ZABBIX_CONF_DIR}/ && \ - chmod g=u ${ZABBIX_CONF_DIR} && \ - /usr/sbin/zabbix_proxy -V - -RUN --mount=from=entrypoints,target=/tmp/entrypoints,ro \ - set -eux && \ - install -d /usr/lib/docker-entrypoint && \ - install -m 0755 /tmp/entrypoints/proxy-sqlite3.sh /usr/bin/docker-entrypoint.sh && \ - install -m 0644 /tmp/entrypoints/lib/*.sh /usr/lib/docker-entrypoint/ - -EXPOSE 10051/tcp - -WORKDIR ${ZABBIX_USER_HOME_DIR} - -VOLUME ["${ZABBIX_USER_HOME_DIR}/snmptraps"] - -USER 1997 - -ENTRYPOINT ["/usr/bin/docker-entrypoint.sh"] - -CMD ["/usr/sbin/zabbix_proxy", "--foreground", "-c", "/etc/zabbix/zabbix_proxy.conf"] diff --git a/Dockerfiles/proxy-sqlite3/ubuntu/README.md b/Dockerfiles/proxy-sqlite3/ubuntu/README.md deleted file mode 120000 index 32d46ee8..00000000 --- a/Dockerfiles/proxy-sqlite3/ubuntu/README.md +++ /dev/null @@ -1 +0,0 @@ -../README.md \ No newline at end of file diff --git a/Dockerfiles/proxy-sqlite3/ubuntu/build.sh b/Dockerfiles/proxy-sqlite3/ubuntu/build.sh deleted file mode 120000 index 46b20313..00000000 --- a/Dockerfiles/proxy-sqlite3/ubuntu/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../../build.sh \ No newline at end of file diff --git a/Dockerfiles/server-mysql/README.md b/Dockerfiles/server-mysql/README.md deleted file mode 100644 index be402513..00000000 --- a/Dockerfiles/server-mysql/README.md +++ /dev/null @@ -1,336 +0,0 @@ -![logo](https://assets.zabbix.com/img/logo/zabbix_logo_500x131.png) - -# What is Zabbix? - -Zabbix is an enterprise-class open source distributed monitoring solution. - -Zabbix is software that monitors numerous parameters of a network and the health and integrity of servers. Zabbix uses a flexible notification mechanism that allows users to configure e-mail based alerts for virtually any event. This allows a fast reaction to server problems. Zabbix offers excellent reporting and data visualisation features based on the stored data. This makes Zabbix ideal for capacity planning. - -For more information and related downloads for Zabbix components, please visit https://hub.docker.com/u/zabbix/ and https://zabbix.com - -# What is Zabbix server? - -Zabbix server is the central process of Zabbix software. - -The server performs the polling and trapping of data, it calculates triggers, sends notifications to users. It is the central component to which Zabbix agents and proxies report data on availability and integrity of systems. The server can itself remotely check networked services (such as web servers and mail servers) using simple service checks. - -# Zabbix server images - -These are the only official Zabbix server Docker images. They are based on Alpine Linux v3.24, Ubuntu 26.04 (resolute), CentOS Stream 10 and Oracle Linux 10 images. The available versions of Zabbix server are: - - Zabbix server 6.0 (tags: alpine-6.0-latest, ubuntu-6.0-latest, ol-6.0-latest) - Zabbix server 6.0.* (tags: alpine-6.0.*, ubuntu-6.0.*, ol-6.0.*) - Zabbix server 7.0 (tags: alpine-7.0-latest, ubuntu-7.0-latest, ol-7.0-latest) - Zabbix server 7.0.* (tags: alpine-7.0.*, ubuntu-7.0.*, ol-7.0.*) - Zabbix server 7.2 (tags: alpine-7.2-latest, ubuntu-7.2-latest, ol-7.2-latest) - Zabbix server 7.2.* (tags: alpine-7.2.*, ubuntu-7.2.*, ol-7.2.*) - Zabbix server 7.4 (tags: alpine-7.4-latest, ubuntu-7.4-latest, ol-7.4-latest, alpine-latest, ubuntu-latest, ol-latest, latest) - Zabbix server 7.4.* (tags: alpine-7.4.*, ubuntu-7.4.*, ol-7.4.*) - Zabbix server 8.0 (tags: alpine-trunk, ubuntu-trunk, ol-trunk) - -Images are updated when new releases are published. The image with ``latest`` tag is based on Alpine Linux. - -The image uses MySQL database. It uses the next procedure to start: -- Checking database availability -- If ``MYSQL_ROOT_PASSWORD`` or ``MYSQL_ALLOW_EMPTY_PASSWORD`` are specified, the instance tries to create ``MYSQL_USER`` user with ``MYSQL_PASSWORD`` to use these credentials then for Zabbix server. -- Checking of having `MYSQL_DATABASE` database. Creating `MYSQL_DATABASE` database name if it does not exist -- Checking of having `dbversion` table. Creating Zabbix server database schema and upload initial data sample if no `dbversion` table - -# How to use this image - -## Start `zabbix-server-mysql` - -Start a Zabbix server container as follows: - - docker 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: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. See the list above for relevant tags, or look at the [full list of tags](https://hub.docker.com/r/zabbix/zabbix-server-mysql/tags/). - -> [!NOTE] -> Zabbix server has possibility to execute `fping` utility to perform ICMP checks. When containers are running in rootless mode or with specific restrictions environment, you may face errors related to fping: -> `fping: Operation not permitted` -> or -> lost all packets to all resources -> in this case add `--cap-add=net_raw` to `docker run` or `podman run` commands. -> Additionally fping executing in non-root environments can require sysctl modification: -> `net.ipv4.ping_group_range=0 1995` -> where 1995 is `zabbix` GID. - -## Container shell access and viewing Zabbix server logs - -The `docker exec` command allows you to run commands inside a Docker container. The following command line will give you a bash shell inside your `zabbix-server-mysql` container: - -```console -$ docker exec -ti some-zabbix-server-mysql /bin/bash -``` - -The Zabbix server log is available through Docker's container log: - -```console -$ docker logs some-zabbix-server-mysql -``` - -## Environment Variables - -When you start the `zabbix-server-mysql` image, you can adjust the configuration of the Zabbix server by passing one or more environment variables on the `docker run` command line. - -### `DB_SERVER_HOST` - -This variable is IP or DNS name of MySQL server. By default, value is 'mysql-server' - -### `DB_SERVER_PORT` - -This variable is port of MySQL server. By default, value is '3306'. - -### `MYSQL_USER`, `MYSQL_PASSWORD`, `MYSQL_USER_FILE`, `MYSQL_PASSWORD_FILE` - -These variables are used by Zabbix server to connect to Zabbix database. With the `_FILE` variables you can instead provide the path to a file which contains the user / the password instead. Without Docker Swarm or Kubernetes you also have to map the files. Those are exclusive so you can just provide one type - either `MYSQL_USER` or `MYSQL_USER_FILE`! - -```console -docker run --name some-zabbix-server-mysql -e DB_SERVER_HOST="some-mysql-server" -v ./.MYSQL_USER:/run/secrets/MYSQL_USER -e MYSQL_USER_FILE=/run/secrets/MYSQL_USER -v ./.MYSQL_PASSWORD:/run/secrets/MYSQL_PASSWORD -e MYSQL_PASSWORD_FILE=/var/run/secrets/MYSQL_PASSWORD --init -d zabbix/zabbix-server-mysql:tag -``` - -With Docker Swarm or Kubernetes this works with secrets. That way it is replicated in your cluster! - -```console -printf "zabbix" | docker secret create MYSQL_USER - -printf "zabbix" | docker secret create MYSQL_PASSWORD - -docker run --name some-zabbix-server-mysql -e DB_SERVER_HOST="some-mysql-server" -e MYSQL_USER_FILE=/run/secrets/MYSQL_USER -e MYSQL_PASSWORD_FILE=/run/secrets/MYSQL_PASSWORD --init -d zabbix/zabbix-server-mysql:tag -``` - -This method is also applicable for `MYSQL_ROOT_PASSWORD` with `MYSQL_ROOT_PASSWORD_FILE`. - -By default, values for `MYSQL_USER` and `MYSQL_PASSWORD` are `zabbix`, `zabbix`. - -### `MYSQL_DATABASE` - -The variable is Zabbix database name. By default, value is `zabbix`. - -### `ZBX_LOADMODULE` - -The variable is list of comma separated loadable Zabbix modules. It works with volume ``/var/lib/zabbix/modules``. The syntax of the variable is ``dummy1.so,dummy2.so``. - -### `ZBX_DEBUGLEVEL` - -The variable is used to specify debug level. By default, value is ``3``. It is ``DebugLevel`` parameter in ``zabbix_server.conf``. Allowed values are listed below: -- ``0`` - basic information about starting and stopping of Zabbix processes; -- ``1`` - critical information -- ``2`` - error information -- ``3`` - warnings -- ``4`` - for debugging (produces lots of information) -- ``5`` - extended debugging (produces even more information) - -### `ZBX_TIMEOUT` - -The variable is used to specify timeout for processing checks. By default, value is ``4``. - -### Other variables - -Additionally the image allows to specify many other environment variables listed below: - -``` -ZBX_ALLOWUNSUPPORTEDDBVERSIONS=0 # Available since 6.0.0 -ZBX_DBTLSCONNECT= # Available since 5.0.0 -ZBX_DBTLSCAFILE= # Available since 5.0.0 -ZBX_DBTLSCERTFILE= # Available since 5.0.0 -ZBX_DBTLSKEYFILE= # Available since 5.0.0 -ZBX_DBTLSCIPHER= # Available since 5.0.0 -ZBX_DBTLSCIPHER13= # Available since 5.0.0 -ZBX_VAULT=HashiCorp # Allowed values: HashiCorp, CyberArk. Required when Vault is used. Available since 6.2.0 -ZBX_VAULTDBPATH= # Available since 5.2.0 -ZBX_VAULTPREFIX= # Available since 7.0.0 -ZBX_VAULTURL=https://127.0.0.1:8200 # Available since 5.2.0 -VAULT_TOKEN= # Available since 5.2.0 -ZBX_VAULTTLSCERTFILE= # Available since 6.2.0 -ZBX_VAULTTLSKEYFILE= # Available since 6.2.0 -ZBX_LISTENIP= -ZBX_LISTENPORT=10051 -ZBX_LISTENBACKLOG= -ZBX_STARTREPORTWRITERS=0 # Available since 5.4.0 -ZBX_WEBSERVICEURL=http://zabbix-web-service:10053/report # Available since 5.4.0 -ZBX_SERVICEMANAGERSYNCFREQUENCY=60 # Available since 6.0.0 -ZBX_HISTORYSTORAGEURL= # Available since 3.4.0 -ZBX_HISTORYSTORAGETYPES=uint,dbl,str,log,text # Available since 3.4.0 -ZBX_ENABLEGLOBALSCRIPTS=0 # Available since 7.0.0 -ZBX_ALLOWSOFTWAREUPDATECHECK=1 # Available since 7.0.0 -ZBX_MAXCONCURRENTCHECKSPERPOLLER=1000 # Available since 7.0.0 -ZBX_STARTAGENTPOLLERS=1 # Available since 7.0.0 -ZBX_STARTHTTPAGENTPOLLERS=1 # Available since 7.0.0 -ZBX_STARTPOLLERS=5 -ZBX_STARTIPMIPOLLERS=0 -ZBX_STARTPREPROCESSORS=16 # Available since 3.4.0 -ZBX_STARTCONNECTORS=0 # Available since 6.4.0 -ZBX_STARTPOLLERSUNREACHABLE=1 -ZBX_STARTTRAPPERS=5 -ZBX_STARTPINGERS=1 -ZBX_STARTDISCOVERERS=5 -ZBX_STARTHISTORYPOLLERS=5 # Available since 5.4.0 -ZBX_STARTHTTPPOLLERS=1 -ZBX_STARTODBCPOLLERS=1 # Available since 6.0.0 -ZBX_STARTTIMERS=1 -ZBX_STARTESCALATORS=1 -ZBX_STARTALERTERS=3 # Available since 3.4.0 -ZBX_JAVAGATEWAY=zabbix-java-gateway -ZBX_JAVAGATEWAYPORT=10052 -ZBX_STARTJAVAPOLLERS=5 -ZBX_STARTLLDPROCESSORS=2 # Available since 4.2.0 -ZBX_STATSALLOWEDIP= # Available since 4.0.5 -ZBX_STARTVMWARECOLLECTORS=0 -ZBX_VMWAREFREQUENCY=60 -ZBX_VMWAREPERFFREQUENCY=60 -ZBX_VMWARECACHESIZE=8M -ZBX_VMWARETIMEOUT=10 -ZBX_ENABLE_SNMP_TRAPS=false -ZBX_SOURCEIP= -ZBX_SMSDEVICES= -ZBX_HOUSEKEEPINGFREQUENCY=1 -ZBX_MAXHOUSEKEEPERDELETE=5000 -ZBX_PROBLEMHOUSEKEEPINGFREQUENCY=60 # Available since 6.0.0 -ZBX_CACHESIZE=32M -ZBX_CACHEUPDATEFREQUENCY=10 -ZBX_STARTDBSYNCERS=4 -ZBX_EXPORTFILESIZE=1G # Available since 4.0.0 -ZBX_EXPORTTYPE= # Available since 5.0.10 and 5.2.6 -ZBX_AUTOHANODENAME=fqdn # Allowed values: fqdn, hostname. Available since 6.0.0 -ZBX_HANODENAME= # Available since 6.0.0 -ZBX_AUTONODEADDRESS=fqdn # Allowed values: fqdn, hostname. Available since 6.0.0 -ZBX_NODEADDRESSPORT=10051 # Allowed to use with ZBX_AUTONODEADDRESS variable only. Available since 6.0.0 -ZBX_NODEADDRESS=localhost # Available since 6.0.0 -ZBX_HISTORYCACHESIZE=16M -ZBX_HISTORYINDEXCACHESIZE=4M -ZBX_HISTORYSTORAGEDATEINDEX=0 # Available since 4.0.0 -ZBX_TRENDCACHESIZE=4M -ZBX_TRENDFUNCTIONCACHESIZE=4M -ZBX_VALUECACHESIZE=8M -ZBX_TRAPPERTIMEOUT=300 -ZBX_UNREACHABLEPERIOD=45 -ZBX_UNAVAILABLEDELAY=60 -ZBX_UNREACHABLEDELAY=15 -ZBX_LOGSLOWQUERIES=3000 -ZBX_STARTPROXYPOLLERS=1 -ZBX_PROXYCONFIGFREQUENCY=10 -ZBX_PROXYDATAFREQUENCY=1 -ZBX_TLSLISTEN= # Available since 7.4.0 -ZBX_TLSCAFILE= -ZBX_TLSCA= -ZBX_TLSCRLFILE= -ZBX_TLSCRL= -ZBX_TLSCERTFILE= -ZBX_TLSCERT= -ZBX_TLSKEYFILE= -ZBX_TLSKEY= -ZBX_TLSCIPHERALL= # Available since 4.4.7 -ZBX_TLSCIPHERALL13= # Available since 4.4.7 -ZBX_TLSCIPHERCERT= # Available since 4.4.7 -ZBX_TLSCIPHERCERT13= # Available since 4.4.7 -ZBX_TLSCIPHERPSK= # Available since 4.4.7 -ZBX_TLSCIPHERPSK13= # Available since 4.4.7 -ZBX_TLS_FRONTENDACCEPT= # Available since 7.4.0 -ZBX_FRONTENDALLOWEDIP= # Available since 7.4.0 -ZBX_TLSFRONTENDCERTISSUER= # Available since 7.4.0 -ZBX_TLSFRONTENDCERTSUBJECT= # Available since 7.4.0 -ZBX_WEBDRIVERURL= # Available since 7.0.0 -ZBX_STARTBROWSERPOLLERS=1 # Available since 7.0.0 -ZBX_STARTSNMPPOLLERS=1 # Available since 7.0.0 - -``` - -Default values of these variables are specified after equal sign. - -The allowed variables are identical of parameters in official ``zabbix_server.conf``. For example, ``ZBX_LOGSLOWQUERIES`` = ``LogSlowQueries``. - -Please use official documentation for [``zabbix_server.conf``](https://www.zabbix.com/documentation/current/manual/appendix/config/zabbix_server) to get more information about the variables. - -## Allowed volumes for the Zabbix server container - -### ``/usr/lib/zabbix/alertscripts`` - -The volume is used for custom alert scripts. It is `AlertScriptsPath` parameter in ``zabbix_server.conf``. - -### ``/usr/lib/zabbix/externalscripts`` - -The volume is used by External checks (type of items). It is `ExternalScripts` parameter in ``zabbix_server.conf``. - -### ``/var/lib/zabbix/modules`` - -The volume allows load additional modules and extend Zabbix server using ``LoadModule`` feature. - -### ``/var/lib/zabbix/enc`` - -The volume is used to store TLS related files. These file names are specified using ``ZBX_TLSCAFILE``, ``ZBX_TLSCRLFILE``, ``ZBX_TLSCERTFILE`` and ``ZBX_TLSKEYFILE`` variables. Additionally it is possible to use environment variables ``ZBX_TLSCA``, ``ZBX_TLSCRL``, ``ZBX_TLSCERT`` and ``ZBX_TLSKEY`` with plaintext values. - -### ``/var/lib/zabbix/ssh_keys`` - -The volume is used as location of public and private keys for SSH checks and actions. It is `SSHKeyLocation` parameter in ``zabbix_server.conf``. - -### ``/var/lib/zabbix/ssl/certs`` - -The volume is used as location of SSL client certificate files for client authentication. It is `SSLCertLocation` parameter in ``zabbix_server.conf``. - -### ``/var/lib/zabbix/ssl/keys`` - -The volume is used as location of SSL private key files for client authentication. It is `SSLKeyLocation` parameter in ``zabbix_server.conf``. - -### ``/var/lib/zabbix/ssl/ssl_ca`` - -The volume is used as location of certificate authority (CA) files for SSL server certificate verification. It is `SSLCALocation` parameter in ``zabbix_server.conf``. - -### ``/var/lib/zabbix/snmptraps`` - -The volume is used as location of ``snmptraps.log`` file. It could be shared by ``zabbix-snmptraps`` container and inherited using `volumes_from` Docker option while creating new instance of Zabbix server. -SNMP traps processing feature could be enabled using shared volume and switched ``ZBX_ENABLE_SNMP_TRAPS`` environment variable to `true`. - -### ``/var/lib/zabbix/mibs`` - -The volume allows to add new MIB files. It does not support subdirectories, all MIBs must be placed in ``/var/lib/zabbix/mibs``. - -### ``/var/lib/zabbix/export`` - -Directory for real-time export of events, history and trends in newline-delimited JSON format. Could be enabled using ``ZBX_EXPORTFILESIZE`` environment variable. - -# The image variants - -The `zabbix-server-mysql` images come in many flavors, each designed for a specific use case. - -## `zabbix-server-mysql:alpine-` - -This image is based on the popular [Alpine Linux project](http://alpinelinux.org), available in [the `alpine` official image](https://hub.docker.com/_/alpine). Alpine Linux is much smaller than most distribution base images (~5MB), and thus leads to much slimmer images in general. - -This variant is highly recommended when final image size being as small as possible is desired. The main caveat to note is that it does use [musl libc](http://www.musl-libc.org) instead of [glibc and friends](http://www.etalabs.net/compare_libcs.html), so certain software might run into issues depending on the depth of their libc requirements. However, most software doesn't have an issue with this, so this variant is usually a very safe choice. See [this Hacker News comment thread](https://news.ycombinator.com/item?id=10782897) for more discussion of the issues that might arise and some pro/con comparisons of using Alpine-based images. - -To minimize image size, it's uncommon for additional related tools (such as `git` or `bash`) to be included in Alpine-based images. Using this image as a base, add the things you need in your own Dockerfile (see the [`alpine` image description](https://hub.docker.com/_/alpine/) for examples of how to install packages if you are unfamiliar). - -## `zabbix-server-mysql:ubuntu-` - -This is the defacto image. If you are unsure about what your needs are, you probably want to use this one. It is designed to be used both as a throw away container (mount your source code and start the container to start your app), as well as the base to build other images off of. - -## `zabbix-server-mysql:ol-` - -Oracle Linux is an open-source operating system available under the GNU General Public License (GPLv2). Suitable for general purpose or Oracle workloads, it benefits from rigorous testing of more than 128,000 hours per day with real-world workloads and includes unique innovations such as Ksplice for zero-downtime kernel patching, DTrace for real-time diagnostics, the powerful Btrfs file system, and more. - -# User Feedback - -## Documentation - -Documentation for this image is stored in the [`server-mysql/` directory](https://github.com/zabbix/zabbix-docker/tree/7.4/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.4/README.md) before attempting a pull request. - -## Issues - -If you have any problems with or questions about this image, please contact us through a [GitHub issue](https://github.com/zabbix/zabbix-docker/issues). - -### Known issues - -## Contributing - -You are invited to contribute new features, fixes, or updates, large or small; we are always thrilled to receive pull requests, and do our best to process them as fast as we can. - -Before you start to code, we recommend discussing your plans through a [GitHub issue](https://github.com/zabbix/zabbix-docker/issues), especially for more ambitious contributions. This gives other contributors a chance to point you in the right direction, give you feedback on your design, and help you find out if someone else is working on the same thing. - -## License - -Starting from Zabbix version 7.0, all subsequent Zabbix versions will be released under the GNU Affero General Public License version 3 (AGPLv3). -You can modify the relevant version and propagate such modified version under the terms of the AGPLv3 as published by the Free Software Foundation. -For additional details, including answers to common questions about the AGPLv3, see the generic FAQ from the [Free Software Foundation](http://www.fsf.org/licenses/gpl-faq.html). - -Zabbix is Open Source Software, however, if you use Zabbix in a commercial context we kindly ask you to support the development of Zabbix by purchasing some level of technical support. -All previous Zabbix software versions up to 6.4 are released under the GNU General Public License version 2 (GPLv2). The formal terms of the GPLv2 and AGPLv3 can be found at http://www.fsf.org/licenses/. diff --git a/Dockerfiles/server-mysql/alpine/.dockerignore b/Dockerfiles/server-mysql/alpine/.dockerignore deleted file mode 100644 index 88a84e55..00000000 --- a/Dockerfiles/server-mysql/alpine/.dockerignore +++ /dev/null @@ -1 +0,0 @@ -build.sh diff --git a/Dockerfiles/server-mysql/alpine/Dockerfile b/Dockerfiles/server-mysql/alpine/Dockerfile deleted file mode 100644 index e50c10c7..00000000 --- a/Dockerfiles/server-mysql/alpine/Dockerfile +++ /dev/null @@ -1,139 +0,0 @@ -# syntax=docker/dockerfile:1.6 -ARG OS_BASE_IMAGE=alpine:3.24 -ARG MAJOR_VERSION=7.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.12 -ARG BUILD_BASE_IMAGE=zabbix-build-mysql:alpine-${ZBX_VERSION} - -FROM ${BUILD_BASE_IMAGE} AS builder - -FROM ${OS_BASE_IMAGE} - -ARG MAJOR_VERSION -ARG ZBX_VERSION -ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git - -ENV TERM=xterm \ - ZBX_VERSION=${ZBX_VERSION} \ - ZBX_SOURCES=${ZBX_SOURCES} \ - MIBDIRS=/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL \ - NMAP_PRIVILEGED= \ - MARIADB_TLS_DISABLE_PEER_VERIFICATION=1 \ - ZABBIX_USER_HOME_DIR=/var/lib/zabbix \ - ZABBIX_CONF_DIR=/etc/zabbix - -ENV DB_ENGINE=mariadb \ - ZBX_DB_NAME=dummy_db_name \ - ZBX_FPINGLOCATION=/usr/sbin/fping \ - ZBX_LOADMODULEPATH=${ZABBIX_USER_HOME_DIR}/modules \ - ZBX_SNMPTRAPPERFILE=${ZABBIX_USER_HOME_DIR}/snmptraps/snmptraps.log \ - ZBX_SSHKEYLOCATION=${ZABBIX_USER_HOME_DIR}/ssh_keys/ \ - ZBX_SSLCERTLOCATION=${ZABBIX_USER_HOME_DIR}/ssl/certs/ \ - ZBX_SSLKEYLOCATION=${ZABBIX_USER_HOME_DIR}/ssl/keys/ \ - ZBX_SSLCALOCATION=${ZABBIX_USER_HOME_DIR}/ssl/ssl_ca/ - -LABEL org.opencontainers.image.authors="Alexey Pustovalov " \ - org.opencontainers.image.description="Zabbix server with MySQL database support" \ - org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ - org.opencontainers.image.licenses="AGPL v3.0" \ - org.opencontainers.image.source="${ZBX_SOURCES}" \ - org.opencontainers.image.title="Zabbix server (MySQL)" \ - org.opencontainers.image.url="https://zabbix.com/" \ - org.opencontainers.image.vendor="Zabbix SIA" \ - org.opencontainers.image.version="${ZBX_VERSION}" - -STOPSIGNAL SIGTERM - -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/server/sbin/zabbix_server /usr/sbin/zabbix_server -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/general/bin/zabbix_get /usr/bin/ -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/general/bin/zabbix_sender /usr/bin/ -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/server/conf/ ${ZABBIX_CONF_DIR}/ -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/server/database/mysql/create.sql.gz /usr/share/doc/zabbix-server-mysql/create.sql.gz - -RUN set -eux && \ - INSTALL_PKGS="bash \ - gzip \ - tzdata \ - c-ares \ - krb5 \ - libcap \ - libcurl \ - libevent \ - libldap \ - libssh \ - libxml2 \ - mariadb-connector-c \ - net-snmp-agent-libs \ - openipmi-libs \ - openssl \ - pcre2 \ - unixodbc \ - zlib \ - fping \ - iputils \ - nmap \ - traceroute \ - mariadb-client" && \ - apk add \ - --no-cache \ - --clean-protected \ - ${INSTALL_PKGS} && \ - addgroup \ - --system \ - --gid 1995 \ - zabbix && \ - adduser \ - --system \ - --gecos "Zabbix monitoring system" \ - --disabled-password \ - --uid 1997 \ - --ingroup zabbix \ - --shell /sbin/nologin \ - --home ${ZABBIX_USER_HOME_DIR} \ - zabbix && \ - adduser zabbix dialout && \ - chgrp zabbix /usr/bin/nmap && \ - setcap cap_net_raw+eip /usr/bin/nmap && \ - chmod u+s /usr/sbin/fping && \ - mkdir -p ${ZABBIX_CONF_DIR} \ - ${ZABBIX_USER_HOME_DIR} \ - ${ZABBIX_USER_HOME_DIR}/dbscripts \ - ${ZABBIX_USER_HOME_DIR}/enc \ - ${ZABBIX_USER_HOME_DIR}/enc_internal \ - ${ZABBIX_USER_HOME_DIR}/export \ - ${ZABBIX_USER_HOME_DIR}/mibs \ - ${ZABBIX_USER_HOME_DIR}/modules \ - ${ZABBIX_USER_HOME_DIR}/snmptraps \ - ${ZABBIX_USER_HOME_DIR}/ssh_keys \ - ${ZABBIX_USER_HOME_DIR}/ssl \ - ${ZABBIX_USER_HOME_DIR}/ssl/certs \ - ${ZABBIX_USER_HOME_DIR}/ssl/keys \ - ${ZABBIX_USER_HOME_DIR}/ssl/ssl_ca \ - /usr/lib/zabbix/alertscripts \ - /usr/lib/zabbix/externalscripts \ - /usr/share/doc/zabbix-server-mysql && \ - FIX_PERM_LIST="\ - ${ZABBIX_CONF_DIR}/zabbix_server_modules.conf \ - ${ZABBIX_USER_HOME_DIR}/" && \ - chown --quiet -R zabbix:0 ${FIX_PERM_LIST} && \ - chmod -R g=u ${FIX_PERM_LIST} && \ - chown --quiet zabbix:0 ${ZABBIX_CONF_DIR}/ && \ - chmod g=u ${ZABBIX_CONF_DIR} && \ - /usr/sbin/zabbix_server -V - -RUN --mount=from=entrypoints,target=/tmp/entrypoints,ro \ - set -eux && \ - install -d /usr/lib/docker-entrypoint && \ - install -m 0755 /tmp/entrypoints/server-mysql.sh /usr/bin/docker-entrypoint.sh && \ - install -m 0644 /tmp/entrypoints/lib/*.sh /usr/lib/docker-entrypoint/ - -EXPOSE 10051/tcp - -WORKDIR ${ZABBIX_USER_HOME_DIR} - -VOLUME ["${ZABBIX_USER_HOME_DIR}/snmptraps", "${ZABBIX_USER_HOME_DIR}/export"] - -USER 1997 - -ENTRYPOINT ["/usr/bin/docker-entrypoint.sh"] - -CMD ["/usr/sbin/zabbix_server", "--foreground", "-c", "/etc/zabbix/zabbix_server.conf"] diff --git a/Dockerfiles/server-mysql/alpine/README.md b/Dockerfiles/server-mysql/alpine/README.md deleted file mode 120000 index 32d46ee8..00000000 --- a/Dockerfiles/server-mysql/alpine/README.md +++ /dev/null @@ -1 +0,0 @@ -../README.md \ No newline at end of file diff --git a/Dockerfiles/server-mysql/alpine/build.sh b/Dockerfiles/server-mysql/alpine/build.sh deleted file mode 120000 index 46b20313..00000000 --- a/Dockerfiles/server-mysql/alpine/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../../build.sh \ No newline at end of file diff --git a/Dockerfiles/server-mysql/centos/.dockerignore b/Dockerfiles/server-mysql/centos/.dockerignore deleted file mode 100644 index 88a84e55..00000000 --- a/Dockerfiles/server-mysql/centos/.dockerignore +++ /dev/null @@ -1 +0,0 @@ -build.sh diff --git a/Dockerfiles/server-mysql/centos/Dockerfile b/Dockerfiles/server-mysql/centos/Dockerfile deleted file mode 100644 index 89646a73..00000000 --- a/Dockerfiles/server-mysql/centos/Dockerfile +++ /dev/null @@ -1,157 +0,0 @@ -# syntax=docker/dockerfile:1.6 -ARG OS_BASE_IMAGE=quay.io/centos/centos:stream10-minimal -ARG MAJOR_VERSION=7.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.12 -ARG BUILD_BASE_IMAGE=zabbix-build-mysql:centos-${ZBX_VERSION} - -FROM ${BUILD_BASE_IMAGE} AS builder - -FROM ${OS_BASE_IMAGE} - -ARG MAJOR_VERSION -ARG ZBX_VERSION -ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git - -ENV TERM=xterm \ - ZBX_VERSION=${ZBX_VERSION} \ - ZBX_SOURCES=${ZBX_SOURCES} \ - MIBDIRS=/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL \ - NMAP_PRIVILEGED= \ - ZABBIX_USER_HOME_DIR=/var/lib/zabbix \ - ZABBIX_CONF_DIR=/etc/zabbix - -ENV DB_ENGINE=mysql \ - ZBX_DB_NAME=dummy_db_name \ - ZBX_FPINGLOCATION=/usr/sbin/fping \ - ZBX_LOADMODULEPATH=${ZABBIX_USER_HOME_DIR}/modules \ - ZBX_SNMPTRAPPERFILE=${ZABBIX_USER_HOME_DIR}/snmptraps/snmptraps.log \ - ZBX_SSHKEYLOCATION=${ZABBIX_USER_HOME_DIR}/ssh_keys/ \ - ZBX_SSLCERTLOCATION=${ZABBIX_USER_HOME_DIR}/ssl/certs/ \ - ZBX_SSLKEYLOCATION=${ZABBIX_USER_HOME_DIR}/ssl/keys/ \ - ZBX_SSLCALOCATION=${ZABBIX_USER_HOME_DIR}/ssl/ssl_ca/ - -LABEL org.opencontainers.image.authors="Alexey Pustovalov " \ - org.opencontainers.image.description="Zabbix server with MySQL database support" \ - org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ - org.opencontainers.image.licenses="AGPL v3.0" \ - org.opencontainers.image.source="${ZBX_SOURCES}" \ - org.opencontainers.image.title="Zabbix server (MySQL)" \ - org.opencontainers.image.url="https://zabbix.com/" \ - org.opencontainers.image.vendor="Zabbix SIA" \ - org.opencontainers.image.version="${ZBX_VERSION}" - -STOPSIGNAL SIGTERM - -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/server/sbin/zabbix_server /usr/sbin/zabbix_server -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/general/bin/zabbix_get /usr/bin/ -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/general/bin/zabbix_sender /usr/bin/ -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/server/conf/ ${ZABBIX_CONF_DIR}/ -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/server/database/mysql/create.sql.gz /usr/share/doc/zabbix-server-mysql/create.sql.gz - -RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ - --mount=type=tmpfs,target=/var/cache/yum/ \ - set -eux && \ - INSTALL_PKGS="bash \ - gzip \ - hostname \ - shadow-utils \ - c-ares \ - file-libs \ - libbrotli \ - libevent \ - libpsl \ - libssh \ - libxml2 \ - mysql8.4-libs \ - net-snmp-libs \ - OpenIPMI-libs \ - openldap \ - openssl \ - openssl-libs \ - pcre2 \ - unixODBC \ - zlib \ - fping \ - iputils \ - krb5-workstation \ - nmap \ - traceroute \ - mysql8.4" && \ - microdnf -y install \ - --disablerepo="*" \ - --enablerepo="extras-common" \ - --setopt=install_weak_deps=0 \ - --setopt=keepcache=0 \ - --best \ - --nodocs \ - epel-release && \ - microdnf -y install \ - --disablerepo="*" \ - --enablerepo="baseos" \ - --enablerepo="appstream" \ - --enablerepo="crb" \ - --enablerepo="epel" \ - --setopt=install_weak_deps=0 \ - --setopt=keepcache=0 \ - --best \ - --nodocs \ - ${INSTALL_PKGS} && \ - microdnf swap -y libcurl-minimal libcurl && \ - groupadd \ - --system \ - --gid 1995 \ - zabbix && \ - useradd \ - --system \ - --comment "Zabbix monitoring system" \ - -g zabbix \ - -G dialout \ - --uid 1997 \ - --shell /sbin/nologin \ - --home-dir ${ZABBIX_USER_HOME_DIR} \ - zabbix && \ - chgrp zabbix /usr/bin/nmap && \ - setcap cap_net_raw+eip /usr/bin/nmap && \ - mkdir -p ${ZABBIX_CONF_DIR} \ - ${ZABBIX_USER_HOME_DIR} \ - ${ZABBIX_USER_HOME_DIR}/dbscripts \ - ${ZABBIX_USER_HOME_DIR}/enc \ - ${ZABBIX_USER_HOME_DIR}/enc_internal \ - ${ZABBIX_USER_HOME_DIR}/export \ - ${ZABBIX_USER_HOME_DIR}/mibs \ - ${ZABBIX_USER_HOME_DIR}/modules \ - ${ZABBIX_USER_HOME_DIR}/snmptraps \ - ${ZABBIX_USER_HOME_DIR}/ssh_keys \ - ${ZABBIX_USER_HOME_DIR}/ssl \ - ${ZABBIX_USER_HOME_DIR}/ssl/certs \ - ${ZABBIX_USER_HOME_DIR}/ssl/keys \ - ${ZABBIX_USER_HOME_DIR}/ssl/ssl_ca \ - /usr/lib/zabbix/alertscripts \ - /usr/lib/zabbix/externalscripts \ - /usr/share/doc/zabbix-server-mysql && \ - FIX_PERM_LIST="\ - ${ZABBIX_CONF_DIR}/zabbix_server_modules.conf \ - ${ZABBIX_USER_HOME_DIR}/" && \ - chown --quiet -R zabbix:0 ${FIX_PERM_LIST} && \ - chmod -R g=u ${FIX_PERM_LIST} && \ - chown --quiet zabbix:0 ${ZABBIX_CONF_DIR}/ && \ - chmod g=u ${ZABBIX_CONF_DIR} && \ - /usr/sbin/zabbix_server -V - -RUN --mount=from=entrypoints,target=/tmp/entrypoints,ro \ - set -eux && \ - install -d /usr/lib/docker-entrypoint && \ - install -m 0755 /tmp/entrypoints/server-mysql.sh /usr/bin/docker-entrypoint.sh && \ - install -m 0644 /tmp/entrypoints/lib/*.sh /usr/lib/docker-entrypoint/ - -EXPOSE 10051/tcp - -WORKDIR ${ZABBIX_USER_HOME_DIR} - -VOLUME ["${ZABBIX_USER_HOME_DIR}/snmptraps", "${ZABBIX_USER_HOME_DIR}/export"] - -USER 1997 - -ENTRYPOINT ["/usr/bin/docker-entrypoint.sh"] - -CMD ["/usr/sbin/zabbix_server", "--foreground", "-c", "/etc/zabbix/zabbix_server.conf"] diff --git a/Dockerfiles/server-mysql/centos/README.md b/Dockerfiles/server-mysql/centos/README.md deleted file mode 120000 index 32d46ee8..00000000 --- a/Dockerfiles/server-mysql/centos/README.md +++ /dev/null @@ -1 +0,0 @@ -../README.md \ No newline at end of file diff --git a/Dockerfiles/server-mysql/centos/build.sh b/Dockerfiles/server-mysql/centos/build.sh deleted file mode 120000 index 46b20313..00000000 --- a/Dockerfiles/server-mysql/centos/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../../build.sh \ No newline at end of file diff --git a/Dockerfiles/server-mysql/ol/.dockerignore b/Dockerfiles/server-mysql/ol/.dockerignore deleted file mode 100644 index 88a84e55..00000000 --- a/Dockerfiles/server-mysql/ol/.dockerignore +++ /dev/null @@ -1 +0,0 @@ -build.sh diff --git a/Dockerfiles/server-mysql/ol/Dockerfile b/Dockerfiles/server-mysql/ol/Dockerfile deleted file mode 100644 index 9b8dd3f3..00000000 --- a/Dockerfiles/server-mysql/ol/Dockerfile +++ /dev/null @@ -1,154 +0,0 @@ -# syntax=docker/dockerfile:1.6 -ARG OS_BASE_IMAGE=container-registry.oracle.com/os/oraclelinux:10-slim -ARG MAJOR_VERSION=7.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.12 -ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ol-${ZBX_VERSION} - -FROM ${BUILD_BASE_IMAGE} AS builder - -FROM ${OS_BASE_IMAGE} - -ARG MAJOR_VERSION -ARG ZBX_VERSION -ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git - -ENV TERM=xterm \ - ZBX_VERSION=${ZBX_VERSION} \ - ZBX_SOURCES=${ZBX_SOURCES} \ - MIBDIRS=/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL \ - NMAP_PRIVILEGED= \ - ZABBIX_USER_HOME_DIR=/var/lib/zabbix \ - ZABBIX_CONF_DIR=/etc/zabbix - -ENV DB_ENGINE=mysql \ - ZBX_DB_NAME=dummy_db_name \ - ZBX_FPINGLOCATION=/usr/sbin/fping \ - ZBX_LOADMODULEPATH=${ZABBIX_USER_HOME_DIR}/modules \ - ZBX_SNMPTRAPPERFILE=${ZABBIX_USER_HOME_DIR}/snmptraps/snmptraps.log \ - ZBX_SSHKEYLOCATION=${ZABBIX_USER_HOME_DIR}/ssh_keys/ \ - ZBX_SSLCERTLOCATION=${ZABBIX_USER_HOME_DIR}/ssl/certs/ \ - ZBX_SSLKEYLOCATION=${ZABBIX_USER_HOME_DIR}/ssl/keys/ \ - ZBX_SSLCALOCATION=${ZABBIX_USER_HOME_DIR}/ssl/ssl_ca/ - -LABEL org.opencontainers.image.authors="Alexey Pustovalov " \ - org.opencontainers.image.description="Zabbix server with MySQL database support" \ - org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ - org.opencontainers.image.licenses="AGPL v3.0" \ - org.opencontainers.image.source="${ZBX_SOURCES}" \ - org.opencontainers.image.title="Zabbix server (MySQL)" \ - org.opencontainers.image.url="https://zabbix.com/" \ - org.opencontainers.image.vendor="Zabbix SIA" \ - org.opencontainers.image.version="${ZBX_VERSION}" - -STOPSIGNAL SIGTERM - -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/server/sbin/zabbix_server /usr/sbin/zabbix_server -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/general/bin/zabbix_get /usr/bin/ -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/general/bin/zabbix_sender /usr/bin/ -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/server/conf/ ${ZABBIX_CONF_DIR}/ -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/server/database/mysql/create.sql.gz /usr/share/doc/zabbix-server-mysql/create.sql.gz - -RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ - --mount=type=tmpfs,target=/var/cache/yum/ \ - set -eux && \ - INSTALL_PKGS="bash \ - gzip \ - hostname \ - c-ares \ - file-libs \ - libcurl \ - libevent \ - libssh \ - libxml2 \ - mysql8.4-libs \ - net-snmp-libs \ - OpenIPMI-libs \ - openldap \ - openssl \ - openssl-libs \ - pcre2 \ - unixODBC \ - zlib \ - fping \ - iputils \ - krb5-workstation \ - nmap \ - traceroute \ - mysql8.4" && \ - microdnf -y install \ - --disablerepo="*" \ - --enablerepo="ol10_baseos_latest" \ - --setopt=install_weak_deps=0 \ - --setopt=keepcache=0 \ - --best \ - --nodocs \ - oracle-epel-release-el10 && \ - microdnf -y install \ - --disablerepo="*" \ - --enablerepo="ol10_baseos_latest" \ - --enablerepo="ol10_appstream" \ - --enablerepo="ol10_codeready_builder" \ - --enablerepo="ol10_u1_developer_EPEL" \ - --setopt=install_weak_deps=0 \ - --setopt=keepcache=0 \ - --best \ - --nodocs \ - ${INSTALL_PKGS} && \ - groupadd \ - --system \ - --gid 1995 \ - zabbix && \ - useradd \ - --system \ - --comment "Zabbix monitoring system" \ - -g zabbix \ - -G dialout \ - --uid 1997 \ - --shell /sbin/nologin \ - --home-dir ${ZABBIX_USER_HOME_DIR} \ - zabbix && \ - chgrp zabbix /usr/bin/nmap && \ - setcap cap_net_raw+eip /usr/bin/nmap && \ - mkdir -p ${ZABBIX_CONF_DIR} \ - ${ZABBIX_USER_HOME_DIR} \ - ${ZABBIX_USER_HOME_DIR}/dbscripts \ - ${ZABBIX_USER_HOME_DIR}/enc \ - ${ZABBIX_USER_HOME_DIR}/enc_internal \ - ${ZABBIX_USER_HOME_DIR}/export \ - ${ZABBIX_USER_HOME_DIR}/mibs \ - ${ZABBIX_USER_HOME_DIR}/modules \ - ${ZABBIX_USER_HOME_DIR}/snmptraps \ - ${ZABBIX_USER_HOME_DIR}/ssh_keys \ - ${ZABBIX_USER_HOME_DIR}/ssl \ - ${ZABBIX_USER_HOME_DIR}/ssl/certs \ - ${ZABBIX_USER_HOME_DIR}/ssl/keys \ - ${ZABBIX_USER_HOME_DIR}/ssl/ssl_ca \ - /usr/lib/zabbix/alertscripts \ - /usr/lib/zabbix/externalscripts \ - /usr/share/doc/zabbix-server-mysql && \ - FIX_PERM_LIST="\ - ${ZABBIX_CONF_DIR}/zabbix_server_modules.conf \ - ${ZABBIX_USER_HOME_DIR}/" && \ - chown --quiet -R zabbix:0 ${FIX_PERM_LIST} && \ - chmod -R g=u ${FIX_PERM_LIST} && \ - chown --quiet zabbix:0 ${ZABBIX_CONF_DIR}/ && \ - chmod g=u ${ZABBIX_CONF_DIR} && \ - /usr/sbin/zabbix_server -V - -RUN --mount=from=entrypoints,target=/tmp/entrypoints,ro \ - set -eux && \ - install -d /usr/lib/docker-entrypoint && \ - install -m 0755 /tmp/entrypoints/server-mysql.sh /usr/bin/docker-entrypoint.sh && \ - install -m 0644 /tmp/entrypoints/lib/*.sh /usr/lib/docker-entrypoint/ - -EXPOSE 10051/tcp - -WORKDIR ${ZABBIX_USER_HOME_DIR} - -VOLUME ["${ZABBIX_USER_HOME_DIR}/snmptraps", "${ZABBIX_USER_HOME_DIR}/export"] - -USER 1997 - -ENTRYPOINT ["/usr/bin/docker-entrypoint.sh"] - -CMD ["/usr/sbin/zabbix_server", "--foreground", "-c", "/etc/zabbix/zabbix_server.conf"] diff --git a/Dockerfiles/server-mysql/ol/README.md b/Dockerfiles/server-mysql/ol/README.md deleted file mode 120000 index 32d46ee8..00000000 --- a/Dockerfiles/server-mysql/ol/README.md +++ /dev/null @@ -1 +0,0 @@ -../README.md \ No newline at end of file diff --git a/Dockerfiles/server-mysql/ol/build.sh b/Dockerfiles/server-mysql/ol/build.sh deleted file mode 120000 index 46b20313..00000000 --- a/Dockerfiles/server-mysql/ol/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../../build.sh \ No newline at end of file diff --git a/Dockerfiles/server-mysql/rhel/.dockerignore b/Dockerfiles/server-mysql/rhel/.dockerignore deleted file mode 100644 index 88a84e55..00000000 --- a/Dockerfiles/server-mysql/rhel/.dockerignore +++ /dev/null @@ -1 +0,0 @@ -build.sh diff --git a/Dockerfiles/server-mysql/rhel/Dockerfile b/Dockerfiles/server-mysql/rhel/Dockerfile deleted file mode 100644 index dd51e4f6..00000000 --- a/Dockerfiles/server-mysql/rhel/Dockerfile +++ /dev/null @@ -1,173 +0,0 @@ -# syntax=docker/dockerfile:1.6 -ARG OS_BASE_IMAGE=registry.access.redhat.com/ubi10/ubi-minimal:10.2 -ARG MAJOR_VERSION=7.4 -ARG RELEASE=12 -ARG ZBX_VERSION=${MAJOR_VERSION}.12 -ARG BUILD_BASE_IMAGE=zabbix-build-mysql:rhel-${ZBX_VERSION} - -FROM ${BUILD_BASE_IMAGE} AS builder - -FROM ${OS_BASE_IMAGE} - -ARG MAJOR_VERSION -ARG RELEASE -ARG ZBX_VERSION -ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git - -ENV TERM=xterm \ - ZBX_VERSION=${ZBX_VERSION} \ - ZBX_SOURCES=${ZBX_SOURCES} \ - MIBDIRS=/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL \ - NMAP_PRIVILEGED= \ - ZABBIX_USER_HOME_DIR=/var/lib/zabbix \ - ZABBIX_CONF_DIR=/etc/zabbix - -ENV DB_ENGINE=mysql \ - ZBX_DB_NAME=dummy_db_name \ - ZBX_FPINGLOCATION=/usr/sbin/fping \ - ZBX_LOADMODULEPATH=${ZABBIX_USER_HOME_DIR}/modules \ - ZBX_SNMPTRAPPERFILE=${ZABBIX_USER_HOME_DIR}/snmptraps/snmptraps.log \ - ZBX_SSHKEYLOCATION=${ZABBIX_USER_HOME_DIR}/ssh_keys/ \ - ZBX_SSLCERTLOCATION=${ZABBIX_USER_HOME_DIR}/ssl/certs/ \ - ZBX_SSLKEYLOCATION=${ZABBIX_USER_HOME_DIR}/ssl/keys/ \ - ZBX_SSLCALOCATION=${ZABBIX_USER_HOME_DIR}/ssl/ssl_ca/ - -LABEL description="Zabbix server with MySQL database support" \ - maintainer="alexey.pustovalov@zabbix.com" \ - name="zabbix/zabbix-server-mysql-74" \ - 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-74:${ZBX_VERSION}" \ - summary="Zabbix server (MySQL)" \ - url="https://www.zabbix.com/" \ - vendor="Zabbix SIA" \ - version="${MAJOR_VERSION}" \ - io.k8s.description="Zabbix server with MySQL database support" \ - io.k8s.display-name="Zabbix server (MySQL)" \ - io.openshift.expose-services="10051:10051" \ - 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-74:${ZBX_VERSION}" \ - org.label-schema.license="AGPL v3.0" \ - org.label-schema.name="zabbix-server-mysql-rhel" \ - org.label-schema.schema-version="1.0" \ - org.label-schema.url="https://zabbix.com/" \ - org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ - org.label-schema.vcs-ref="${VCS_REF}" \ - org.label-schema.vcs-url="${ZBX_SOURCES}" \ - org.label-schema.vendor="Zabbix SIA" \ - org.label-schema.version="${ZBX_VERSION}" - -STOPSIGNAL SIGTERM - -COPY licenses /licenses/ -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/server/sbin/zabbix_server /usr/sbin/zabbix_server -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/general/bin/zabbix_get /usr/bin/ -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/general/bin/zabbix_sender /usr/bin/ -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/server/conf/ ${ZABBIX_CONF_DIR}/ -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/server/database/mysql/create.sql.gz /usr/share/doc/zabbix-server-mysql/create.sql.gz - -RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ - --mount=type=tmpfs,target=/var/cache/yum/ \ - set -eux && \ - INSTALL_PKGS="bash \ - gzip \ - hostname \ - shadow-utils \ - tzdata \ - c-ares \ - libbrotli \ - libevent \ - libpsl \ - libssh \ - libxml2 \ - mysql8.4-libs \ - net-snmp-agent-libs \ - OpenIPMI-libs \ - openldap \ - openssl \ - pcre2 \ - unixODBC \ - zlib \ - fping \ - iputils \ - krb5-workstation \ - nmap \ - traceroute \ - mysql8.4" && \ - curl --tlsv1.2 -sSf -L https://dl.fedoraproject.org/pub/epel/epel-release-latest-10.noarch.rpm -o /tmp/epel-release-latest-10.noarch.rpm && \ - rpm -ivh /tmp/epel-release-latest-10.noarch.rpm && \ - rm -rf /tmp/epel-release-latest-10.noarch.rpm && \ - ARCH_SUFFIX="$(arch)"; \ - microdnf -y install \ - --disablerepo="*" \ - --enablerepo="ubi-10-baseos-rpms" \ - --enablerepo="ubi-10-appstream-rpms" \ - --enablerepo="rhel-10-for-$ARCH_SUFFIX-baseos-rpms" \ - --enablerepo="rhel-10-for-$ARCH_SUFFIX-appstream-rpms" \ - --enablerepo="codeready-builder-for-rhel-10-$ARCH_SUFFIX-rpms" \ - --enablerepo="epel" \ - --setopt=install_weak_deps=0 \ - --setopt=keepcache=0 \ - --best \ - --setopt=tsflags=nodocs \ - ${INSTALL_PKGS} && \ - microdnf swap -y libcurl-minimal libcurl && \ - groupadd \ - --system \ - --gid 1995 \ - zabbix && \ - useradd \ - --system \ - --comment "Zabbix monitoring system" \ - -g zabbix \ - -G dialout \ - --uid 1997 \ - --shell /sbin/nologin \ - --home-dir ${ZABBIX_USER_HOME_DIR} \ - zabbix && \ - chgrp zabbix /usr/bin/nmap && \ - setcap cap_net_raw+eip /usr/bin/nmap && \ - mkdir -p ${ZABBIX_CONF_DIR} \ - ${ZABBIX_USER_HOME_DIR} \ - ${ZABBIX_USER_HOME_DIR}/dbscripts \ - ${ZABBIX_USER_HOME_DIR}/enc \ - ${ZABBIX_USER_HOME_DIR}/enc_internal \ - ${ZABBIX_USER_HOME_DIR}/export \ - ${ZABBIX_USER_HOME_DIR}/mibs \ - ${ZABBIX_USER_HOME_DIR}/modules \ - ${ZABBIX_USER_HOME_DIR}/snmptraps \ - ${ZABBIX_USER_HOME_DIR}/ssh_keys \ - ${ZABBIX_USER_HOME_DIR}/ssl \ - ${ZABBIX_USER_HOME_DIR}/ssl/certs \ - ${ZABBIX_USER_HOME_DIR}/ssl/keys \ - ${ZABBIX_USER_HOME_DIR}/ssl/ssl_ca \ - /usr/lib/zabbix/alertscripts \ - /usr/lib/zabbix/externalscripts \ - /usr/share/doc/zabbix-server-mysql && \ - FIX_PERM_LIST="\ - ${ZABBIX_CONF_DIR}/zabbix_server_modules.conf \ - ${ZABBIX_USER_HOME_DIR}/" && \ - chown --quiet -R zabbix:0 ${FIX_PERM_LIST} && \ - chmod -R g=u ${FIX_PERM_LIST} && \ - chown --quiet zabbix:0 ${ZABBIX_CONF_DIR}/ && \ - chmod g=u ${ZABBIX_CONF_DIR} && \ - /usr/sbin/zabbix_server -V - -RUN --mount=from=entrypoints,target=/tmp/entrypoints,ro \ - set -eux && \ - install -d /usr/lib/docker-entrypoint && \ - install -m 0755 /tmp/entrypoints/server-mysql.sh /usr/bin/docker-entrypoint.sh && \ - install -m 0644 /tmp/entrypoints/lib/*.sh /usr/lib/docker-entrypoint/ - -EXPOSE 10051/tcp - -WORKDIR ${ZABBIX_USER_HOME_DIR} - -VOLUME ["${ZABBIX_USER_HOME_DIR}/snmptraps", "${ZABBIX_USER_HOME_DIR}/export"] - -USER 1997 - -ENTRYPOINT ["/usr/bin/docker-entrypoint.sh"] - -CMD ["/usr/sbin/zabbix_server", "--foreground", "-c", "/etc/zabbix/zabbix_server.conf"] diff --git a/Dockerfiles/server-mysql/rhel/README.html b/Dockerfiles/server-mysql/rhel/README.html deleted file mode 100644 index 73cb0948..00000000 --- a/Dockerfiles/server-mysql/rhel/README.html +++ /dev/null @@ -1,227 +0,0 @@ -

What is Zabbix?

-

Zabbix is an enterprise-class open source distributed monitoring solution.

-

Zabbix is software that monitors numerous parameters of a network and the health and integrity of servers. Zabbix uses a flexible notification mechanism that allows users to configure e-mail based alerts for virtually any event. This allows a fast reaction to server problems. Zabbix offers excellent reporting and data visualisation features based on the stored data. This makes Zabbix ideal for capacity planning.

-

For more information and related downloads for Zabbix components, please visit zabbix.com

-

What is Zabbix server?

-

Zabbix server is the central process of Zabbix software.

-

The server performs the polling and trapping of data, it calculates triggers, sends notifications to users. It is the central component to which Zabbix agents and proxies report data on availability and integrity of systems. The server can itself remotely check networked services (such as web servers and mail servers) using simple service checks.

-

Zabbix server images

-

Images are updated when new releases are published.

-

The image uses MySQL database. It uses the next procedure to start:

-
    -
  • Checking database availability
    • -
  • If MYSQL_ROOT_PASSWORD or MYSQL_ALLOW_EMPTY_PASSWORD are specified, the instance tries to create MYSQL_USER user with MYSQL_PASSWORD to use these credentials then for Zabbix server.
    • -
  • Checking of having MYSQL_DATABASE database. Creating MYSQL_DATABASE database name if it does not exist
    • -
  • Checking of having dbversion table. Creating Zabbix server database schema and upload initial data sample if no dbversion table
    • -
-

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 registry.connect.redhat.com/zabbix/zabbix-server-mysql-74: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: -Zabbix server has possibility to execute fping utility to perform ICMP checks. When containers are running in rootless mode or with specific restrictions environment, you may face errors related to fping: -fping: Operation not permitted -or -lost all packets to all resources -in this case add --cap-add=net_raw to podman run commands. -Additionally fping executing in non-root environments can require sysctl modification: -net.ipv4.ping_group_range=0 1995 -where 1995 is zabbix GID.

-
-

Container shell access and viewing Zabbix server logs

-

The podman exec command allows you to run commands inside a Podman container. The following command line will give you a bash shell inside your zabbix-server-mysql container:

-
$ podman exec -ti some-zabbix-server-mysql /bin/bash
-
-

The Zabbix server log is available through Podman's container log:

-
$ podman logs some-zabbix-server-mysql
-
-

Environment Variables

-

When you start the zabbix-server-mysql image, you can adjust the configuration of the Zabbix server by passing one or more environment variables on the podman run command line.

-

DB_SERVER_HOST

-

This variable is IP or DNS name of MySQL server. By default, value is 'mysql-server'

-

DB_SERVER_PORT

-

This variable is port of MySQL server. By default, value is '3306'.

-

MYSQL_USER, MYSQL_PASSWORD, MYSQL_USER_FILE, MYSQL_PASSWORD_FILE

-

These variables are used by Zabbix server to connect to Zabbix database. With the _FILE variables you can instead provide the path to a file which contains the user / the password instead. When secrets are not managed by an orchestrator, you also have to mount the files. Those are exclusive so you can just provide one type - either MYSQL_USER or MYSQL_USER_FILE!

-
podman run \
-    --name some-zabbix-server-mysql \
-    -e DB_SERVER_HOST="some-mysql-server" \
-    -v ./.MYSQL_USER:/run/secrets/MYSQL_USER \
-    -e MYSQL_USER_FILE=/run/secrets/MYSQL_USER \
-    -v ./.MYSQL_PASSWORD:/run/secrets/MYSQL_PASSWORD \
-    -e MYSQL_PASSWORD_FILE=/var/run/secrets/MYSQL_PASSWORD \
-    --init \
-    -d registry.connect.redhat.com/zabbix/zabbix-server-mysql-74:tag
-
-

Podman secrets can be used to avoid exposing credentials in the command line:

-
printf "zabbix" | podman secret create MYSQL_USER -
-printf "zabbix" | podman secret create MYSQL_PASSWORD -
-podman run \
-    --name some-zabbix-server-mysql \
-    -e DB_SERVER_HOST="some-mysql-server" \
-    -e MYSQL_USER_FILE=/run/secrets/MYSQL_USER \
-    -e MYSQL_PASSWORD_FILE=/run/secrets/MYSQL_PASSWORD \
-    --init \
-    -d registry.connect.redhat.com/zabbix/zabbix-server-mysql-74:tag
-
-

This method is also applicable for MYSQL_ROOT_PASSWORD with MYSQL_ROOT_PASSWORD_FILE.

-

By default, values for MYSQL_USER and MYSQL_PASSWORD are zabbix, zabbix.

-

MYSQL_DATABASE

-

The variable is Zabbix database name. By default, value is zabbix.

-

ZBX_LOADMODULE

-

The variable is list of comma separated loadable Zabbix modules. It works with volume /var/lib/zabbix/modules. The syntax of the variable is dummy1.so,dummy2.so.

-

ZBX_DEBUGLEVEL

-

The variable is used to specify debug level. By default, value is 3. It is DebugLevel parameter in zabbix_server.conf. Allowed values are listed below:

-
    -
  • 0 - basic information about starting and stopping of Zabbix processes;
    • -
  • 1 - critical information
    • -
  • 2 - error information
    • -
  • 3 - warnings
    • -
  • 4 - for debugging (produces lots of information)
    • -
  • 5 - extended debugging (produces even more information)
    • -
-

ZBX_TIMEOUT

-

The variable is used to specify timeout for processing checks. By default, value is 4.

-

Other variables

-

Additionally the image allows to specify many other environment variables listed below:

-
ZBX_ALLOWUNSUPPORTEDDBVERSIONS=0 # Available since 6.0.0
-ZBX_DBTLSCONNECT= # Available since 5.0.0
-ZBX_DBTLSCAFILE= # Available since 5.0.0
-ZBX_DBTLSCERTFILE= # Available since 5.0.0
-ZBX_DBTLSKEYFILE= # Available since 5.0.0
-ZBX_DBTLSCIPHER= # Available since 5.0.0
-ZBX_DBTLSCIPHER13= # Available since 5.0.0
-ZBX_VAULT=HashiCorp # Allowed values: HashiCorp, CyberArk. Required when Vault is used. Available since 6.2.0
-ZBX_VAULTDBPATH= # Available since 5.2.0
-ZBX_VAULTPREFIX= # Available since 7.0.0
-ZBX_VAULTURL=https://127.0.0.1:8200 # Available since 5.2.0
-VAULT_TOKEN= # Available since 5.2.0
-ZBX_VAULTTLSCERTFILE= # Available since 6.2.0
-ZBX_VAULTTLSKEYFILE= # Available since 6.2.0
-ZBX_LISTENIP=
-ZBX_LISTENPORT=10051
-ZBX_LISTENBACKLOG=
-ZBX_STARTREPORTWRITERS=0 # Available since 5.4.0
-ZBX_WEBSERVICEURL=http://zabbix-web-service:10053/report # Available since 5.4.0
-ZBX_SERVICEMANAGERSYNCFREQUENCY=60 # Available since 6.0.0
-ZBX_HISTORYSTORAGEURL= # Available since 3.4.0
-ZBX_HISTORYSTORAGETYPES=uint,dbl,str,log,text # Available since 3.4.0
-ZBX_ENABLEGLOBALSCRIPTS=0 # Available since 7.0.0
-ZBX_ALLOWSOFTWAREUPDATECHECK=1 # Available since 7.0.0
-ZBX_MAXCONCURRENTCHECKSPERPOLLER=1000 # Available since 7.0.0
-ZBX_STARTAGENTPOLLERS=1 # Available since 7.0.0
-ZBX_STARTHTTPAGENTPOLLERS=1 # Available since 7.0.0
-ZBX_STARTPOLLERS=5
-ZBX_STARTIPMIPOLLERS=0
-ZBX_STARTPREPROCESSORS=16 # Available since 3.4.0
-ZBX_STARTCONNECTORS=0 # Available since 6.4.0
-ZBX_STARTPOLLERSUNREACHABLE=1
-ZBX_STARTTRAPPERS=5
-ZBX_STARTPINGERS=1
-ZBX_STARTDISCOVERERS=5
-ZBX_STARTHISTORYPOLLERS=5 # Available since 5.4.0
-ZBX_STARTHTTPPOLLERS=1
-ZBX_STARTODBCPOLLERS=1 # Available since 6.0.0
-ZBX_STARTTIMERS=1
-ZBX_STARTESCALATORS=1
-ZBX_STARTALERTERS=3 # Available since 3.4.0
-ZBX_JAVAGATEWAY=zabbix-java-gateway
-ZBX_JAVAGATEWAYPORT=10052
-ZBX_STARTJAVAPOLLERS=5
-ZBX_STARTLLDPROCESSORS=2 # Available since 4.2.0
-ZBX_STATSALLOWEDIP= # Available since 4.0.5
-ZBX_STARTVMWARECOLLECTORS=0
-ZBX_VMWAREFREQUENCY=60
-ZBX_VMWAREPERFFREQUENCY=60
-ZBX_VMWARECACHESIZE=8M
-ZBX_VMWARETIMEOUT=10
-ZBX_ENABLE_SNMP_TRAPS=false
-ZBX_SOURCEIP=
-ZBX_SMSDEVICES=
-ZBX_HOUSEKEEPINGFREQUENCY=1
-ZBX_MAXHOUSEKEEPERDELETE=5000
-ZBX_PROBLEMHOUSEKEEPINGFREQUENCY=60 # Available since 6.0.0
-ZBX_CACHESIZE=32M
-ZBX_CACHEUPDATEFREQUENCY=10
-ZBX_STARTDBSYNCERS=4
-ZBX_EXPORTFILESIZE=1G # Available since 4.0.0
-ZBX_EXPORTTYPE= # Available since 5.0.10 and 5.2.6
-ZBX_AUTOHANODENAME=fqdn # Allowed values: fqdn, hostname. Available since 6.0.0
-ZBX_HANODENAME= # Available since 6.0.0
-ZBX_AUTONODEADDRESS=fqdn # Allowed values: fqdn, hostname. Available since 6.0.0
-ZBX_NODEADDRESSPORT=10051 # Allowed to use with ZBX_AUTONODEADDRESS variable only. Available since 6.0.0
-ZBX_NODEADDRESS=localhost # Available since 6.0.0
-ZBX_HISTORYCACHESIZE=16M
-ZBX_HISTORYINDEXCACHESIZE=4M
-ZBX_HISTORYSTORAGEDATEINDEX=0 # Available since 4.0.0
-ZBX_TRENDCACHESIZE=4M
-ZBX_TRENDFUNCTIONCACHESIZE=4M
-ZBX_VALUECACHESIZE=8M
-ZBX_TRAPPERTIMEOUT=300
-ZBX_UNREACHABLEPERIOD=45
-ZBX_UNAVAILABLEDELAY=60
-ZBX_UNREACHABLEDELAY=15
-ZBX_LOGSLOWQUERIES=3000
-ZBX_STARTPROXYPOLLERS=1
-ZBX_PROXYCONFIGFREQUENCY=10
-ZBX_PROXYDATAFREQUENCY=1
-ZBX_TLSLISTEN= # Available since 7.4.0
-ZBX_TLSCAFILE=
-ZBX_TLSCA=
-ZBX_TLSCRLFILE=
-ZBX_TLSCRL=
-ZBX_TLSCERTFILE=
-ZBX_TLSCERT=
-ZBX_TLSKEYFILE=
-ZBX_TLSKEY=
-ZBX_TLSCIPHERALL= # Available since 4.4.7
-ZBX_TLSCIPHERALL13= # Available since 4.4.7
-ZBX_TLSCIPHERCERT= # Available since 4.4.7
-ZBX_TLSCIPHERCERT13= # Available since 4.4.7
-ZBX_TLSCIPHERPSK= # Available since 4.4.7
-ZBX_TLSCIPHERPSK13= # Available since 4.4.7
-ZBX_TLS_FRONTENDACCEPT= # Available since 7.4.0
-ZBX_FRONTENDALLOWEDIP= # Available since 7.4.0
-ZBX_TLSFRONTENDCERTISSUER= # Available since 7.4.0
-ZBX_TLSFRONTENDCERTSUBJECT= # Available since 7.4.0
-ZBX_WEBDRIVERURL= # Available since 7.0.0
-ZBX_STARTBROWSERPOLLERS=1 # Available since 7.0.0
-ZBX_STARTSNMPPOLLERS=1 # Available since 7.0.0
-
-
-

Default values of these variables are specified after equal sign.

-

The allowed variables are identical of parameters in official zabbix_server.conf. For example, ZBX_LOGSLOWQUERIES = LogSlowQueries.

-

Please use official documentation for zabbix_server.conf to get more information about the variables.

-

Allowed volumes for the Zabbix server container

-

/usr/lib/zabbix/alertscripts

-

The volume is used for custom alert scripts. It is AlertScriptsPath parameter in zabbix_server.conf.

-

/usr/lib/zabbix/externalscripts

-

The volume is used by External checks (type of items). It is ExternalScripts parameter in zabbix_server.conf.

-

/var/lib/zabbix/modules

-

The volume allows load additional modules and extend Zabbix server using LoadModule feature.

-

/var/lib/zabbix/enc

-

The volume is used to store TLS related files. These file names are specified using ZBX_TLSCAFILE, ZBX_TLSCRLFILE, ZBX_TLSCERTFILE and ZBX_TLSKEYFILE variables. Additionally it is possible to use environment variables ZBX_TLSCA, ZBX_TLSCRL, ZBX_TLSCERT and ZBX_TLSKEY with plaintext values.

-

/var/lib/zabbix/ssh_keys

-

The volume is used as location of public and private keys for SSH checks and actions. It is SSHKeyLocation parameter in zabbix_server.conf.

-

/var/lib/zabbix/ssl/certs

-

The volume is used as location of SSL client certificate files for client authentication. It is SSLCertLocation parameter in zabbix_server.conf.

-

/var/lib/zabbix/ssl/keys

-

The volume is used as location of SSL private key files for client authentication. It is SSLKeyLocation parameter in zabbix_server.conf.

-

/var/lib/zabbix/ssl/ssl_ca

-

The volume is used as location of certificate authority (CA) files for SSL server certificate verification. It is SSLCALocation parameter in zabbix_server.conf.

-

/var/lib/zabbix/snmptraps

-

The volume is used as location of snmptraps.log file. It could be shared by zabbix-snmptraps container and inherited using volumes_from Podman option while creating new instance of Zabbix server. -SNMP traps processing feature could be enabled using shared volume and switched ZBX_ENABLE_SNMP_TRAPS environment variable to true.

-

/var/lib/zabbix/mibs

-

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

-

/var/lib/zabbix/export

-

Directory for real-time export of events, history and trends in newline-delimited JSON format. Could be enabled using ZBX_EXPORTFILESIZE environment variable.

diff --git a/Dockerfiles/server-mysql/rhel/build.sh b/Dockerfiles/server-mysql/rhel/build.sh deleted file mode 120000 index 46b20313..00000000 --- a/Dockerfiles/server-mysql/rhel/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../../build.sh \ No newline at end of file diff --git a/Dockerfiles/server-mysql/rhel/licenses/AGPL-v3.0.txt b/Dockerfiles/server-mysql/rhel/licenses/AGPL-v3.0.txt deleted file mode 100644 index be3f7b28..00000000 --- a/Dockerfiles/server-mysql/rhel/licenses/AGPL-v3.0.txt +++ /dev/null @@ -1,661 +0,0 @@ - GNU AFFERO GENERAL PUBLIC LICENSE - Version 3, 19 November 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU Affero General Public License is a free, copyleft license for -software and other kinds of works, specifically designed to ensure -cooperation with the community in the case of network server software. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -our General Public Licenses are intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - Developers that use our General Public Licenses protect your rights -with two steps: (1) assert copyright on the software, and (2) offer -you this License which gives you legal permission to copy, distribute -and/or modify the software. - - A secondary benefit of defending all users' freedom is that -improvements made in alternate versions of the program, if they -receive widespread use, become available for other developers to -incorporate. Many developers of free software are heartened and -encouraged by the resulting cooperation. However, in the case of -software used on network servers, this result may fail to come about. -The GNU General Public License permits making a modified version and -letting the public access it on a server without ever releasing its -source code to the public. - - The GNU Affero General Public License is designed specifically to -ensure that, in such cases, the modified source code becomes available -to the community. It requires the operator of a network server to -provide the source code of the modified version running there to the -users of that server. Therefore, public use of a modified version, on -a publicly accessible server, gives the public access to the source -code of the modified version. - - An older license, called the Affero General Public License and -published by Affero, was designed to accomplish similar goals. This is -a different license, not a version of the Affero GPL, but Affero has -released a new version of the Affero GPL which permits relicensing under -this license. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU Affero General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Remote Network Interaction; Use with the GNU General Public License. - - Notwithstanding any other provision of this License, if you modify the -Program, your modified version must prominently offer all users -interacting with it remotely through a computer network (if your version -supports such interaction) an opportunity to receive the Corresponding -Source of your version by providing access to the Corresponding Source -from a network server at no charge, through some standard or customary -means of facilitating copying of software. This Corresponding Source -shall include the Corresponding Source for any work covered by version 3 -of the GNU General Public License that is incorporated pursuant to the -following paragraph. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the work with which it is combined will remain governed by version -3 of the GNU General Public License. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU Affero General Public License from time to time. Such new versions -will be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU Affero General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU Affero General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU Affero General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Affero General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Affero General Public License for more details. - - You should have received a copy of the GNU Affero General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If your software can interact with users remotely through a computer -network, you should also make sure that it provides a way for users to -get its source. For example, if your program is a web application, its -interface could display a "Source" link that leads users to an archive -of the code. There are many ways you could offer source, and different -solutions will be better for different programs; see section 13 for the -specific requirements. - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU AGPL, see -. diff --git a/Dockerfiles/server-mysql/ubuntu/.dockerignore b/Dockerfiles/server-mysql/ubuntu/.dockerignore deleted file mode 100644 index 88a84e55..00000000 --- a/Dockerfiles/server-mysql/ubuntu/.dockerignore +++ /dev/null @@ -1 +0,0 @@ -build.sh diff --git a/Dockerfiles/server-mysql/ubuntu/Dockerfile b/Dockerfiles/server-mysql/ubuntu/Dockerfile deleted file mode 100644 index 284d9dd8..00000000 --- a/Dockerfiles/server-mysql/ubuntu/Dockerfile +++ /dev/null @@ -1,152 +0,0 @@ -# syntax=docker/dockerfile:1.6 -ARG OS_BASE_IMAGE=ubuntu:resolute -ARG MAJOR_VERSION=7.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.12 -ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION} - -FROM ${BUILD_BASE_IMAGE} AS builder - -FROM ${OS_BASE_IMAGE} - -ARG MAJOR_VERSION -ARG ZBX_VERSION -ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git - -ENV TERM=xterm \ - ZBX_VERSION=${ZBX_VERSION} \ - ZBX_SOURCES=${ZBX_SOURCES} \ - MIBDIRS=/var/lib/mibs/ietf:/var/lib/mibs/iana:/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL \ - NMAP_PRIVILEGED= \ - ZABBIX_USER_HOME_DIR=/var/lib/zabbix \ - ZABBIX_CONF_DIR=/etc/zabbix - -ENV DB_ENGINE=mysql \ - ZBX_DB_NAME=dummy_db_name \ - ZBX_FPINGLOCATION=/usr/bin/fping \ - ZBX_LOADMODULEPATH=${ZABBIX_USER_HOME_DIR}/modules \ - ZBX_SNMPTRAPPERFILE=${ZABBIX_USER_HOME_DIR}/snmptraps/snmptraps.log \ - ZBX_SSHKEYLOCATION=${ZABBIX_USER_HOME_DIR}/ssh_keys/ \ - ZBX_SSLCERTLOCATION=${ZABBIX_USER_HOME_DIR}/ssl/certs/ \ - ZBX_SSLKEYLOCATION=${ZABBIX_USER_HOME_DIR}/ssl/keys/ \ - ZBX_SSLCALOCATION=${ZABBIX_USER_HOME_DIR}/ssl/ssl_ca/ - -LABEL org.opencontainers.image.authors="Alexey Pustovalov " \ - org.opencontainers.image.description="Zabbix server with MySQL database support" \ - org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ - org.opencontainers.image.licenses="AGPL v3.0" \ - org.opencontainers.image.source="${ZBX_SOURCES}" \ - org.opencontainers.image.title="Zabbix server (MySQL)" \ - org.opencontainers.image.url="https://zabbix.com/" \ - org.opencontainers.image.vendor="Zabbix SIA" \ - org.opencontainers.image.version="${ZBX_VERSION}" - -STOPSIGNAL SIGTERM - -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/server/sbin/zabbix_server /usr/sbin/zabbix_server -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/general/bin/zabbix_get /usr/bin/ -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/general/bin/zabbix_sender /usr/bin/ -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/server/conf/ ${ZABBIX_CONF_DIR}/ -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/server/database/mysql/create.sql.gz /usr/share/doc/zabbix-server-mysql/create.sql.gz - -RUN --mount=type=cache,target=/var/cache/apt/,sharing=locked \ - --mount=type=cache,target=/var/lib/apt/,sharing=locked \ - set -eux && \ - INSTALL_PKGS="bash \ - ca-certificates \ - gzip \ - tzdata \ - libc6 \ - libcares2 \ - libcurl4t64 \ - libevent-2.1 \ - libevent-extra-2.1 \ - libevent-pthreads-2.1 \ - libmysqlclient24 \ - libopenipmi0t64 \ - libpcre2-8-0 \ - libsnmp40t64 \ - libssh-4 \ - libssl3t64 \ - libxml2-16 \ - openssl \ - unixodbc \ - zlib1g \ - fping \ - iputils-ping \ - krb5-user \ - nmap \ - snmp-mibs-downloader \ - traceroute \ - mysql-client" && \ - apt-get update && \ - DEBIAN_FRONTEND=noninteractive apt-get install -y \ - --no-install-recommends \ - ${INSTALL_PKGS} && \ - rm -f \ - /var/lib/mibs/ietf/VM-MIB \ - /var/lib/mibs/ietf/TRILL-OAM-MIB \ - /var/lib/mibs/ietf/SMF-MIB \ - /var/lib/mibs/ietf/ENERGY-OBJECT-MIB \ - /var/lib/mibs/ietf/POWER-ATTRIBUTES-MIB \ - /var/lib/mibs/ietf/OLSRv2-MIB \ - /var/lib/mibs/ietf/ENERGY-OBJECT-CONTEXT-MIB \ - /var/lib/mibs/ietf/BFD-STD-MIB \ - /var/lib/mibs/ietf/SNMPv2-PDU && \ - groupadd \ - --system \ - --gid 1995 \ - zabbix && \ - useradd \ - --system \ - --comment "Zabbix monitoring system" \ - -g zabbix \ - -G dialout \ - --uid 1997 \ - --shell /sbin/nologin \ - --home-dir ${ZABBIX_USER_HOME_DIR} \ - zabbix && \ - chgrp zabbix /usr/bin/nmap && \ - setcap cap_net_raw+eip /usr/bin/nmap && \ - mkdir -p ${ZABBIX_CONF_DIR} \ - ${ZABBIX_USER_HOME_DIR} \ - ${ZABBIX_USER_HOME_DIR}/dbscripts \ - ${ZABBIX_USER_HOME_DIR}/enc \ - ${ZABBIX_USER_HOME_DIR}/enc_internal \ - ${ZABBIX_USER_HOME_DIR}/export \ - ${ZABBIX_USER_HOME_DIR}/mibs \ - ${ZABBIX_USER_HOME_DIR}/modules \ - ${ZABBIX_USER_HOME_DIR}/snmptraps \ - ${ZABBIX_USER_HOME_DIR}/ssh_keys \ - ${ZABBIX_USER_HOME_DIR}/ssl \ - ${ZABBIX_USER_HOME_DIR}/ssl/certs \ - ${ZABBIX_USER_HOME_DIR}/ssl/keys \ - ${ZABBIX_USER_HOME_DIR}/ssl/ssl_ca \ - /usr/lib/zabbix/alertscripts \ - /usr/lib/zabbix/externalscripts \ - /usr/share/doc/zabbix-server-mysql && \ - FIX_PERM_LIST="\ - ${ZABBIX_CONF_DIR}/zabbix_server_modules.conf \ - ${ZABBIX_USER_HOME_DIR}/" && \ - chown --quiet -R zabbix:0 ${FIX_PERM_LIST} && \ - chmod -R g=u ${FIX_PERM_LIST} && \ - chown --quiet zabbix:0 ${ZABBIX_CONF_DIR}/ && \ - chmod g=u ${ZABBIX_CONF_DIR} && \ - /usr/sbin/zabbix_server -V - -RUN --mount=from=entrypoints,target=/tmp/entrypoints,ro \ - set -eux && \ - install -d /usr/lib/docker-entrypoint && \ - install -m 0755 /tmp/entrypoints/server-mysql.sh /usr/bin/docker-entrypoint.sh && \ - install -m 0644 /tmp/entrypoints/lib/*.sh /usr/lib/docker-entrypoint/ - -EXPOSE 10051/tcp - -WORKDIR ${ZABBIX_USER_HOME_DIR} - -VOLUME ["${ZABBIX_USER_HOME_DIR}/snmptraps", "${ZABBIX_USER_HOME_DIR}/export"] - -USER 1997 - -ENTRYPOINT ["/usr/bin/docker-entrypoint.sh"] - -CMD ["/usr/sbin/zabbix_server", "--foreground", "-c", "/etc/zabbix/zabbix_server.conf"] diff --git a/Dockerfiles/server-mysql/ubuntu/README.md b/Dockerfiles/server-mysql/ubuntu/README.md deleted file mode 120000 index 32d46ee8..00000000 --- a/Dockerfiles/server-mysql/ubuntu/README.md +++ /dev/null @@ -1 +0,0 @@ -../README.md \ No newline at end of file diff --git a/Dockerfiles/server-mysql/ubuntu/build.sh b/Dockerfiles/server-mysql/ubuntu/build.sh deleted file mode 120000 index 46b20313..00000000 --- a/Dockerfiles/server-mysql/ubuntu/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../../build.sh \ No newline at end of file diff --git a/Dockerfiles/server-pgsql/README.md b/Dockerfiles/server-pgsql/README.md deleted file mode 100644 index 7f6372f7..00000000 --- a/Dockerfiles/server-pgsql/README.md +++ /dev/null @@ -1,339 +0,0 @@ -![logo](https://assets.zabbix.com/img/logo/zabbix_logo_500x131.png) - -# What is Zabbix? - -Zabbix is an enterprise-class open source distributed monitoring solution. - -Zabbix is software that monitors numerous parameters of a network and the health and integrity of servers. Zabbix uses a flexible notification mechanism that allows users to configure e-mail based alerts for virtually any event. This allows a fast reaction to server problems. Zabbix offers excellent reporting and data visualisation features based on the stored data. This makes Zabbix ideal for capacity planning. - -For more information and related downloads for Zabbix components, please visit https://hub.docker.com/u/zabbix/ and https://zabbix.com - -# What is Zabbix server? - -Zabbix server is the central process of Zabbix software. - -The server performs the polling and trapping of data, it calculates triggers, sends notifications to users. It is the central component to which Zabbix agents and proxies report data on availability and integrity of systems. The server can itself remotely check networked services (such as web servers and mail servers) using simple service checks. - -# Zabbix server images - -These are the only official Zabbix server Docker images. They are based on Alpine Linux v3.24, Ubuntu 26.04 (resolute), CentOS Stream 10 and Oracle Linux 10 images. The available versions of Zabbix server are: - - Zabbix server 6.0 (tags: alpine-6.0-latest, ubuntu-6.0-latest, ol-6.0-latest) - Zabbix server 6.0.* (tags: alpine-6.0.*, ubuntu-6.0.*, ol-6.0.*) - Zabbix server 7.0 (tags: alpine-7.0-latest, ubuntu-7.0-latest, ol-7.0-latest) - Zabbix server 7.0.* (tags: alpine-7.0.*, ubuntu-7.0.*, ol-7.0.*) - Zabbix server 7.2 (tags: alpine-7.2-latest, ubuntu-7.2-latest, ol-7.2-latest) - Zabbix server 7.2.* (tags: alpine-7.2.*, ubuntu-7.2.*, ol-7.2.*) - Zabbix server 7.4 (tags: alpine-7.4-latest, ubuntu-7.4-latest, ol-7.4-latest, alpine-latest, ubuntu-latest, ol-latest, latest) - Zabbix server 7.4.* (tags: alpine-7.4.*, ubuntu-7.4.*, ol-7.4.*) - Zabbix server 8.0 (tags: alpine-trunk, ubuntu-trunk, ol-trunk) - -Images are updated when new releases are published. The image with ``latest`` tag is based on Alpine Linux. - -The image uses PostgreSQL database. It uses the next procedure to start: -- Checking database availability -- Checking of having `POSTGRES_DB` database. Creating `POSTGRES_DB` database name if it does not exist -- Checking of having `dbversion` table. Creating Zabbix server database schema and upload initial data sample if no `dbversion` table - -# How to use this image - -## Start `zabbix-server-pgsql` - -Start a Zabbix server container as follows: - - docker run --name some-zabbix-server-pgsql -e DB_SERVER_HOST="some-postgres-server" -e POSTGRES_USER="some-user" -e POSTGRES_PASSWORD="some-password" --init -d zabbix/zabbix-server-pgsql:tag - -Where `some-zabbix-server-pgsql` is the name you want to assign to your container, `some-postgres-server` is IP or DNS name of PostgreSQL server, `some-user` is user to connect to Zabbix database on PostgreSQL server, `some-password` is the password to connect to PostgreSQL server and `tag` is the tag specifying the version you want. See the list above for relevant tags, or look at the [full list of tags](https://hub.docker.com/r/zabbix/zabbix-server-pgsql/tags/). - -> [!NOTE] -> Zabbix server has possibility to execute `fping` utility to perform ICMP checks. When containers are running in rootless mode or with specific restrictions environment, you may face errors related to fping: -> `fping: Operation not permitted` -> or -> lost all packets to all resources -> in this case add `--cap-add=net_raw` to `docker run` or `podman run` commands. -> Additionally fping executing in non-root environments can require sysctl modification: -> `net.ipv4.ping_group_range=0 1995` -> where 1995 is `zabbix` GID. - -## Container shell access and viewing Zabbix server logs - -The `docker exec` command allows you to run commands inside a Docker container. The following command line will give you a bash shell inside your `zabbix-server-pgsql` container: - -```console -$ docker exec -ti some-zabbix-server-pgsql /bin/bash -``` - -The Zabbix server log is available through Docker's container log: - -```console -$ docker logs some-zabbix-server-pgsql -``` - -## Environment Variables - -When you start the `zabbix-server-pgsql` image, you can adjust the configuration of the Zabbix server by passing one or more environment variables on the `docker run` command line. - -### `DB_SERVER_HOST` - -This variable is IP or DNS name of PostgreSQL server. By default, value is 'postgres-server' - -### `DB_SERVER_PORT` - -This variable is port of PostgreSQL server. By default, value is '5432'. - -### `POSTGRES_USER`, `POSTGRES_PASSWORD`, `POSTGRES_USER_FILE`, `POSTGRES_PASSWORD_FILE` - -These variables are used by Zabbix server to connect to Zabbix database. With the `_FILE` variables you can instead provide the path to a file which contains the user / the password instead. Without Docker Swarm or Kubernetes you also have to map the files. Those are exclusive so you can just provide one type - either `POSTGRES_USER` or `POSTGRES_USER_FILE`! - -```console -docker run --name some-zabbix-server-pgsql -e DB_SERVER_HOST="some-postgres-server" -v ./.POSTGRES_USER:/run/secrets/POSTGRES_USER -e POSTGRES_USER_FILE=/run/secrets/POSTGRES_USER -v ./.POSTGRES_PASSWORD:/run/secrets/POSTGRES_PASSWORD -e POSTGRES_PASSWORD_FILE=/var/run/secrets/POSTGRES_PASSWORD --init -d zabbix/zabbix-server-pgsql:tag -``` - -With Docker Swarm or Kubernetes this works with secrets. That way it is replicated in your cluster! - -```console -printf "zabbix" | docker secret create POSTGRES_USER - -printf "zabbix" | docker secret create POSTGRES_PASSWORD - -docker run --name some-zabbix-server-pgsql -e DB_SERVER_HOST="some-postgres-server" -e POSTGRES_USER_FILE=/run/secrets/POSTGRES_USER -e POSTGRES_PASSWORD_FILE=/run/secrets/POSTGRES_PASSWORD --init -d zabbix/zabbix-server-pgsql:tag -``` - -By default, values for `POSTGRES_USER` and `POSTGRES_PASSWORD` are `zabbix`, `zabbix`. - -### `POSTGRES_DB` - -The variable is Zabbix database name. By default, value is `zabbix`. - -### `POSTGRES_USE_IMPLICIT_SEARCH_PATH` - -In some setups, for example including [PgBouncer](https://www.pgbouncer.org), setting the `search_path` via connection parameters fails. If this variable is set to `"true"`, the image skips setting the `search_path` and trusts that the `search_path` of the Zabbix user is setup correctly in PostgreSQL database. - -### `ZBX_LOADMODULE` - -The variable is list of comma separated loadable Zabbix modules. It works with volume ``/var/lib/zabbix/modules``. The syntax of the variable is ``dummy1.so,dummy2.so``. - -### `ZBX_DEBUGLEVEL` - -The variable is used to specify debug level. By default, value is ``3``. It is ``DebugLevel`` parameter in ``zabbix_server.conf``. Allowed values are listed below: -- ``0`` - basic information about starting and stopping of Zabbix processes; -- ``1`` - critical information -- ``2`` - error information -- ``3`` - warnings -- ``4`` - for debugging (produces lots of information) -- ``5`` - extended debugging (produces even more information) - -### `ZBX_TIMEOUT` - -The variable is used to specify timeout for processing checks. By default, value is ``4``. - -### Other variables - -Additionally the image allows to specify many other environment variables listed below: - -``` -ZBX_ALLOWUNSUPPORTEDDBVERSIONS=0 # Available since 6.0.0 -ZBX_DBTLSCONNECT= # Available since 5.0.0 -ZBX_DBTLSCAFILE= # Available since 5.0.0 -ZBX_DBTLSCERTFILE= # Available since 5.0.0 -ZBX_DBTLSKEYFILE= # Available since 5.0.0 -ZBX_DBTLSCIPHER= # Available since 5.0.0 -ZBX_DBTLSCIPHER13= # Available since 5.0.0 -ZBX_VAULT=HashiCorp # Allowed values: HashiCorp, CyberArk. Required when Vault is used. Available since 6.2.0 -ZBX_VAULTDBPATH= # Available since 5.2.0 -ZBX_VAULTPREFIX= # Available since 7.0.0 -ZBX_VAULTURL=https://127.0.0.1:8200 # Available since 5.2.0 -VAULT_TOKEN= # Available since 5.2.0 -ZBX_VAULTTLSCERTFILE= # Available since 6.2.0 -ZBX_VAULTTLSKEYFILE= # Available since 6.2.0 -ZBX_LISTENIP= -ZBX_LISTENPORT=10051 -ZBX_LISTENBACKLOG= -ZBX_STARTREPORTWRITERS=0 # Available since 5.4.0 -ZBX_WEBSERVICEURL=http://zabbix-web-service:10053/report # Available since 5.4.0 -ZBX_SERVICEMANAGERSYNCFREQUENCY=60 # Available since 6.0.0 -ZBX_HISTORYSTORAGEURL= # Available since 3.4.0 -ZBX_HISTORYSTORAGETYPES=uint,dbl,str,log,text # Available since 3.4.0 -ZBX_ENABLEGLOBALSCRIPTS=0 # Available since 7.0.0 -ZBX_ALLOWSOFTWAREUPDATECHECK=1 # Available since 7.0.0 -ZBX_MAXCONCURRENTCHECKSPERPOLLER=1000 # Available since 7.0.0 -ZBX_STARTAGENTPOLLERS=1 # Available since 7.0.0 -ZBX_STARTHTTPAGENTPOLLERS=1 # Available since 7.0.0 -ZBX_STARTPOLLERS=5 -ZBX_STARTIPMIPOLLERS=0 -ZBX_STARTCONNECTORS=0 # Available since 6.4.0 -ZBX_STARTPREPROCESSORS=16 # Available since 3.4.0 -ZBX_STARTPOLLERSUNREACHABLE=1 -ZBX_STARTTRAPPERS=5 -ZBX_STARTPINGERS=1 -ZBX_STARTDISCOVERERS=5 -ZBX_STARTHISTORYPOLLERS=5 # Available since 5.4.0 -ZBX_STARTHTTPPOLLERS=1 -ZBX_STARTODBCPOLLERS=1 # Available since 6.0.0 -ZBX_STARTTIMERS=1 -ZBX_STARTESCALATORS=1 -ZBX_STARTALERTERS=3 # Available since 3.4.0 -ZBX_JAVAGATEWAY=zabbix-java-gateway -ZBX_JAVAGATEWAYPORT=10052 -ZBX_STARTJAVAPOLLERS=5 -ZBX_STARTLLDPROCESSORS=2 # Available since 4.2.0 -ZBX_STATSALLOWEDIP= # Available since 4.0.5 -ZBX_STARTVMWARECOLLECTORS=0 -ZBX_VMWAREFREQUENCY=60 -ZBX_VMWAREPERFFREQUENCY=60 -ZBX_VMWARECACHESIZE=8M -ZBX_VMWARETIMEOUT=10 -ZBX_ENABLE_SNMP_TRAPS=false -ZBX_SOURCEIP= -ZBX_SMSDEVICES= -ZBX_HOUSEKEEPINGFREQUENCY=1 -ZBX_MAXHOUSEKEEPERDELETE=5000 -ZBX_PROBLEMHOUSEKEEPINGFREQUENCY=60 # Available since 6.0.0 -ZBX_CACHESIZE=32M -ZBX_CACHEUPDATEFREQUENCY=10 -ZBX_STARTDBSYNCERS=4 -ZBX_EXPORTFILESIZE=1G # Available since 4.0.0 -ZBX_EXPORTTYPE= # Available since 5.0.10 and 5.2.6 -ZBX_AUTOHANODENAME=fqdn # Allowed values: fqdn, hostname. Available since 6.0.0 -ZBX_HANODENAME= # Available since 6.0.0 -ZBX_AUTONODEADDRESS=fqdn # Allowed values: fqdn, hostname. Available since 6.0.0 -ZBX_NODEADDRESSPORT=10051 # Allowed to use with ZBX_AUTONODEADDRESS variable only. Available since 6.0.0 -ZBX_NODEADDRESS=localhost # Available since 6.0.0 -ZBX_HISTORYCACHESIZE=16M -ZBX_HISTORYINDEXCACHESIZE=4M -ZBX_HISTORYSTORAGEDATEINDEX=0 # Available since 4.0.0 -ZBX_TRENDCACHESIZE=4M -ZBX_TRENDFUNCTIONCACHESIZE=4M -ZBX_VALUECACHESIZE=8M -ZBX_TRAPPERTIMEOUT=300 -ZBX_UNREACHABLEPERIOD=45 -ZBX_UNAVAILABLEDELAY=60 -ZBX_UNREACHABLEDELAY=15 -ZBX_LOGSLOWQUERIES=3000 -ZBX_STARTPROXYPOLLERS=1 -ZBX_PROXYCONFIGFREQUENCY=10 -ZBX_PROXYDATAFREQUENCY=1 -ZBX_TLSLISTEN= # Available since 7.4.0 -ZBX_TLSCAFILE= -ZBX_TLSCA= -ZBX_TLSCRLFILE= -ZBX_TLSCRL= -ZBX_TLSCERTFILE= -ZBX_TLSCERT= -ZBX_TLSKEYFILE= -ZBX_TLSKEY= -ZBX_TLSCIPHERALL= # Available since 4.4.7 -ZBX_TLSCIPHERALL13= # Available since 4.4.7 -ZBX_TLSCIPHERCERT= # Available since 4.4.7 -ZBX_TLSCIPHERCERT13= # Available since 4.4.7 -ZBX_TLSCIPHERPSK= # Available since 4.4.7 -ZBX_TLSCIPHERPSK13= # Available since 4.4.7 -ZBX_TLS_FRONTENDACCEPT= # Available since 7.4.0 -ZBX_FRONTENDALLOWEDIP= # Available since 7.4.0 -ZBX_TLSFRONTENDCERTISSUER= # Available since 7.4.0 -ZBX_TLSFRONTENDCERTSUBJECT= # Available since 7.4.0 -ZBX_WEBDRIVERURL= # Available since 7.0.0 -ZBX_STARTBROWSERPOLLERS=1 # Available since 7.0.0 -ZBX_STARTSNMPPOLLERS=1 # Available since 7.0.0 - -``` - -Default values of these variables are specified after equal sign. - -The allowed variables are identical of parameters in official ``zabbix_server.conf``. For example, ``ZBX_LOGSLOWQUERIES`` = ``LogSlowQueries``. - -Please use official documentation for [``zabbix_server.conf``](https://www.zabbix.com/documentation/current/manual/appendix/config/zabbix_server) to get more information about the variables. - -## Allowed volumes for the Zabbix server container - -### ``/usr/lib/zabbix/alertscripts`` - -The volume is used for custom alert scripts. It is `AlertScriptsPath` parameter in ``zabbix_server.conf``. - -### ``/usr/lib/zabbix/externalscripts`` - -The volume is used by External checks (type of items). It is `ExternalScripts` parameter in ``zabbix_server.conf``. - -### ``/var/lib/zabbix/modules`` - -The volume allows load additional modules and extend Zabbix server using ``LoadModule`` feature. - -### ``/var/lib/zabbix/enc`` - -The volume is used to store TLS related files. These file names are specified using ``ZBX_TLSCAFILE``, ``ZBX_TLSCRLFILE``, ``ZBX_TLSCERTFILE`` and ``ZBX_TLSKEYFILE`` variables. Additionally it is possible to use environment variables ``ZBX_TLSCA``, ``ZBX_TLSCRL``, ``ZBX_TLSCERT`` and ``ZBX_TLSKEY`` with plaintext values. - -### ``/var/lib/zabbix/ssh_keys`` - -The volume is used as location of public and private keys for SSH checks and actions. It is `SSHKeyLocation` parameter in ``zabbix_server.conf``. - -### ``/var/lib/zabbix/ssl/certs`` - -The volume is used as location of SSL client certificate files for client authentication. It is `SSLCertLocation` parameter in ``zabbix_server.conf``. - -### ``/var/lib/zabbix/ssl/keys`` - -The volume is used as location of SSL private key files for client authentication. It is `SSLKeyLocation` parameter in ``zabbix_server.conf``. - -### ``/var/lib/zabbix/ssl/ssl_ca`` - -The volume is used as location of certificate authority (CA) files for SSL server certificate verification. It is `SSLCALocation` parameter in ``zabbix_server.conf``. - -### ``/var/lib/zabbix/snmptraps`` - -The volume is used as location of ``snmptraps.log`` file. It could be shared by ``zabbix-snmptraps`` container and inherited using `volumes_from` Docker option while creating new instance of Zabbix server. -SNMP traps processing feature could be enabled using shared volume and switched ``ZBX_ENABLE_SNMP_TRAPS`` environment variable to `true`. - -### ``/var/lib/zabbix/mibs`` - -The volume allows to add new MIB files. It does not support subdirectories, all MIBs must be placed in ``/var/lib/zabbix/mibs``. - -### ``/var/lib/zabbix/export`` - -Directory for real-time export of events, history and trends in newline-delimited JSON format. Could be enabled using ``ZBX_EXPORTFILESIZE`` environment variable. - -# The image variants - -The `zabbix-server-pgsql` images come in many flavors, each designed for a specific use case. - -## `zabbix-server-pgsql:alpine-` - -This image is based on the popular [Alpine Linux project](http://alpinelinux.org), available in [the `alpine` official image](https://hub.docker.com/_/alpine). Alpine Linux is much smaller than most distribution base images (~5MB), and thus leads to much slimmer images in general. - -This variant is highly recommended when final image size being as small as possible is desired. The main caveat to note is that it does use [musl libc](http://www.musl-libc.org) instead of [glibc and friends](http://www.etalabs.net/compare_libcs.html), so certain software might run into issues depending on the depth of their libc requirements. However, most software doesn't have an issue with this, so this variant is usually a very safe choice. See [this Hacker News comment thread](https://news.ycombinator.com/item?id=10782897) for more discussion of the issues that might arise and some pro/con comparisons of using Alpine-based images. - -To minimize image size, it's uncommon for additional related tools (such as `git` or `bash`) to be included in Alpine-based images. Using this image as a base, add the things you need in your own Dockerfile (see the [`alpine` image description](https://hub.docker.com/_/alpine/) for examples of how to install packages if you are unfamiliar). - -## `zabbix-server-pgsql:ubuntu-` - -This is the defacto image. If you are unsure about what your needs are, you probably want to use this one. It is designed to be used both as a throw away container (mount your source code and start the container to start your app), as well as the base to build other images off of. - -## `zabbix-server-pgsql:ol-` - -Oracle Linux is an open-source operating system available under the GNU General Public License (GPLv2). Suitable for general purpose or Oracle workloads, it benefits from rigorous testing of more than 128,000 hours per day with real-world workloads and includes unique innovations such as Ksplice for zero-downtime kernel patching, DTrace for real-time diagnostics, the powerful Btrfs file system, and more. - -# User Feedback - -## Documentation - -Documentation for this image is stored in the [`server-pgsql/` directory](https://github.com/zabbix/zabbix-docker/tree/7.4/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.4/README.md) before attempting a pull request. - -## Issues - -If you have any problems with or questions about this image, please contact us through a [GitHub issue](https://github.com/zabbix/zabbix-docker/issues). - -### Known issues - -Zabbix server does not support Jabber notifications on Alpine Linux because of `iksemel` package is in testing repository and not available in stable repository. - -## Contributing - -You are invited to contribute new features, fixes, or updates, large or small; we are always thrilled to receive pull requests, and do our best to process them as fast as we can. - -Before you start to code, we recommend discussing your plans through a [GitHub issue](https://github.com/zabbix/zabbix-docker/issues), especially for more ambitious contributions. This gives other contributors a chance to point you in the right direction, give you feedback on your design, and help you find out if someone else is working on the same thing. - -## License - -Starting from Zabbix version 7.0, all subsequent Zabbix versions will be released under the GNU Affero General Public License version 3 (AGPLv3). -You can modify the relevant version and propagate such modified version under the terms of the AGPLv3 as published by the Free Software Foundation. -For additional details, including answers to common questions about the AGPLv3, see the generic FAQ from the [Free Software Foundation](http://www.fsf.org/licenses/gpl-faq.html). - -Zabbix is Open Source Software, however, if you use Zabbix in a commercial context we kindly ask you to support the development of Zabbix by purchasing some level of technical support. -All previous Zabbix software versions up to 6.4 are released under the GNU General Public License version 2 (GPLv2). The formal terms of the GPLv2 and AGPLv3 can be found at http://www.fsf.org/licenses/. diff --git a/Dockerfiles/server-pgsql/alpine/.dockerignore b/Dockerfiles/server-pgsql/alpine/.dockerignore deleted file mode 100644 index 88a84e55..00000000 --- a/Dockerfiles/server-pgsql/alpine/.dockerignore +++ /dev/null @@ -1 +0,0 @@ -build.sh diff --git a/Dockerfiles/server-pgsql/alpine/Dockerfile b/Dockerfiles/server-pgsql/alpine/Dockerfile deleted file mode 100644 index 9aced028..00000000 --- a/Dockerfiles/server-pgsql/alpine/Dockerfile +++ /dev/null @@ -1,136 +0,0 @@ -# syntax=docker/dockerfile:1.6 -ARG OS_BASE_IMAGE=alpine:3.24 -ARG MAJOR_VERSION=7.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.12 -ARG BUILD_BASE_IMAGE=zabbix-build-pgsql:alpine-${ZBX_VERSION} - -FROM ${BUILD_BASE_IMAGE} AS builder - -FROM ${OS_BASE_IMAGE} - -ARG MAJOR_VERSION -ARG ZBX_VERSION -ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git - -ENV TERM=xterm \ - ZBX_VERSION=${ZBX_VERSION} \ - ZBX_SOURCES=${ZBX_SOURCES} \ - MIBDIRS=/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL \ - NMAP_PRIVILEGED= \ - ZABBIX_USER_HOME_DIR=/var/lib/zabbix \ - ZABBIX_CONF_DIR=/etc/zabbix - -ENV ZBX_DB_NAME=dummy_db_name \ - ZBX_FPINGLOCATION=/usr/sbin/fping \ - ZBX_LOADMODULEPATH=${ZABBIX_USER_HOME_DIR}/modules \ - ZBX_SNMPTRAPPERFILE=${ZABBIX_USER_HOME_DIR}/snmptraps/snmptraps.log \ - ZBX_SSHKEYLOCATION=${ZABBIX_USER_HOME_DIR}/ssh_keys/ \ - ZBX_SSLCERTLOCATION=${ZABBIX_USER_HOME_DIR}/ssl/certs/ \ - ZBX_SSLKEYLOCATION=${ZABBIX_USER_HOME_DIR}/ssl/keys/ \ - ZBX_SSLCALOCATION=${ZABBIX_USER_HOME_DIR}/ssl/ssl_ca/ - -LABEL org.opencontainers.image.authors="Alexey Pustovalov " \ - org.opencontainers.image.description="Zabbix server with PostgreSQL database support" \ - org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ - org.opencontainers.image.licenses="AGPL v3.0" \ - org.opencontainers.image.source="${ZBX_SOURCES}" \ - org.opencontainers.image.title="Zabbix server (PostgreSQL)" \ - org.opencontainers.image.url="https://zabbix.com/" \ - org.opencontainers.image.vendor="Zabbix SIA" \ - org.opencontainers.image.version="${ZBX_VERSION}" - -STOPSIGNAL SIGTERM - -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/server/sbin/zabbix_server /usr/sbin/zabbix_server -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/general/bin/zabbix_get /usr/bin/ -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/general/bin/zabbix_sender /usr/bin/ -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/server/conf/ ${ZABBIX_CONF_DIR}/ -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/server/database/postgresql/ /usr/share/doc/zabbix-server-postgresql/ - -RUN set -eux && \ - INSTALL_PKGS="bash \ - gzip \ - tzdata \ - c-ares \ - krb5 \ - libcap \ - libcurl \ - libevent \ - libldap \ - libssh \ - libxml2 \ - net-snmp-agent-libs \ - openipmi-libs \ - openssl \ - pcre2 \ - unixodbc \ - zlib \ - fping \ - iputils \ - nmap \ - traceroute \ - postgresql18-client" && \ - apk add \ - --no-cache \ - --clean-protected \ - ${INSTALL_PKGS} && \ - addgroup \ - --system \ - --gid 1995 \ - zabbix && \ - adduser \ - --system \ - --gecos "Zabbix monitoring system" \ - --disabled-password \ - --uid 1997 \ - --ingroup zabbix \ - --shell /sbin/nologin \ - --home ${ZABBIX_USER_HOME_DIR} \ - zabbix && \ - adduser zabbix dialout && \ - chgrp zabbix /usr/bin/nmap && \ - setcap cap_net_raw+eip /usr/bin/nmap && \ - chmod u+s /usr/sbin/fping && \ - mkdir -p ${ZABBIX_CONF_DIR} \ - ${ZABBIX_USER_HOME_DIR} \ - ${ZABBIX_USER_HOME_DIR}/dbscripts \ - ${ZABBIX_USER_HOME_DIR}/enc \ - ${ZABBIX_USER_HOME_DIR}/enc_internal \ - ${ZABBIX_USER_HOME_DIR}/export \ - ${ZABBIX_USER_HOME_DIR}/mibs \ - ${ZABBIX_USER_HOME_DIR}/modules \ - ${ZABBIX_USER_HOME_DIR}/snmptraps \ - ${ZABBIX_USER_HOME_DIR}/ssh_keys \ - ${ZABBIX_USER_HOME_DIR}/ssl \ - ${ZABBIX_USER_HOME_DIR}/ssl/certs \ - ${ZABBIX_USER_HOME_DIR}/ssl/keys \ - ${ZABBIX_USER_HOME_DIR}/ssl/ssl_ca \ - /usr/lib/zabbix/alertscripts \ - /usr/lib/zabbix/externalscripts \ - /usr/share/doc/zabbix-server-postgresql && \ - FIX_PERM_LIST="\ - ${ZABBIX_CONF_DIR}/zabbix_server_modules.conf \ - ${ZABBIX_USER_HOME_DIR}/" && \ - chown --quiet -R zabbix:0 ${FIX_PERM_LIST} && \ - chmod -R g=u ${FIX_PERM_LIST} && \ - chown --quiet zabbix:0 ${ZABBIX_CONF_DIR}/ && \ - chmod g=u ${ZABBIX_CONF_DIR} && \ - /usr/sbin/zabbix_server -V - -RUN --mount=from=entrypoints,target=/tmp/entrypoints,ro \ - set -eux && \ - install -d /usr/lib/docker-entrypoint && \ - install -m 0755 /tmp/entrypoints/server-pgsql.sh /usr/bin/docker-entrypoint.sh && \ - install -m 0644 /tmp/entrypoints/lib/*.sh /usr/lib/docker-entrypoint/ - -EXPOSE 10051/tcp - -WORKDIR ${ZABBIX_USER_HOME_DIR} - -VOLUME ["${ZABBIX_USER_HOME_DIR}/snmptraps", "${ZABBIX_USER_HOME_DIR}/export"] - -USER 1997 - -ENTRYPOINT ["/usr/bin/docker-entrypoint.sh"] - -CMD ["/usr/sbin/zabbix_server", "--foreground", "-c", "/etc/zabbix/zabbix_server.conf"] diff --git a/Dockerfiles/server-pgsql/alpine/README.md b/Dockerfiles/server-pgsql/alpine/README.md deleted file mode 120000 index 32d46ee8..00000000 --- a/Dockerfiles/server-pgsql/alpine/README.md +++ /dev/null @@ -1 +0,0 @@ -../README.md \ No newline at end of file diff --git a/Dockerfiles/server-pgsql/alpine/build.sh b/Dockerfiles/server-pgsql/alpine/build.sh deleted file mode 120000 index 46b20313..00000000 --- a/Dockerfiles/server-pgsql/alpine/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../../build.sh \ No newline at end of file diff --git a/Dockerfiles/server-pgsql/centos/.dockerignore b/Dockerfiles/server-pgsql/centos/.dockerignore deleted file mode 100644 index 88a84e55..00000000 --- a/Dockerfiles/server-pgsql/centos/.dockerignore +++ /dev/null @@ -1 +0,0 @@ -build.sh diff --git a/Dockerfiles/server-pgsql/centos/Dockerfile b/Dockerfiles/server-pgsql/centos/Dockerfile deleted file mode 100644 index c4de47a4..00000000 --- a/Dockerfiles/server-pgsql/centos/Dockerfile +++ /dev/null @@ -1,155 +0,0 @@ -# syntax=docker/dockerfile:1.6 -ARG OS_BASE_IMAGE=quay.io/centos/centos:stream10-minimal -ARG MAJOR_VERSION=7.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.12 -ARG BUILD_BASE_IMAGE=zabbix-build-pgsql:centos-${ZBX_VERSION} - -FROM ${BUILD_BASE_IMAGE} AS builder - -FROM ${OS_BASE_IMAGE} - -ARG MAJOR_VERSION -ARG ZBX_VERSION -ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git - -ENV TERM=xterm \ - ZBX_VERSION=${ZBX_VERSION} \ - ZBX_SOURCES=${ZBX_SOURCES} \ - MIBDIRS=/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL \ - NMAP_PRIVILEGED= \ - ZABBIX_USER_HOME_DIR=/var/lib/zabbix \ - ZABBIX_CONF_DIR=/etc/zabbix - -ENV ZBX_DB_NAME=dummy_db_name \ - ZBX_FPINGLOCATION=/usr/sbin/fping \ - ZBX_LOADMODULEPATH=${ZABBIX_USER_HOME_DIR}/modules \ - ZBX_SNMPTRAPPERFILE=${ZABBIX_USER_HOME_DIR}/snmptraps/snmptraps.log \ - ZBX_SSHKEYLOCATION=${ZABBIX_USER_HOME_DIR}/ssh_keys/ \ - ZBX_SSLCERTLOCATION=${ZABBIX_USER_HOME_DIR}/ssl/certs/ \ - ZBX_SSLKEYLOCATION=${ZABBIX_USER_HOME_DIR}/ssl/keys/ \ - ZBX_SSLCALOCATION=${ZABBIX_USER_HOME_DIR}/ssl/ssl_ca/ - -LABEL org.opencontainers.image.authors="Alexey Pustovalov " \ - org.opencontainers.image.description="Zabbix server with PostgreSQL database support" \ - org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ - org.opencontainers.image.licenses="AGPL v3.0" \ - org.opencontainers.image.source="${ZBX_SOURCES}" \ - org.opencontainers.image.title="Zabbix server (PostgreSQL)" \ - org.opencontainers.image.url="https://zabbix.com/" \ - org.opencontainers.image.vendor="Zabbix SIA" \ - org.opencontainers.image.version="${ZBX_VERSION}" - -STOPSIGNAL SIGTERM - -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/server/sbin/zabbix_server /usr/sbin/zabbix_server -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/general/bin/zabbix_get /usr/bin/ -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/general/bin/zabbix_sender /usr/bin/ -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/server/conf/ ${ZABBIX_CONF_DIR}/ -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/server/database/postgresql/ /usr/share/doc/zabbix-server-postgresql/ - -RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ - --mount=type=tmpfs,target=/var/cache/yum/ \ - set -eux && \ - INSTALL_PKGS="bash \ - gzip \ - hostname \ - shadow-utils \ - c-ares \ - file-libs \ - libbrotli \ - libevent \ - libpsl \ - libssh \ - libxml2 \ - net-snmp-libs \ - OpenIPMI-libs \ - openldap \ - openssl \ - openssl-libs \ - pcre2 \ - postgresql18-private-libs \ - unixODBC \ - zlib \ - fping \ - iputils \ - krb5-workstation \ - nmap \ - traceroute \ - postgresql18" && \ - microdnf -y install \ - --disablerepo="*" \ - --enablerepo="extras-common" \ - --setopt=install_weak_deps=0 \ - --setopt=keepcache=0 \ - --best \ - --nodocs \ - epel-release && \ - microdnf -y install \ - --disablerepo="*" \ - --enablerepo="baseos" \ - --enablerepo="appstream" \ - --enablerepo="epel" \ - --setopt=install_weak_deps=0 \ - --setopt=keepcache=0 \ - --best \ - --nodocs \ - ${INSTALL_PKGS} && \ - microdnf swap -y libcurl-minimal libcurl && \ - groupadd \ - --system \ - --gid 1995 \ - zabbix && \ - useradd \ - --system \ - --comment "Zabbix monitoring system" \ - -g zabbix \ - -G dialout \ - --uid 1997 \ - --shell /sbin/nologin \ - --home-dir ${ZABBIX_USER_HOME_DIR} \ - zabbix && \ - chgrp zabbix /usr/bin/nmap && \ - setcap cap_net_raw+eip /usr/bin/nmap && \ - mkdir -p ${ZABBIX_CONF_DIR} \ - ${ZABBIX_USER_HOME_DIR} \ - ${ZABBIX_USER_HOME_DIR}/dbscripts \ - ${ZABBIX_USER_HOME_DIR}/enc \ - ${ZABBIX_USER_HOME_DIR}/enc_internal \ - ${ZABBIX_USER_HOME_DIR}/export \ - ${ZABBIX_USER_HOME_DIR}/mibs \ - ${ZABBIX_USER_HOME_DIR}/modules \ - ${ZABBIX_USER_HOME_DIR}/snmptraps \ - ${ZABBIX_USER_HOME_DIR}/ssh_keys \ - ${ZABBIX_USER_HOME_DIR}/ssl \ - ${ZABBIX_USER_HOME_DIR}/ssl/certs \ - ${ZABBIX_USER_HOME_DIR}/ssl/keys \ - ${ZABBIX_USER_HOME_DIR}/ssl/ssl_ca \ - /usr/lib/zabbix/alertscripts \ - /usr/lib/zabbix/externalscripts \ - /usr/share/doc/zabbix-server-postgresql && \ - FIX_PERM_LIST="\ - ${ZABBIX_CONF_DIR}/zabbix_server_modules.conf \ - ${ZABBIX_USER_HOME_DIR}/" && \ - chown --quiet -R zabbix:0 ${FIX_PERM_LIST} && \ - chmod -R g=u ${FIX_PERM_LIST} && \ - chown --quiet zabbix:0 ${ZABBIX_CONF_DIR}/ && \ - chmod g=u ${ZABBIX_CONF_DIR} && \ - /usr/sbin/zabbix_server -V - -RUN --mount=from=entrypoints,target=/tmp/entrypoints,ro \ - set -eux && \ - install -d /usr/lib/docker-entrypoint && \ - install -m 0755 /tmp/entrypoints/server-pgsql.sh /usr/bin/docker-entrypoint.sh && \ - install -m 0644 /tmp/entrypoints/lib/*.sh /usr/lib/docker-entrypoint/ - -EXPOSE 10051/tcp - -WORKDIR ${ZABBIX_USER_HOME_DIR} - -VOLUME ["${ZABBIX_USER_HOME_DIR}/snmptraps", "${ZABBIX_USER_HOME_DIR}/export"] - -USER 1997 - -ENTRYPOINT ["/usr/bin/docker-entrypoint.sh"] - -CMD ["/usr/sbin/zabbix_server", "--foreground", "-c", "/etc/zabbix/zabbix_server.conf"] diff --git a/Dockerfiles/server-pgsql/centos/README.md b/Dockerfiles/server-pgsql/centos/README.md deleted file mode 120000 index 32d46ee8..00000000 --- a/Dockerfiles/server-pgsql/centos/README.md +++ /dev/null @@ -1 +0,0 @@ -../README.md \ No newline at end of file diff --git a/Dockerfiles/server-pgsql/centos/build.sh b/Dockerfiles/server-pgsql/centos/build.sh deleted file mode 120000 index 46b20313..00000000 --- a/Dockerfiles/server-pgsql/centos/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../../build.sh \ No newline at end of file diff --git a/Dockerfiles/server-pgsql/ol/.dockerignore b/Dockerfiles/server-pgsql/ol/.dockerignore deleted file mode 100644 index 88a84e55..00000000 --- a/Dockerfiles/server-pgsql/ol/.dockerignore +++ /dev/null @@ -1 +0,0 @@ -build.sh diff --git a/Dockerfiles/server-pgsql/ol/Dockerfile b/Dockerfiles/server-pgsql/ol/Dockerfile deleted file mode 100644 index 84089b67..00000000 --- a/Dockerfiles/server-pgsql/ol/Dockerfile +++ /dev/null @@ -1,151 +0,0 @@ -# syntax=docker/dockerfile:1.6 -ARG OS_BASE_IMAGE=container-registry.oracle.com/os/oraclelinux:10-slim -ARG MAJOR_VERSION=7.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.12 -ARG BUILD_BASE_IMAGE=zabbix-build-pgsql:ol-${ZBX_VERSION} - -FROM ${BUILD_BASE_IMAGE} AS builder - -FROM ${OS_BASE_IMAGE} - -ARG MAJOR_VERSION -ARG ZBX_VERSION -ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git - -ENV TERM=xterm \ - ZBX_VERSION=${ZBX_VERSION} \ - ZBX_SOURCES=${ZBX_SOURCES} \ - MIBDIRS=/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL \ - NMAP_PRIVILEGED= \ - ZABBIX_USER_HOME_DIR=/var/lib/zabbix \ - ZABBIX_CONF_DIR=/etc/zabbix - -ENV ZBX_DB_NAME=dummy_db_name \ - ZBX_FPINGLOCATION=/usr/sbin/fping \ - ZBX_LOADMODULEPATH=${ZABBIX_USER_HOME_DIR}/modules \ - ZBX_SNMPTRAPPERFILE=${ZABBIX_USER_HOME_DIR}/snmptraps/snmptraps.log \ - ZBX_SSHKEYLOCATION=${ZABBIX_USER_HOME_DIR}/ssh_keys/ \ - ZBX_SSLCERTLOCATION=${ZABBIX_USER_HOME_DIR}/ssl/certs/ \ - ZBX_SSLKEYLOCATION=${ZABBIX_USER_HOME_DIR}/ssl/keys/ \ - ZBX_SSLCALOCATION=${ZABBIX_USER_HOME_DIR}/ssl/ssl_ca/ - -LABEL org.opencontainers.image.title="Zabbix server (PostgreSQL)" \ - org.opencontainers.image.authors="Alexey Pustovalov " \ - org.opencontainers.image.vendor="Zabbix SIA" \ - org.opencontainers.image.url="https://zabbix.com/" \ - org.opencontainers.image.description="Zabbix server with PostgreSQL database support" \ - org.opencontainers.image.licenses="AGPL v3.0" \ - org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ - org.opencontainers.image.version="${ZBX_VERSION}" \ - org.opencontainers.image.source="${ZBX_SOURCES}" - -STOPSIGNAL SIGTERM - -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/server/sbin/zabbix_server /usr/sbin/zabbix_server -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/general/bin/zabbix_get /usr/bin/ -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/general/bin/zabbix_sender /usr/bin/ -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/server/conf/ ${ZABBIX_CONF_DIR}/ -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/server/database/postgresql/ /usr/share/doc/zabbix-server-postgresql/ - -RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ - --mount=type=tmpfs,target=/var/cache/yum/ \ - set -eux && \ - INSTALL_PKGS="bash \ - gzip \ - hostname \ - c-ares \ - file-libs \ - libevent \ - libssh \ - libxml2 \ - net-snmp-libs \ - OpenIPMI-libs \ - openldap \ - openssl \ - openssl-libs \ - pcre2 \ - postgresql18-private-libs \ - unixODBC \ - zlib \ - fping \ - iputils \ - krb5-workstation \ - nmap \ - traceroute \ - postgresql18" && \ - microdnf -y install \ - --disablerepo="*" \ - --enablerepo="ol10_baseos_latest" \ - --setopt=install_weak_deps=0 \ - --setopt=keepcache=0 \ - --best \ - --nodocs \ - oracle-epel-release-el10 && \ - microdnf -y install \ - --disablerepo="*" \ - --enablerepo="ol10_baseos_latest" \ - --enablerepo="ol10_appstream" \ - --enablerepo="ol10_u1_developer_EPEL" \ - --setopt=install_weak_deps=0 \ - --setopt=keepcache=0 \ - --best \ - --nodocs \ - ${INSTALL_PKGS} && \ - groupadd \ - --system \ - --gid 1995 \ - zabbix && \ - useradd \ - --system \ - --comment "Zabbix monitoring system" \ - -g zabbix \ - -G dialout \ - --uid 1997 \ - --shell /sbin/nologin \ - --home-dir ${ZABBIX_USER_HOME_DIR} \ - zabbix && \ - chgrp zabbix /usr/bin/nmap && \ - setcap cap_net_raw+eip /usr/bin/nmap && \ - mkdir -p ${ZABBIX_CONF_DIR} \ - ${ZABBIX_USER_HOME_DIR} \ - ${ZABBIX_USER_HOME_DIR}/dbscripts \ - ${ZABBIX_USER_HOME_DIR}/enc \ - ${ZABBIX_USER_HOME_DIR}/enc_internal \ - ${ZABBIX_USER_HOME_DIR}/export \ - ${ZABBIX_USER_HOME_DIR}/mibs \ - ${ZABBIX_USER_HOME_DIR}/modules \ - ${ZABBIX_USER_HOME_DIR}/snmptraps \ - ${ZABBIX_USER_HOME_DIR}/ssh_keys \ - ${ZABBIX_USER_HOME_DIR}/ssl \ - ${ZABBIX_USER_HOME_DIR}/ssl/certs \ - ${ZABBIX_USER_HOME_DIR}/ssl/keys \ - ${ZABBIX_USER_HOME_DIR}/ssl/ssl_ca \ - /usr/lib/zabbix/alertscripts \ - /usr/lib/zabbix/externalscripts \ - /usr/share/doc/zabbix-server-postgresql && \ - FIX_PERM_LIST="\ - ${ZABBIX_CONF_DIR}/zabbix_server_modules.conf \ - ${ZABBIX_USER_HOME_DIR}/" && \ - chown --quiet -R zabbix:0 ${FIX_PERM_LIST} && \ - chmod -R g=u ${FIX_PERM_LIST} && \ - chown --quiet zabbix:0 ${ZABBIX_CONF_DIR}/ && \ - chmod g=u ${ZABBIX_CONF_DIR} && \ - /usr/sbin/zabbix_server -V - -RUN --mount=from=entrypoints,target=/tmp/entrypoints,ro \ - set -eux && \ - install -d /usr/lib/docker-entrypoint && \ - install -m 0755 /tmp/entrypoints/server-pgsql.sh /usr/bin/docker-entrypoint.sh && \ - install -m 0644 /tmp/entrypoints/lib/*.sh /usr/lib/docker-entrypoint/ - -EXPOSE 10051/tcp - -WORKDIR ${ZABBIX_USER_HOME_DIR} - -VOLUME ["${ZABBIX_USER_HOME_DIR}/snmptraps", "${ZABBIX_USER_HOME_DIR}/export"] - -USER 1997 - -ENTRYPOINT ["/usr/bin/docker-entrypoint.sh"] - -CMD ["/usr/sbin/zabbix_server", "--foreground", "-c", "/etc/zabbix/zabbix_server.conf"] diff --git a/Dockerfiles/server-pgsql/ol/README.md b/Dockerfiles/server-pgsql/ol/README.md deleted file mode 120000 index 32d46ee8..00000000 --- a/Dockerfiles/server-pgsql/ol/README.md +++ /dev/null @@ -1 +0,0 @@ -../README.md \ No newline at end of file diff --git a/Dockerfiles/server-pgsql/ol/build.sh b/Dockerfiles/server-pgsql/ol/build.sh deleted file mode 120000 index 46b20313..00000000 --- a/Dockerfiles/server-pgsql/ol/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../../build.sh \ No newline at end of file diff --git a/Dockerfiles/server-pgsql/rhel/.dockerignore b/Dockerfiles/server-pgsql/rhel/.dockerignore deleted file mode 100644 index 88a84e55..00000000 --- a/Dockerfiles/server-pgsql/rhel/.dockerignore +++ /dev/null @@ -1 +0,0 @@ -build.sh diff --git a/Dockerfiles/server-pgsql/rhel/Dockerfile b/Dockerfiles/server-pgsql/rhel/Dockerfile deleted file mode 100644 index 7307e818..00000000 --- a/Dockerfiles/server-pgsql/rhel/Dockerfile +++ /dev/null @@ -1,172 +0,0 @@ -# syntax=docker/dockerfile:1.6 -ARG OS_BASE_IMAGE=registry.access.redhat.com/ubi10/ubi-minimal:10.2 -ARG MAJOR_VERSION=7.4 -ARG RELEASE=12 -ARG ZBX_VERSION=${MAJOR_VERSION}.12 -ARG BUILD_BASE_IMAGE=zabbix-build-pgsql:rhel-${ZBX_VERSION} - -FROM ${BUILD_BASE_IMAGE} AS builder - -FROM ${OS_BASE_IMAGE} - -ARG MAJOR_VERSION -ARG RELEASE -ARG ZBX_VERSION -ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git - -ENV TERM=xterm \ - ZBX_VERSION=${ZBX_VERSION} \ - ZBX_SOURCES=${ZBX_SOURCES} \ - MIBDIRS=/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL \ - NMAP_PRIVILEGED= \ - ZABBIX_USER_HOME_DIR=/var/lib/zabbix \ - ZABBIX_CONF_DIR=/etc/zabbix - -ENV ZBX_DB_NAME=dummy_db_name \ - ZBX_FPINGLOCATION=/usr/sbin/fping \ - ZBX_LOADMODULEPATH=${ZABBIX_USER_HOME_DIR}/modules \ - ZBX_SNMPTRAPPERFILE=${ZABBIX_USER_HOME_DIR}/snmptraps/snmptraps.log \ - ZBX_SSHKEYLOCATION=${ZABBIX_USER_HOME_DIR}/ssh_keys/ \ - ZBX_SSLCERTLOCATION=${ZABBIX_USER_HOME_DIR}/ssl/certs/ \ - ZBX_SSLKEYLOCATION=${ZABBIX_USER_HOME_DIR}/ssl/keys/ \ - ZBX_SSLCALOCATION=${ZABBIX_USER_HOME_DIR}/ssl/ssl_ca/ - -LABEL description="Zabbix server with PostgreSQL database support" \ - maintainer="alexey.pustovalov@zabbix.com" \ - name="zabbix/zabbix-server-pgsql-74" \ - release="${RELEASE}" \ - run="docker run --name zabbix-server --link postgresql:pgsql-server -p 10051:10051 -d registry.connect.redhat.com/zabbix/zabbix-server-pgsql-74:${ZBX_VERSION}" \ - summary="Zabbix server (PostgreSQL)" \ - url="https://www.zabbix.com/" \ - vendor="Zabbix SIA" \ - version="${MAJOR_VERSION}" \ - io.k8s.description="Zabbix server with PostgreSQL database support" \ - io.k8s.display-name="Zabbix server (PostgreSQL)" \ - io.openshift.expose-services="10051:10051" \ - 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-74:${ZBX_VERSION}" \ - org.label-schema.license="AGPL v3.0" \ - org.label-schema.name="zabbix-server-pgsql-rhel" \ - org.label-schema.schema-version="1.0" \ - org.label-schema.url="https://zabbix.com/" \ - org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ - org.label-schema.vcs-ref="${VCS_REF}" \ - org.label-schema.vcs-url="${ZBX_SOURCES}" \ - org.label-schema.vendor="Zabbix SIA" \ - org.label-schema.version="${ZBX_VERSION}" - -STOPSIGNAL SIGTERM - -COPY licenses /licenses/ -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/server/sbin/zabbix_server /usr/sbin/zabbix_server -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/general/bin/zabbix_get /usr/bin/ -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/general/bin/zabbix_sender /usr/bin/ -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/server/conf/ ${ZABBIX_CONF_DIR}/ -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/server/database/postgresql/ /usr/share/doc/zabbix-server-postgresql/ - -RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ - --mount=type=tmpfs,target=/var/cache/yum/ \ - set -eux && \ - INSTALL_PKGS="bash \ - gzip \ - hostname \ - shadow-utils \ - tzdata \ - c-ares \ - libbrotli \ - libevent \ - libpsl \ - libssh \ - libxml2 \ - net-snmp-agent-libs \ - OpenIPMI-libs \ - openldap \ - openssl \ - pcre2 \ - postgresql18-private-libs \ - unixODBC \ - zlib \ - fping \ - iputils \ - krb5-workstation \ - nmap \ - traceroute \ - postgresql18" && \ - curl --tlsv1.2 -sSf -L https://dl.fedoraproject.org/pub/epel/epel-release-latest-10.noarch.rpm -o /tmp/epel-release-latest-10.noarch.rpm && \ - rpm -ivh /tmp/epel-release-latest-10.noarch.rpm && \ - rm -rf /tmp/epel-release-latest-10.noarch.rpm && \ - ARCH_SUFFIX="$(arch)"; \ - microdnf -y install \ - --disablerepo="*" \ - --enablerepo="ubi-10-baseos-rpms" \ - --enablerepo="ubi-10-appstream-rpms" \ - --enablerepo="rhel-10-for-$ARCH_SUFFIX-baseos-rpms" \ - --enablerepo="rhel-10-for-$ARCH_SUFFIX-appstream-rpms" \ - --enablerepo="codeready-builder-for-rhel-10-$ARCH_SUFFIX-rpms" \ - --enablerepo="epel" \ - --setopt=install_weak_deps=0 \ - --setopt=keepcache=0 \ - --best \ - --setopt=tsflags=nodocs \ - ${INSTALL_PKGS} && \ - microdnf swap -y libcurl-minimal libcurl && \ - groupadd \ - --system \ - --gid 1995 \ - zabbix && \ - useradd \ - --system \ - --comment "Zabbix monitoring system" \ - -g zabbix \ - -G dialout \ - --uid 1997 \ - --shell /sbin/nologin \ - --home-dir ${ZABBIX_USER_HOME_DIR} \ - zabbix && \ - chgrp zabbix /usr/bin/nmap && \ - setcap cap_net_raw+eip /usr/bin/nmap && \ - mkdir -p ${ZABBIX_CONF_DIR} \ - ${ZABBIX_USER_HOME_DIR} \ - ${ZABBIX_USER_HOME_DIR}/dbscripts \ - ${ZABBIX_USER_HOME_DIR}/enc \ - ${ZABBIX_USER_HOME_DIR}/enc_internal \ - ${ZABBIX_USER_HOME_DIR}/export \ - ${ZABBIX_USER_HOME_DIR}/mibs \ - ${ZABBIX_USER_HOME_DIR}/modules \ - ${ZABBIX_USER_HOME_DIR}/snmptraps \ - ${ZABBIX_USER_HOME_DIR}/ssh_keys \ - ${ZABBIX_USER_HOME_DIR}/ssl \ - ${ZABBIX_USER_HOME_DIR}/ssl/certs \ - ${ZABBIX_USER_HOME_DIR}/ssl/keys \ - ${ZABBIX_USER_HOME_DIR}/ssl/ssl_ca \ - /usr/lib/zabbix/alertscripts \ - /usr/lib/zabbix/externalscripts \ - /usr/share/doc/zabbix-server-postgresql && \ - FIX_PERM_LIST="\ - ${ZABBIX_CONF_DIR}/zabbix_server_modules.conf \ - ${ZABBIX_USER_HOME_DIR}/" && \ - chown --quiet -R zabbix:0 ${FIX_PERM_LIST} && \ - chmod -R g=u ${FIX_PERM_LIST} && \ - chown --quiet zabbix:0 ${ZABBIX_CONF_DIR}/ && \ - chmod g=u ${ZABBIX_CONF_DIR} && \ - /usr/sbin/zabbix_server -V - -RUN --mount=from=entrypoints,target=/tmp/entrypoints,ro \ - set -eux && \ - install -d /usr/lib/docker-entrypoint && \ - install -m 0755 /tmp/entrypoints/server-pgsql.sh /usr/bin/docker-entrypoint.sh && \ - install -m 0644 /tmp/entrypoints/lib/*.sh /usr/lib/docker-entrypoint/ - -EXPOSE 10051/tcp - -WORKDIR ${ZABBIX_USER_HOME_DIR} - -VOLUME ["${ZABBIX_USER_HOME_DIR}/snmptraps", "${ZABBIX_USER_HOME_DIR}/export"] - -USER 1997 - -ENTRYPOINT ["/usr/bin/docker-entrypoint.sh"] - -CMD ["/usr/sbin/zabbix_server", "--foreground", "-c", "/etc/zabbix/zabbix_server.conf"] diff --git a/Dockerfiles/server-pgsql/rhel/README.html b/Dockerfiles/server-pgsql/rhel/README.html deleted file mode 100644 index 6346c8c2..00000000 --- a/Dockerfiles/server-pgsql/rhel/README.html +++ /dev/null @@ -1,227 +0,0 @@ -

What is Zabbix?

-

Zabbix is an enterprise-class open source distributed monitoring solution.

-

Zabbix is software that monitors numerous parameters of a network and the health and integrity of servers. Zabbix uses a flexible notification mechanism that allows users to configure e-mail based alerts for virtually any event. This allows a fast reaction to server problems. Zabbix offers excellent reporting and data visualisation features based on the stored data. This makes Zabbix ideal for capacity planning.

-

For more information and related downloads for Zabbix components, please visit zabbix.com

-

What is Zabbix server?

-

Zabbix server is the central process of Zabbix software.

-

The server performs the polling and trapping of data, it calculates triggers, sends notifications to users. It is the central component to which Zabbix agents and proxies report data on availability and integrity of systems. The server can itself remotely check networked services (such as web servers and mail servers) using simple service checks.

-

Zabbix server images

-

Images are updated when new releases are published.

-

The image uses PostgreSQL database. It uses the next procedure to start:

-
    -
  • Checking database availability
    • -
  • Checking of having POSTGRES_DB database. Creating POSTGRES_DB database name if it does not exist
    • -
  • Checking of having dbversion table. Creating Zabbix server database schema and upload initial data sample if no dbversion table
    • -
-

How to use this image

-

Start zabbix-server-pgsql

-

Start a Zabbix server container as follows:

-
podman run \
-    --name some-zabbix-server-pgsql \
-    -e DB_SERVER_HOST="some-postgres-server" \
-    -e POSTGRES_USER="some-user" \
-    -e POSTGRES_PASSWORD="some-password" \
-    --init \
-    -d registry.connect.redhat.com/zabbix/zabbix-server-pgsql-74:tag
-
-

Where some-zabbix-server-pgsql is the name you want to assign to your container, some-postgres-server is IP or DNS name of PostgreSQL server, some-user is user to connect to Zabbix database on PostgreSQL server, some-password is the password to connect to PostgreSQL server and tag is the tag specifying the version you want.

-
-

Note: -Zabbix server has possibility to execute fping utility to perform ICMP checks. When containers are running in rootless mode or with specific restrictions environment, you may face errors related to fping: -fping: Operation not permitted -or -lost all packets to all resources -in this case add --cap-add=net_raw to podman run commands. -Additionally fping executing in non-root environments can require sysctl modification: -net.ipv4.ping_group_range=0 1995 -where 1995 is zabbix GID.

-
-

Container shell access and viewing Zabbix server logs

-

The podman exec command allows you to run commands inside a Podman container. The following command line will give you a bash shell inside your zabbix-server-pgsql container:

-
$ podman exec -ti some-zabbix-server-pgsql /bin/bash
-
-

The Zabbix server log is available through Podman's container log:

-
$ podman logs some-zabbix-server-pgsql
-
-

Environment Variables

-

When you start the zabbix-server-pgsql image, you can adjust the configuration of the Zabbix server by passing one or more environment variables on the podman run command line.

-

DB_SERVER_HOST

-

This variable is IP or DNS name of PostgreSQL server. By default, value is 'postgres-server'

-

DB_SERVER_PORT

-

This variable is port of PostgreSQL server. By default, value is '5432'.

-

POSTGRES_USER, POSTGRES_PASSWORD, POSTGRES_USER_FILE, POSTGRES_PASSWORD_FILE

-

These variables are used by Zabbix server to connect to Zabbix database. With the _FILE variables you can instead provide the path to a file which contains the user / the password instead. When secrets are not managed by an orchestrator, you also have to mount the files. Those are exclusive so you can just provide one type - either POSTGRES_USER or POSTGRES_USER_FILE!

-
podman run \
-    --name some-zabbix-server-pgsql \
-    -e DB_SERVER_HOST="some-postgres-server" \
-    -v ./.POSTGRES_USER:/run/secrets/POSTGRES_USER \
-    -e POSTGRES_USER_FILE=/run/secrets/POSTGRES_USER \
-    -v ./.POSTGRES_PASSWORD:/run/secrets/POSTGRES_PASSWORD \
-    -e POSTGRES_PASSWORD_FILE=/var/run/secrets/POSTGRES_PASSWORD \
-    --init \
-    -d registry.connect.redhat.com/zabbix/zabbix-server-pgsql-74:tag
-
-

Podman secrets can be used to avoid exposing credentials in the command line:

-
printf "zabbix" | podman secret create POSTGRES_USER -
-printf "zabbix" | podman secret create POSTGRES_PASSWORD -
-podman run \
-    --name some-zabbix-server-pgsql \
-    -e DB_SERVER_HOST="some-postgres-server" \
-    -e POSTGRES_USER_FILE=/run/secrets/POSTGRES_USER \
-    -e POSTGRES_PASSWORD_FILE=/run/secrets/POSTGRES_PASSWORD \
-    --init \
-    -d registry.connect.redhat.com/zabbix/zabbix-server-pgsql-74:tag
-
-

By default, values for POSTGRES_USER and POSTGRES_PASSWORD are zabbix, zabbix.

-

POSTGRES_DB

-

The variable is Zabbix database name. By default, value is zabbix.

-

POSTGRES_USE_IMPLICIT_SEARCH_PATH

-

In some setups, for example including PgBouncer, setting the search_path via connection parameters fails. If this variable is set to "true", the image skips setting the search_path and trusts that the search_path of the Zabbix user is setup correctly in PostgreSQL database.

-

ZBX_LOADMODULE

-

The variable is list of comma separated loadable Zabbix modules. It works with volume /var/lib/zabbix/modules. The syntax of the variable is dummy1.so,dummy2.so.

-

ZBX_DEBUGLEVEL

-

The variable is used to specify debug level. By default, value is 3. It is DebugLevel parameter in zabbix_server.conf. Allowed values are listed below:

-
    -
  • 0 - basic information about starting and stopping of Zabbix processes;
    • -
  • 1 - critical information
    • -
  • 2 - error information
    • -
  • 3 - warnings
    • -
  • 4 - for debugging (produces lots of information)
    • -
  • 5 - extended debugging (produces even more information)
    • -
-

ZBX_TIMEOUT

-

The variable is used to specify timeout for processing checks. By default, value is 4.

-

Other variables

-

Additionally the image allows to specify many other environment variables listed below:

-
ZBX_ALLOWUNSUPPORTEDDBVERSIONS=0 # Available since 6.0.0
-ZBX_DBTLSCONNECT= # Available since 5.0.0
-ZBX_DBTLSCAFILE= # Available since 5.0.0
-ZBX_DBTLSCERTFILE= # Available since 5.0.0
-ZBX_DBTLSKEYFILE= # Available since 5.0.0
-ZBX_DBTLSCIPHER= # Available since 5.0.0
-ZBX_DBTLSCIPHER13= # Available since 5.0.0
-ZBX_VAULT=HashiCorp # Allowed values: HashiCorp, CyberArk. Required when Vault is used. Available since 6.2.0
-ZBX_VAULTDBPATH= # Available since 5.2.0
-ZBX_VAULTPREFIX= # Available since 7.0.0
-ZBX_VAULTURL=https://127.0.0.1:8200 # Available since 5.2.0
-VAULT_TOKEN= # Available since 5.2.0
-ZBX_VAULTTLSCERTFILE= # Available since 6.2.0
-ZBX_VAULTTLSKEYFILE= # Available since 6.2.0
-ZBX_LISTENIP=
-ZBX_LISTENPORT=10051
-ZBX_LISTENBACKLOG=
-ZBX_STARTREPORTWRITERS=0 # Available since 5.4.0
-ZBX_WEBSERVICEURL=http://zabbix-web-service:10053/report # Available since 5.4.0
-ZBX_SERVICEMANAGERSYNCFREQUENCY=60 # Available since 6.0.0
-ZBX_HISTORYSTORAGEURL= # Available since 3.4.0
-ZBX_HISTORYSTORAGETYPES=uint,dbl,str,log,text # Available since 3.4.0
-ZBX_ENABLEGLOBALSCRIPTS=0 # Available since 7.0.0
-ZBX_ALLOWSOFTWAREUPDATECHECK=1 # Available since 7.0.0
-ZBX_MAXCONCURRENTCHECKSPERPOLLER=1000 # Available since 7.0.0
-ZBX_STARTAGENTPOLLERS=1 # Available since 7.0.0
-ZBX_STARTHTTPAGENTPOLLERS=1 # Available since 7.0.0
-ZBX_STARTPOLLERS=5
-ZBX_STARTIPMIPOLLERS=0
-ZBX_STARTCONNECTORS=0 # Available since 6.4.0
-ZBX_STARTPREPROCESSORS=16 # Available since 3.4.0
-ZBX_STARTPOLLERSUNREACHABLE=1
-ZBX_STARTTRAPPERS=5
-ZBX_STARTPINGERS=1
-ZBX_STARTDISCOVERERS=5
-ZBX_STARTHISTORYPOLLERS=5 # Available since 5.4.0
-ZBX_STARTHTTPPOLLERS=1
-ZBX_STARTODBCPOLLERS=1 # Available since 6.0.0
-ZBX_STARTTIMERS=1
-ZBX_STARTESCALATORS=1
-ZBX_STARTALERTERS=3 # Available since 3.4.0
-ZBX_JAVAGATEWAY=zabbix-java-gateway
-ZBX_JAVAGATEWAYPORT=10052
-ZBX_STARTJAVAPOLLERS=5
-ZBX_STARTLLDPROCESSORS=2 # Available since 4.2.0
-ZBX_STATSALLOWEDIP= # Available since 4.0.5
-ZBX_STARTVMWARECOLLECTORS=0
-ZBX_VMWAREFREQUENCY=60
-ZBX_VMWAREPERFFREQUENCY=60
-ZBX_VMWARECACHESIZE=8M
-ZBX_VMWARETIMEOUT=10
-ZBX_ENABLE_SNMP_TRAPS=false
-ZBX_SOURCEIP=
-ZBX_SMSDEVICES=
-ZBX_HOUSEKEEPINGFREQUENCY=1
-ZBX_MAXHOUSEKEEPERDELETE=5000
-ZBX_PROBLEMHOUSEKEEPINGFREQUENCY=60 # Available since 6.0.0
-ZBX_CACHESIZE=32M
-ZBX_CACHEUPDATEFREQUENCY=10
-ZBX_STARTDBSYNCERS=4
-ZBX_EXPORTFILESIZE=1G # Available since 4.0.0
-ZBX_EXPORTTYPE= # Available since 5.0.10 and 5.2.6
-ZBX_AUTOHANODENAME=fqdn # Allowed values: fqdn, hostname. Available since 6.0.0
-ZBX_HANODENAME= # Available since 6.0.0
-ZBX_AUTONODEADDRESS=fqdn # Allowed values: fqdn, hostname. Available since 6.0.0
-ZBX_NODEADDRESSPORT=10051 # Allowed to use with ZBX_AUTONODEADDRESS variable only. Available since 6.0.0
-ZBX_NODEADDRESS=localhost # Available since 6.0.0
-ZBX_HISTORYCACHESIZE=16M
-ZBX_HISTORYINDEXCACHESIZE=4M
-ZBX_HISTORYSTORAGEDATEINDEX=0 # Available since 4.0.0
-ZBX_TRENDCACHESIZE=4M
-ZBX_TRENDFUNCTIONCACHESIZE=4M
-ZBX_VALUECACHESIZE=8M
-ZBX_TRAPPERTIMEOUT=300
-ZBX_UNREACHABLEPERIOD=45
-ZBX_UNAVAILABLEDELAY=60
-ZBX_UNREACHABLEDELAY=15
-ZBX_LOGSLOWQUERIES=3000
-ZBX_STARTPROXYPOLLERS=1
-ZBX_PROXYCONFIGFREQUENCY=10
-ZBX_PROXYDATAFREQUENCY=1
-ZBX_TLSLISTEN= # Available since 7.4.0
-ZBX_TLSCAFILE=
-ZBX_TLSCA=
-ZBX_TLSCRLFILE=
-ZBX_TLSCRL=
-ZBX_TLSCERTFILE=
-ZBX_TLSCERT=
-ZBX_TLSKEYFILE=
-ZBX_TLSKEY=
-ZBX_TLSCIPHERALL= # Available since 4.4.7
-ZBX_TLSCIPHERALL13= # Available since 4.4.7
-ZBX_TLSCIPHERCERT= # Available since 4.4.7
-ZBX_TLSCIPHERCERT13= # Available since 4.4.7
-ZBX_TLSCIPHERPSK= # Available since 4.4.7
-ZBX_TLSCIPHERPSK13= # Available since 4.4.7
-ZBX_TLS_FRONTENDACCEPT= # Available since 7.4.0
-ZBX_FRONTENDALLOWEDIP= # Available since 7.4.0
-ZBX_TLSFRONTENDCERTISSUER= # Available since 7.4.0
-ZBX_TLSFRONTENDCERTSUBJECT= # Available since 7.4.0
-ZBX_WEBDRIVERURL= # Available since 7.0.0
-ZBX_STARTBROWSERPOLLERS=1 # Available since 7.0.0
-ZBX_STARTSNMPPOLLERS=1 # Available since 7.0.0
-
-
-

Default values of these variables are specified after equal sign.

-

The allowed variables are identical of parameters in official zabbix_server.conf. For example, ZBX_LOGSLOWQUERIES = LogSlowQueries.

-

Please use official documentation for zabbix_server.conf to get more information about the variables.

-

Allowed volumes for the Zabbix server container

-

/usr/lib/zabbix/alertscripts

-

The volume is used for custom alert scripts. It is AlertScriptsPath parameter in zabbix_server.conf.

-

/usr/lib/zabbix/externalscripts

-

The volume is used by External checks (type of items). It is ExternalScripts parameter in zabbix_server.conf.

-

/var/lib/zabbix/modules

-

The volume allows load additional modules and extend Zabbix server using LoadModule feature.

-

/var/lib/zabbix/enc

-

The volume is used to store TLS related files. These file names are specified using ZBX_TLSCAFILE, ZBX_TLSCRLFILE, ZBX_TLSCERTFILE and ZBX_TLSKEYFILE variables. Additionally it is possible to use environment variables ZBX_TLSCA, ZBX_TLSCRL, ZBX_TLSCERT and ZBX_TLSKEY with plaintext values.

-

/var/lib/zabbix/ssh_keys

-

The volume is used as location of public and private keys for SSH checks and actions. It is SSHKeyLocation parameter in zabbix_server.conf.

-

/var/lib/zabbix/ssl/certs

-

The volume is used as location of SSL client certificate files for client authentication. It is SSLCertLocation parameter in zabbix_server.conf.

-

/var/lib/zabbix/ssl/keys

-

The volume is used as location of SSL private key files for client authentication. It is SSLKeyLocation parameter in zabbix_server.conf.

-

/var/lib/zabbix/ssl/ssl_ca

-

The volume is used as location of certificate authority (CA) files for SSL server certificate verification. It is SSLCALocation parameter in zabbix_server.conf.

-

/var/lib/zabbix/snmptraps

-

The volume is used as location of snmptraps.log file. It could be shared by zabbix-snmptraps container and inherited using volumes_from Podman option while creating new instance of Zabbix server. -SNMP traps processing feature could be enabled using shared volume and switched ZBX_ENABLE_SNMP_TRAPS environment variable to true.

-

/var/lib/zabbix/mibs

-

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

-

/var/lib/zabbix/export

-

Directory for real-time export of events, history and trends in newline-delimited JSON format. Could be enabled using ZBX_EXPORTFILESIZE environment variable.

diff --git a/Dockerfiles/server-pgsql/rhel/build.sh b/Dockerfiles/server-pgsql/rhel/build.sh deleted file mode 120000 index 46b20313..00000000 --- a/Dockerfiles/server-pgsql/rhel/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../../build.sh \ No newline at end of file diff --git a/Dockerfiles/server-pgsql/rhel/licenses/AGPL-v3.0.txt b/Dockerfiles/server-pgsql/rhel/licenses/AGPL-v3.0.txt deleted file mode 100644 index be3f7b28..00000000 --- a/Dockerfiles/server-pgsql/rhel/licenses/AGPL-v3.0.txt +++ /dev/null @@ -1,661 +0,0 @@ - GNU AFFERO GENERAL PUBLIC LICENSE - Version 3, 19 November 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU Affero General Public License is a free, copyleft license for -software and other kinds of works, specifically designed to ensure -cooperation with the community in the case of network server software. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -our General Public Licenses are intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - Developers that use our General Public Licenses protect your rights -with two steps: (1) assert copyright on the software, and (2) offer -you this License which gives you legal permission to copy, distribute -and/or modify the software. - - A secondary benefit of defending all users' freedom is that -improvements made in alternate versions of the program, if they -receive widespread use, become available for other developers to -incorporate. Many developers of free software are heartened and -encouraged by the resulting cooperation. However, in the case of -software used on network servers, this result may fail to come about. -The GNU General Public License permits making a modified version and -letting the public access it on a server without ever releasing its -source code to the public. - - The GNU Affero General Public License is designed specifically to -ensure that, in such cases, the modified source code becomes available -to the community. It requires the operator of a network server to -provide the source code of the modified version running there to the -users of that server. Therefore, public use of a modified version, on -a publicly accessible server, gives the public access to the source -code of the modified version. - - An older license, called the Affero General Public License and -published by Affero, was designed to accomplish similar goals. This is -a different license, not a version of the Affero GPL, but Affero has -released a new version of the Affero GPL which permits relicensing under -this license. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU Affero General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Remote Network Interaction; Use with the GNU General Public License. - - Notwithstanding any other provision of this License, if you modify the -Program, your modified version must prominently offer all users -interacting with it remotely through a computer network (if your version -supports such interaction) an opportunity to receive the Corresponding -Source of your version by providing access to the Corresponding Source -from a network server at no charge, through some standard or customary -means of facilitating copying of software. This Corresponding Source -shall include the Corresponding Source for any work covered by version 3 -of the GNU General Public License that is incorporated pursuant to the -following paragraph. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the work with which it is combined will remain governed by version -3 of the GNU General Public License. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU Affero General Public License from time to time. Such new versions -will be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU Affero General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU Affero General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU Affero General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Affero General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Affero General Public License for more details. - - You should have received a copy of the GNU Affero General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If your software can interact with users remotely through a computer -network, you should also make sure that it provides a way for users to -get its source. For example, if your program is a web application, its -interface could display a "Source" link that leads users to an archive -of the code. There are many ways you could offer source, and different -solutions will be better for different programs; see section 13 for the -specific requirements. - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU AGPL, see -. diff --git a/Dockerfiles/server-pgsql/ubuntu/.dockerignore b/Dockerfiles/server-pgsql/ubuntu/.dockerignore deleted file mode 100644 index 88a84e55..00000000 --- a/Dockerfiles/server-pgsql/ubuntu/.dockerignore +++ /dev/null @@ -1 +0,0 @@ -build.sh diff --git a/Dockerfiles/server-pgsql/ubuntu/Dockerfile b/Dockerfiles/server-pgsql/ubuntu/Dockerfile deleted file mode 100644 index a42470f2..00000000 --- a/Dockerfiles/server-pgsql/ubuntu/Dockerfile +++ /dev/null @@ -1,151 +0,0 @@ -# syntax=docker/dockerfile:1.6 -ARG OS_BASE_IMAGE=ubuntu:resolute -ARG MAJOR_VERSION=7.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.12 -ARG BUILD_BASE_IMAGE=zabbix-build-pgsql:ubuntu-${ZBX_VERSION} - -FROM ${BUILD_BASE_IMAGE} AS builder - -FROM ${OS_BASE_IMAGE} - -ARG MAJOR_VERSION -ARG ZBX_VERSION -ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git - -ENV TERM=xterm \ - ZBX_VERSION=${ZBX_VERSION} \ - ZBX_SOURCES=${ZBX_SOURCES} \ - MIBDIRS=/var/lib/mibs/ietf:/var/lib/mibs/iana:/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL \ - NMAP_PRIVILEGED= \ - ZABBIX_USER_HOME_DIR=/var/lib/zabbix \ - ZABBIX_CONF_DIR=/etc/zabbix - -ENV ZBX_DB_NAME=dummy_db_name \ - ZBX_FPINGLOCATION=/usr/bin/fping \ - ZBX_LOADMODULEPATH=${ZABBIX_USER_HOME_DIR}/modules \ - ZBX_SNMPTRAPPERFILE=${ZABBIX_USER_HOME_DIR}/snmptraps/snmptraps.log \ - ZBX_SSHKEYLOCATION=${ZABBIX_USER_HOME_DIR}/ssh_keys/ \ - ZBX_SSLCERTLOCATION=${ZABBIX_USER_HOME_DIR}/ssl/certs/ \ - ZBX_SSLKEYLOCATION=${ZABBIX_USER_HOME_DIR}/ssl/keys/ \ - ZBX_SSLCALOCATION=${ZABBIX_USER_HOME_DIR}/ssl/ssl_ca/ - -LABEL org.opencontainers.image.authors="Alexey Pustovalov " \ - org.opencontainers.image.description="Zabbix server with PostgreSQL database support" \ - org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ - org.opencontainers.image.licenses="AGPL v3.0" \ - org.opencontainers.image.source="${ZBX_SOURCES}" \ - org.opencontainers.image.title="Zabbix server (PostgreSQL)" \ - org.opencontainers.image.url="https://zabbix.com/" \ - org.opencontainers.image.vendor="Zabbix SIA" \ - org.opencontainers.image.version="${ZBX_VERSION}" - -STOPSIGNAL SIGTERM - -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/server/sbin/zabbix_server /usr/sbin/zabbix_server -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/general/bin/zabbix_get /usr/bin/ -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/general/bin/zabbix_sender /usr/bin/ -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/server/conf/ ${ZABBIX_CONF_DIR}/ -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/server/database/postgresql/ /usr/share/doc/zabbix-server-postgresql/ - -RUN --mount=type=cache,target=/var/cache/apt/,sharing=locked \ - --mount=type=cache,target=/var/lib/apt/,sharing=locked \ - set -eux && \ - INSTALL_PKGS="bash \ - ca-certificates \ - gzip \ - tzdata \ - libc6 \ - libcares2 \ - libcurl4t64 \ - libevent-2.1 \ - libevent-extra-2.1 \ - libevent-pthreads-2.1 \ - libopenipmi0t64 \ - libpcre2-8-0 \ - libpq5 \ - libsnmp40t64 \ - libssh-4 \ - libssl3t64 \ - libxml2-16 \ - openssl \ - unixodbc \ - zlib1g \ - fping \ - iputils-ping \ - krb5-user \ - nmap \ - snmp-mibs-downloader \ - traceroute \ - postgresql-client" && \ - apt-get update && \ - DEBIAN_FRONTEND=noninteractive apt-get install -y \ - --no-install-recommends \ - ${INSTALL_PKGS} && \ - rm -f \ - /var/lib/mibs/ietf/VM-MIB \ - /var/lib/mibs/ietf/TRILL-OAM-MIB \ - /var/lib/mibs/ietf/SMF-MIB \ - /var/lib/mibs/ietf/ENERGY-OBJECT-MIB \ - /var/lib/mibs/ietf/POWER-ATTRIBUTES-MIB \ - /var/lib/mibs/ietf/OLSRv2-MIB \ - /var/lib/mibs/ietf/ENERGY-OBJECT-CONTEXT-MIB \ - /var/lib/mibs/ietf/BFD-STD-MIB \ - /var/lib/mibs/ietf/SNMPv2-PDU && \ - groupadd \ - --system \ - --gid 1995 \ - zabbix && \ - useradd \ - --system \ - --comment "Zabbix monitoring system" \ - -g zabbix \ - -G dialout \ - --uid 1997 \ - --shell /sbin/nologin \ - --home-dir ${ZABBIX_USER_HOME_DIR} \ - zabbix && \ - chgrp zabbix /usr/bin/nmap && \ - setcap cap_net_raw+eip /usr/bin/nmap && \ - mkdir -p ${ZABBIX_CONF_DIR} \ - ${ZABBIX_USER_HOME_DIR} \ - ${ZABBIX_USER_HOME_DIR}/dbscripts \ - ${ZABBIX_USER_HOME_DIR}/enc \ - ${ZABBIX_USER_HOME_DIR}/enc_internal \ - ${ZABBIX_USER_HOME_DIR}/export \ - ${ZABBIX_USER_HOME_DIR}/mibs \ - ${ZABBIX_USER_HOME_DIR}/modules \ - ${ZABBIX_USER_HOME_DIR}/snmptraps \ - ${ZABBIX_USER_HOME_DIR}/ssh_keys \ - ${ZABBIX_USER_HOME_DIR}/ssl \ - ${ZABBIX_USER_HOME_DIR}/ssl/certs \ - ${ZABBIX_USER_HOME_DIR}/ssl/keys \ - ${ZABBIX_USER_HOME_DIR}/ssl/ssl_ca \ - /usr/lib/zabbix/alertscripts \ - /usr/lib/zabbix/externalscripts \ - /usr/share/doc/zabbix-server-postgresql && \ - FIX_PERM_LIST="\ - ${ZABBIX_CONF_DIR}/zabbix_server_modules.conf \ - ${ZABBIX_USER_HOME_DIR}/" && \ - chown --quiet -R zabbix:0 ${FIX_PERM_LIST} && \ - chmod -R g=u ${FIX_PERM_LIST} && \ - chown --quiet zabbix:0 ${ZABBIX_CONF_DIR}/ && \ - chmod g=u ${ZABBIX_CONF_DIR} && \ - /usr/sbin/zabbix_server -V - -RUN --mount=from=entrypoints,target=/tmp/entrypoints,ro \ - set -eux && \ - install -d /usr/lib/docker-entrypoint && \ - install -m 0755 /tmp/entrypoints/server-pgsql.sh /usr/bin/docker-entrypoint.sh && \ - install -m 0644 /tmp/entrypoints/lib/*.sh /usr/lib/docker-entrypoint/ - -EXPOSE 10051/tcp - -WORKDIR ${ZABBIX_USER_HOME_DIR} - -VOLUME ["${ZABBIX_USER_HOME_DIR}/snmptraps", "${ZABBIX_USER_HOME_DIR}/export"] - -USER 1997 - -ENTRYPOINT ["/usr/bin/docker-entrypoint.sh"] - -CMD ["/usr/sbin/zabbix_server", "--foreground", "-c", "/etc/zabbix/zabbix_server.conf"] diff --git a/Dockerfiles/server-pgsql/ubuntu/README.md b/Dockerfiles/server-pgsql/ubuntu/README.md deleted file mode 120000 index 32d46ee8..00000000 --- a/Dockerfiles/server-pgsql/ubuntu/README.md +++ /dev/null @@ -1 +0,0 @@ -../README.md \ No newline at end of file diff --git a/Dockerfiles/server-pgsql/ubuntu/build.sh b/Dockerfiles/server-pgsql/ubuntu/build.sh deleted file mode 120000 index 46b20313..00000000 --- a/Dockerfiles/server-pgsql/ubuntu/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../../build.sh \ No newline at end of file diff --git a/Dockerfiles/snmptraps/README.md b/Dockerfiles/snmptraps/README.md deleted file mode 100644 index bf099892..00000000 --- a/Dockerfiles/snmptraps/README.md +++ /dev/null @@ -1,140 +0,0 @@ -![logo](https://assets.zabbix.com/img/logo/zabbix_logo_500x131.png) - -# What is Zabbix? - -Zabbix is an enterprise-class open source distributed monitoring solution. - -Zabbix is software that monitors numerous parameters of a network and the health and integrity of servers. Zabbix uses a flexible notification mechanism that allows users to configure e-mail based alerts for virtually any event. This allows a fast reaction to server problems. Zabbix offers excellent reporting and data visualisation features based on the stored data. This makes Zabbix ideal for capacity planning. - -For more information and related downloads for Zabbix components, please visit https://hub.docker.com/u/zabbix/ and https://zabbix.com - -# What is the image? - -The image is used to receive SNMP traps, store them to a log file and provide access to Zabbix to collected SNMP trap messsages. - -# Zabbix snmptraps images - -These are the only official Zabbix snmptraps Docker images. They are based on Alpine Linux v3.24, Ubuntu 26.04 (resolute), CentOS Stream 10 and Oracle Linux 10 images. The available versions of Zabbix snmptraps are: - - Zabbix snmptraps 6.0 (tags: alpine-6.0-latest, ubuntu-6.0-latest, ol-6.0-latest) - Zabbix snmptraps 6.0.* (tags: alpine-6.0.*, ubuntu-6.0.*, ol-6.0.*) - Zabbix snmptraps 7.0 (tags: alpine-7.0-latest, ubuntu-7.0-latest, ol-7.0-latest) - Zabbix snmptraps 7.0.* (tags: alpine-7.0.*, ubuntu-7.0.*, ol-7.0.*) - Zabbix snmptraps 7.2 (tags: alpine-7.2-latest, ubuntu-7.2-latest, ol-7.2-latest) - Zabbix snmptraps 7.2.* (tags: alpine-7.2.*, ubuntu-7.2.*, ol-7.2.*) - Zabbix snmptraps 7.4 (tags: alpine-7.4-latest, ubuntu-7.4-latest, ol-7.4-latest, alpine-latest, ubuntu-latest, ol-latest, latest) - Zabbix snmptraps 7.4.* (tags: alpine-7.4.*, ubuntu-7.4.*, ol-7.4.*) - Zabbix snmptraps 8.0 (tags: alpine-trunk, ubuntu-trunk, ol-trunk) - -Images are updated when new releases are published. - -# How to use this image - -## Start `zabbix-snmptraps` - -Start a Zabbix snmptraps container as follows: - - docker run --name some-zabbix-snmptraps -p 162:1162/udp -d zabbix/zabbix-snmptraps:tag - -Where `some-zabbix-snmptraps` is the name you want to assign to your container and `tag` is the tag specifying the version you want. See the list above for relevant tags, or look at the [full list of tags](https://hub.docker.com/r/zabbix/zabbix-snmptraps/tags/). - -## Linking Zabbix server or Zabbix proxy with the container - - docker run --name some-zabbix-server --link some-zabbix-snmptraps:zabbix-snmptraps --volumes-from some-zabbix-snmptraps -d zabbix/zabbix-server:tag - -## Container shell access and viewing Zabbix snmptraps logs - -The `docker exec` command allows you to run commands inside a Docker container. The following command line will give you a bash shell inside your `zabbix-snmptraps` container: - -```console -$ docker exec -ti some-zabbix-snmptraps /bin/bash -``` - -The Zabbix snmptraps log is available through Docker's container log: - -```console -$ docker logs some-zabbix-snmptraps -``` - -## Environment Variables - -When you start the `zabbix-snmptraps` image, you can adjust the configuration by passing one or more environment variables on the `docker run` command line. - -### `ZBX_SNMP_TRAP_DATE_FORMAT` - -This variable is represent date and time format in the output `snmptraps.log` file. By default, value is `+%Y-%m-%dT%T%z`. Please, refer to `date` command man for more details about date and time format. - -### `ZBX_SNMP_TRAP_FORMAT` - -This variable is SNMP trap format in the output `snmptraps.log` file. By default, value is `\n`, in this case each new variable is placed on new line. - -### `ZBX_SNMP_TRAP_USE_DNS` - -This variable manages source network address representation. It can be IP address or DNS of SNMP trap sender. The variable works only when container command is modified and "-n" command argument is removed from argument list. By default, value is `false`. - -### `SNMPTRAP_OUTPUT_OPTIONS` - -Modify standard output options for SNMP traps. By default, value is `STte`. Corresponding to "OUTPUT OPTIONS" ("-O" command line argument). - -## Allowed volumes for the Zabbix snmptraps container - -### ``/var/lib/zabbix/snmptraps`` - -The volume contains log file ``snmptraps.log`` named with received SNMP traps. - -### ``/var/lib/zabbix/mibs`` - -The volume allows to add new MIB files. It does not support subdirectories, all MIBs must be placed in ``/var/lib/zabbix/mibs``. - -### ``/var/lib/zabbix/snmptrapd_config`` - -The volume various persistent configuration files generated by snmptrapd daemon. The volume is required usually only for SNMPv3 traps. Do not modify manually anything stored in the volume. - -The volume also can be used for custom configuration file ``snmptrapd_custom.conf``. The configuration file can be used for SNMPv3 authentification details. - -# The image variants - -The `zabbix-snmptraps` images come in many flavors, each designed for a specific use case. - -## `zabbix-snmptraps:alpine-` - -This image is based on the popular [Alpine Linux project](http://alpinelinux.org), available in [the `alpine` official image](https://hub.docker.com/_/alpine). Alpine Linux is much smaller than most distribution base images (~5MB), and thus leads to much slimmer images in general. - -This variant is highly recommended when final image size being as small as possible is desired. The main caveat to note is that it does use [musl libc](http://www.musl-libc.org) instead of [glibc and friends](http://www.etalabs.net/compare_libcs.html), so certain software might run into issues depending on the depth of their libc requirements. However, most software doesn't have an issue with this, so this variant is usually a very safe choice. See [this Hacker News comment thread](https://news.ycombinator.com/item?id=10782897) for more discussion of the issues that might arise and some pro/con comparisons of using Alpine-based images. - -To minimize image size, it's uncommon for additional related tools (such as `git` or `bash`) to be included in Alpine-based images. Using this image as a base, add the things you need in your own Dockerfile (see the [`alpine` image description](https://hub.docker.com/_/alpine/) for examples of how to install packages if you are unfamiliar). - -## `zabbix-snmptraps:ubuntu-` - -This is the defacto image. If you are unsure about what your needs are, you probably want to use this one. It is designed to be used both as a throw away container (mount your source code and start the container to start your app), as well as the base to build other images off of. - -## `zabbix-snmptraps:ol-` - -Oracle Linux is an open-source operating system available under the GNU General Public License (GPLv2). Suitable for general purpose or Oracle workloads, it benefits from rigorous testing of more than 128,000 hours per day with real-world workloads and includes unique innovations such as Ksplice for zero-downtime kernel patching, DTrace for real-time diagnostics, the powerful Btrfs file system, and more. - -# User Feedback - -## Documentation - -Documentation for this image is stored in the [`snmptraps/` directory](https://github.com/zabbix/zabbix-docker/tree/7.4/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.4/README.md) before attempting a pull request. - -## Issues - -If you have any problems with or questions about this image, please contact us through a [GitHub issue](https://github.com/zabbix/zabbix-docker/issues). - -### Known issues - -## Contributing - -You are invited to contribute new features, fixes, or updates, large or small; we are always thrilled to receive pull requests, and do our best to process them as fast as we can. - -Before you start to code, we recommend discussing your plans through a [GitHub issue](https://github.com/zabbix/zabbix-docker/issues), especially for more ambitious contributions. This gives other contributors a chance to point you in the right direction, give you feedback on your design, and help you find out if someone else is working on the same thing. - -## License - -Starting from Zabbix version 7.0, all subsequent Zabbix versions will be released under the GNU Affero General Public License version 3 (AGPLv3). -You can modify the relevant version and propagate such modified version under the terms of the AGPLv3 as published by the Free Software Foundation. -For additional details, including answers to common questions about the AGPLv3, see the generic FAQ from the [Free Software Foundation](http://www.fsf.org/licenses/gpl-faq.html). - -Zabbix is Open Source Software, however, if you use Zabbix in a commercial context we kindly ask you to support the development of Zabbix by purchasing some level of technical support. -All previous Zabbix software versions up to 6.4 are released under the GNU General Public License version 2 (GPLv2). The formal terms of the GPLv2 and AGPLv3 can be found at http://www.fsf.org/licenses/. diff --git a/Dockerfiles/snmptraps/alpine/.dockerignore b/Dockerfiles/snmptraps/alpine/.dockerignore deleted file mode 100644 index 88a84e55..00000000 --- a/Dockerfiles/snmptraps/alpine/.dockerignore +++ /dev/null @@ -1 +0,0 @@ -build.sh diff --git a/Dockerfiles/snmptraps/alpine/Dockerfile b/Dockerfiles/snmptraps/alpine/Dockerfile deleted file mode 100644 index 7d91d2ee..00000000 --- a/Dockerfiles/snmptraps/alpine/Dockerfile +++ /dev/null @@ -1,78 +0,0 @@ -# syntax=docker/dockerfile:1.6 -ARG OS_BASE_IMAGE=alpine:3.24 -FROM ${OS_BASE_IMAGE} - -ARG MAJOR_VERSION=7.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.12 -ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git - -ENV TERM=xterm \ - ZBX_VERSION=${ZBX_VERSION} \ - ZBX_SOURCES=${ZBX_SOURCES} \ - MIBDIRS=/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL \ - ZBX_SNMP_TRAP_DATE_FORMAT=+%Y-%m-%dT%T%z ZBX_SNMP_TRAP_FORMAT="\n" \ - ZBX_SNMP_TRAP_USE_DNS=false \ - ZABBIX_USER_HOME_DIR=/var/lib/zabbix - -ENV SNMP_PERSISTENT_DIR=${ZABBIX_USER_HOME_DIR}/snmptrapd_config - -LABEL org.opencontainers.image.authors="Alexey Pustovalov " \ - org.opencontainers.image.description="Zabbix SNMP traps receiver" \ - org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ - org.opencontainers.image.licenses="AGPL v3.0" \ - org.opencontainers.image.title="zabbix-snmptraps" \ - org.opencontainers.image.url="https://zabbix.com/" \ - org.opencontainers.image.vendor="Zabbix SIA" \ - org.opencontainers.image.version="${ZBX_VERSION}" - -STOPSIGNAL SIGTERM - -RUN --mount=from=config_templates,target=/tmp/conf,ro \ - --mount=from=scripts,target=/tmp/scripts,ro \ - set -eux && \ - INSTALL_PKGS="bash \ - tzdata \ - net-snmp" && \ - apk add \ - --no-cache \ - --clean-protected \ - ${INSTALL_PKGS} && \ - addgroup \ - --system \ - --gid 1995 \ - zabbix && \ - adduser \ - --system \ - --gecos "Zabbix monitoring system" \ - --disabled-password \ - --uid 1997 \ - --ingroup zabbix \ - --shell /sbin/nologin \ - --home ${ZABBIX_USER_HOME_DIR} \ - zabbix && \ - mkdir -p ${ZABBIX_USER_HOME_DIR} \ - ${ZABBIX_USER_HOME_DIR}/snmptraps \ - ${ZABBIX_USER_HOME_DIR}/mibs \ - ${SNMP_PERSISTENT_DIR} && \ - cp /tmp/conf/logrotate.d/zabbix_snmptraps /etc/logrotate.d/ && \ - cp /tmp/conf/snmp/snmptrapd.conf /etc/snmp/ && \ - cp /tmp/scripts/zabbix_trap_handler.sh /usr/sbin/ && \ - cp /tmp/scripts/snmptrapd_runner.sh /usr/sbin/ && \ - FIX_PERM_LIST="\ - /etc/snmp/ \ - ${ZABBIX_USER_HOME_DIR}/ \ - /var/tmp/ \ - /var/run/" && \ - chown --quiet -R zabbix:root ${FIX_PERM_LIST} && \ - chgrp -R 0 ${FIX_PERM_LIST} && \ - chmod -R g=u ${FIX_PERM_LIST} - -EXPOSE 1162/udp - -WORKDIR ${ZABBIX_USER_HOME_DIR}/snmptraps/ - -VOLUME ["${ZABBIX_USER_HOME_DIR}/snmptraps", "${SNMP_PERSISTENT_DIR}"] - -USER 1997 - -CMD ["/usr/sbin/snmptrapd_runner.sh"] diff --git a/Dockerfiles/snmptraps/alpine/README.md b/Dockerfiles/snmptraps/alpine/README.md deleted file mode 120000 index 32d46ee8..00000000 --- a/Dockerfiles/snmptraps/alpine/README.md +++ /dev/null @@ -1 +0,0 @@ -../README.md \ No newline at end of file diff --git a/Dockerfiles/snmptraps/alpine/build.sh b/Dockerfiles/snmptraps/alpine/build.sh deleted file mode 120000 index 46b20313..00000000 --- a/Dockerfiles/snmptraps/alpine/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../../build.sh \ No newline at end of file diff --git a/Dockerfiles/snmptraps/centos/.dockerignore b/Dockerfiles/snmptraps/centos/.dockerignore deleted file mode 100644 index 88a84e55..00000000 --- a/Dockerfiles/snmptraps/centos/.dockerignore +++ /dev/null @@ -1 +0,0 @@ -build.sh diff --git a/Dockerfiles/snmptraps/centos/Dockerfile b/Dockerfiles/snmptraps/centos/Dockerfile deleted file mode 100644 index e36576fb..00000000 --- a/Dockerfiles/snmptraps/centos/Dockerfile +++ /dev/null @@ -1,85 +0,0 @@ -# syntax=docker/dockerfile:1.6 -ARG OS_BASE_IMAGE=quay.io/centos/centos:stream10-minimal -FROM ${OS_BASE_IMAGE} - -ARG MAJOR_VERSION=7.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.12 -ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git - -ENV TERM=xterm \ - ZBX_VERSION=${ZBX_VERSION} \ - ZBX_SOURCES=${ZBX_SOURCES} \ - MIBDIRS=/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL \ - ZBX_SNMP_TRAP_DATE_FORMAT=+%Y-%m-%dT%T%z ZBX_SNMP_TRAP_FORMAT="\n" \ - ZBX_SNMP_TRAP_USE_DNS=false \ - ZABBIX_USER_HOME_DIR=/var/lib/zabbix - -ENV SNMP_PERSISTENT_DIR=${ZABBIX_USER_HOME_DIR}/snmptrapd_config - -LABEL org.opencontainers.image.authors="Alexey Pustovalov " \ - org.opencontainers.image.description="Zabbix SNMP traps receiver" \ - org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ - org.opencontainers.image.licenses="AGPL v3.0" \ - org.opencontainers.image.title="zabbix-snmptraps" \ - org.opencontainers.image.url="https://zabbix.com/" \ - org.opencontainers.image.vendor="Zabbix SIA" \ - org.opencontainers.image.version="${ZBX_VERSION}" - -STOPSIGNAL SIGTERM - -RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ - --mount=type=tmpfs,target=/var/cache/yum/ \ - --mount=from=config_templates,target=/tmp/conf,ro \ - --mount=from=scripts,target=/tmp/scripts,ro \ - set -eux && \ - INSTALL_PKGS="bash \ - shadow-utils \ - tzdata \ - net-snmp" && \ - microdnf -y install \ - --disablerepo="*" \ - --enablerepo="baseos" \ - --enablerepo="appstream" \ - --setopt=install_weak_deps=0 \ - --setopt=keepcache=0 \ - --best \ - --nodocs \ - ${INSTALL_PKGS} && \ - groupadd \ - --system \ - --gid 1995 \ - zabbix && \ - useradd \ - --system \ - --comment "Zabbix monitoring system" \ - -g zabbix \ - --uid 1997 \ - --shell /sbin/nologin \ - --home-dir ${ZABBIX_USER_HOME_DIR} \ - zabbix && \ - mkdir -p ${ZABBIX_USER_HOME_DIR} \ - ${ZABBIX_USER_HOME_DIR}/snmptraps \ - ${ZABBIX_USER_HOME_DIR}/mibs \ - ${SNMP_PERSISTENT_DIR} && \ - cp /tmp/conf/logrotate.d/zabbix_snmptraps /etc/logrotate.d/ && \ - cp /tmp/conf/snmp/snmptrapd.conf /etc/snmp/ && \ - cp /tmp/scripts/zabbix_trap_handler.sh /usr/sbin/ && \ - cp /tmp/scripts/snmptrapd_runner.sh /usr/sbin/ && \ - FIX_PERM_LIST="\ - /etc/snmp/ \ - ${ZABBIX_USER_HOME_DIR}/ \ - /var/tmp/ \ - /var/run/" && \ - chown --quiet -R zabbix:root ${FIX_PERM_LIST} && \ - chgrp -R 0 ${FIX_PERM_LIST} && \ - chmod -R g=u ${FIX_PERM_LIST} - -EXPOSE 1162/udp - -WORKDIR ${ZABBIX_USER_HOME_DIR}/snmptraps/ - -VOLUME ["${ZABBIX_USER_HOME_DIR}/snmptraps", "${SNMP_PERSISTENT_DIR}"] - -USER 1997 - -CMD ["/usr/sbin/snmptrapd_runner.sh"] diff --git a/Dockerfiles/snmptraps/centos/README.md b/Dockerfiles/snmptraps/centos/README.md deleted file mode 120000 index 32d46ee8..00000000 --- a/Dockerfiles/snmptraps/centos/README.md +++ /dev/null @@ -1 +0,0 @@ -../README.md \ No newline at end of file diff --git a/Dockerfiles/snmptraps/centos/build.sh b/Dockerfiles/snmptraps/centos/build.sh deleted file mode 120000 index 46b20313..00000000 --- a/Dockerfiles/snmptraps/centos/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../../build.sh \ No newline at end of file diff --git a/Dockerfiles/snmptraps/ol/.dockerignore b/Dockerfiles/snmptraps/ol/.dockerignore deleted file mode 100644 index 88a84e55..00000000 --- a/Dockerfiles/snmptraps/ol/.dockerignore +++ /dev/null @@ -1 +0,0 @@ -build.sh diff --git a/Dockerfiles/snmptraps/ol/Dockerfile b/Dockerfiles/snmptraps/ol/Dockerfile deleted file mode 100644 index 8c1cb1ed..00000000 --- a/Dockerfiles/snmptraps/ol/Dockerfile +++ /dev/null @@ -1,83 +0,0 @@ -# syntax=docker/dockerfile:1.6 -ARG OS_BASE_IMAGE=container-registry.oracle.com/os/oraclelinux:10-slim -FROM ${OS_BASE_IMAGE} - -ARG MAJOR_VERSION=7.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.12 -ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git - -ENV TERM=xterm \ - ZBX_VERSION=${ZBX_VERSION} \ - ZBX_SOURCES=${ZBX_SOURCES} \ - MIBDIRS=/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL \ - ZBX_SNMP_TRAP_DATE_FORMAT=+%Y-%m-%dT%T%z ZBX_SNMP_TRAP_FORMAT="\n" \ - ZBX_SNMP_TRAP_USE_DNS=false \ - ZABBIX_USER_HOME_DIR=/var/lib/zabbix - -ENV SNMP_PERSISTENT_DIR=${ZABBIX_USER_HOME_DIR}/snmptrapd_config - -LABEL org.opencontainers.image.authors="Alexey Pustovalov " \ - org.opencontainers.image.description="Zabbix SNMP traps receiver" \ - org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ - org.opencontainers.image.licenses="AGPL v3.0" \ - org.opencontainers.image.title="zabbix-snmptraps" \ - org.opencontainers.image.url="https://zabbix.com/" \ - org.opencontainers.image.vendor="Zabbix SIA" \ - org.opencontainers.image.version="${ZBX_VERSION}" - -STOPSIGNAL SIGTERM - -RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ - --mount=type=tmpfs,target=/var/cache/yum/ \ - --mount=from=config_templates,target=/tmp/conf,ro \ - --mount=from=scripts,target=/tmp/scripts,ro \ - set -eux && \ - INSTALL_PKGS="bash \ - net-snmp" && \ - microdnf -y install \ - --disablerepo="*" \ - --enablerepo="ol10_baseos_latest" \ - --enablerepo="ol10_appstream" \ - --setopt=install_weak_deps=0 \ - --setopt=keepcache=0 \ - --best \ - --nodocs \ - ${INSTALL_PKGS} && \ - groupadd \ - --system \ - --gid 1995 \ - zabbix && \ - useradd \ - --system \ - --comment "Zabbix monitoring system" \ - -g zabbix \ - --uid 1997 \ - --shell /sbin/nologin \ - --home-dir ${ZABBIX_USER_HOME_DIR} \ - zabbix && \ - mkdir -p ${ZABBIX_USER_HOME_DIR} \ - ${ZABBIX_USER_HOME_DIR}/snmptraps \ - ${ZABBIX_USER_HOME_DIR}/mibs \ - ${SNMP_PERSISTENT_DIR} && \ - cp /tmp/conf/logrotate.d/zabbix_snmptraps /etc/logrotate.d/ && \ - cp /tmp/conf/snmp/snmptrapd.conf /etc/snmp/ && \ - cp /tmp/scripts/zabbix_trap_handler.sh /usr/sbin/ && \ - cp /tmp/scripts/snmptrapd_runner.sh /usr/sbin/ && \ - FIX_PERM_LIST="\ - /etc/snmp/ \ - ${ZABBIX_USER_HOME_DIR}/ \ - /var/tmp/ \ - /var/run/" && \ - chown --quiet -R zabbix:root ${FIX_PERM_LIST} && \ - chgrp -R 0 ${FIX_PERM_LIST} && \ - chmod -R g=u ${FIX_PERM_LIST} - -EXPOSE 1162/udp - -WORKDIR ${ZABBIX_USER_HOME_DIR}/snmptraps/ - -VOLUME ["${ZABBIX_USER_HOME_DIR}/snmptraps", "${SNMP_PERSISTENT_DIR}"] - -USER 1997 - -CMD ["/usr/sbin/snmptrapd_runner.sh"] diff --git a/Dockerfiles/snmptraps/ol/README.md b/Dockerfiles/snmptraps/ol/README.md deleted file mode 120000 index 32d46ee8..00000000 --- a/Dockerfiles/snmptraps/ol/README.md +++ /dev/null @@ -1 +0,0 @@ -../README.md \ No newline at end of file diff --git a/Dockerfiles/snmptraps/ol/build.sh b/Dockerfiles/snmptraps/ol/build.sh deleted file mode 120000 index 46b20313..00000000 --- a/Dockerfiles/snmptraps/ol/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../../build.sh \ No newline at end of file diff --git a/Dockerfiles/snmptraps/rhel/.dockerignore b/Dockerfiles/snmptraps/rhel/.dockerignore deleted file mode 100644 index 88a84e55..00000000 --- a/Dockerfiles/snmptraps/rhel/.dockerignore +++ /dev/null @@ -1 +0,0 @@ -build.sh diff --git a/Dockerfiles/snmptraps/rhel/Dockerfile b/Dockerfiles/snmptraps/rhel/Dockerfile deleted file mode 100644 index e6411df6..00000000 --- a/Dockerfiles/snmptraps/rhel/Dockerfile +++ /dev/null @@ -1,107 +0,0 @@ -# syntax=docker/dockerfile:1.6 -ARG OS_BASE_IMAGE=registry.access.redhat.com/ubi10/ubi-minimal:10.2 -FROM ${OS_BASE_IMAGE} - -ARG MAJOR_VERSION=7.4 -ARG RELEASE=12 -ARG ZBX_VERSION=${MAJOR_VERSION}.12 - -ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git - -ENV TERM=xterm \ - ZBX_VERSION=${ZBX_VERSION} \ - ZBX_SOURCES=${ZBX_SOURCES} \ - MIBDIRS=/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL \ - ZBX_SNMP_TRAP_DATE_FORMAT=+%Y-%m-%dT%T%z ZBX_SNMP_TRAP_FORMAT="\n" \ - ZBX_SNMP_TRAP_USE_DNS=false \ - ZABBIX_USER_HOME_DIR=/var/lib/zabbix - -ENV SNMP_PERSISTENT_DIR=${ZABBIX_USER_HOME_DIR}/snmptrapd_config - -LABEL description="Zabbix SNMP traps receiver" \ - maintainer="alexey.pustovalov@zabbix.com" \ - name="zabbix/zabbix-snmptraps-74" \ - 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-74:${ZBX_VERSION}" \ - summary="Zabbix SNMP traps receiver" \ - url="https://www.zabbix.com/" \ - vendor="Zabbix SIA" \ - version="${MAJOR_VERSION}" \ - io.k8s.description="Zabbix SNMP traps receiver" \ - io.k8s.display-name="Zabbix SNMP traps receiver" \ - io.openshift.expose-services="162:1162" \ - 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-74:${ZBX_VERSION}" \ - org.label-schema.license="AGPL v3.0" \ - org.label-schema.name="zabbix-snmptraps-rhel" \ - org.label-schema.schema-version="1.0" \ - org.label-schema.url="https://zabbix.com/" \ - org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ - org.label-schema.vcs-ref="${VCS_REF}" \ - org.label-schema.vcs-url="${ZBX_SOURCES}" \ - org.label-schema.vendor="Zabbix SIA" \ - org.label-schema.version="${ZBX_VERSION}" - -STOPSIGNAL SIGTERM - -COPY licenses /licenses/ - -RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ - --mount=type=tmpfs,target=/var/cache/yum/ \ - --mount=from=config_templates,target=/tmp/conf,ro \ - --mount=from=scripts,target=/tmp/scripts,ro \ - set -eux && \ - INSTALL_PKGS="bash \ - shadow-utils \ - tzdata \ - net-snmp" && \ - microdnf -y install \ - --disableplugin=subscription-manager \ - --disablerepo="*" \ - --enablerepo="ubi-10-baseos-rpms" \ - --enablerepo="ubi-10-appstream-rpms" \ - --setopt=install_weak_deps=0 \ - --setopt=keepcache=0 \ - --best \ - --setopt=tsflags=nodocs \ - ${INSTALL_PKGS} && \ - groupadd \ - --system \ - --gid 1995 \ - zabbix && \ - useradd \ - --system \ - --comment "Zabbix monitoring system" \ - -g zabbix \ - --uid 1997 \ - --shell /sbin/nologin \ - --home-dir ${ZABBIX_USER_HOME_DIR} \ - zabbix && \ - mkdir -p ${ZABBIX_USER_HOME_DIR} \ - ${ZABBIX_USER_HOME_DIR}/snmptraps \ - ${ZABBIX_USER_HOME_DIR}/mibs \ - ${SNMP_PERSISTENT_DIR} && \ - cp /tmp/conf/logrotate.d/zabbix_snmptraps /etc/logrotate.d/ && \ - cp /tmp/conf/snmp/snmptrapd.conf /etc/snmp/ && \ - cp /tmp/scripts/zabbix_trap_handler.sh /usr/sbin/ && \ - cp /tmp/scripts/snmptrapd_runner.sh /usr/sbin/ && \ - FIX_PERM_LIST="\ - /etc/snmp/ \ - ${ZABBIX_USER_HOME_DIR}/ \ - /var/tmp/ \ - /var/run/" && \ - chown --quiet -R zabbix:root ${FIX_PERM_LIST} && \ - chgrp -R 0 ${FIX_PERM_LIST} && \ - chmod -R g=u ${FIX_PERM_LIST} - -EXPOSE 1162/udp - -WORKDIR ${ZABBIX_USER_HOME_DIR}/snmptraps/ - -VOLUME ["${ZABBIX_USER_HOME_DIR}/snmptraps", "${SNMP_PERSISTENT_DIR}"] - -USER 1997 - -CMD ["/usr/sbin/snmptrapd_runner.sh"] diff --git a/Dockerfiles/snmptraps/rhel/README.html b/Dockerfiles/snmptraps/rhel/README.html deleted file mode 100644 index 86f32a26..00000000 --- a/Dockerfiles/snmptraps/rhel/README.html +++ /dev/null @@ -1,49 +0,0 @@ -

What is Zabbix?

-

Zabbix is an enterprise-class open source distributed monitoring solution.

-

Zabbix is software that monitors numerous parameters of a network and the health and integrity of servers. Zabbix uses a flexible notification mechanism that allows users to configure e-mail based alerts for virtually any event. This allows a fast reaction to server problems. Zabbix offers excellent reporting and data visualisation features based on the stored data. This makes Zabbix ideal for capacity planning.

-

For more information and related downloads for Zabbix components, please visit zabbix.com

-

What is the image?

-

The image is used to receive SNMP traps, store them to a log file and provide access to Zabbix to collected SNMP trap messsages.

-

Zabbix snmptraps images

-

Images are updated when new releases are published.

-

How to use this image

-

Start zabbix-snmptraps

-

Start a Zabbix snmptraps container as follows:

-
podman run \
-    --name some-zabbix-snmptraps \
-    -p 162:1162/udp \
-    -d registry.connect.redhat.com/zabbix/zabbix-snmptraps-74:tag
-
-

Where some-zabbix-snmptraps is the name you want to assign to your container and tag is the tag specifying the version you want.

-

Linking Zabbix server or Zabbix proxy with the container

-
podman run \
-    --name some-zabbix-server \
-    --link some-zabbix-snmptraps:zabbix-snmptraps \
-    --volumes-from some-zabbix-snmptraps \
-    -d zabbix/zabbix-server:tag
-
-

Container shell access and viewing Zabbix snmptraps logs

-

The podman exec command allows you to run commands inside a Podman container. The following command line will give you a bash shell inside your zabbix-snmptraps container:

-
$ podman exec -ti some-zabbix-snmptraps /bin/bash
-
-

The Zabbix snmptraps log is available through Podman's container log:

-
$ podman logs  some-zabbix-snmptraps
-
-

Environment Variables

-

When you start the zabbix-snmptraps image, you can adjust the configuration by passing one or more environment variables on the podman run command line.

-

ZBX_SNMP_TRAP_DATE_FORMAT

-

This variable is represent date and time format in the output snmptraps.log file. By default, value is +%Y-%m-%dT%T%z. Please, refer to date command man for more details about date and time format.

-

ZBX_SNMP_TRAP_FORMAT

-

This variable is SNMP trap format in the output snmptraps.log file. By default, value is \n, in this case each new variable is placed on new line.

-

ZBX_SNMP_TRAP_USE_DNS

-

This variable manages source network address representation. It can be IP address or DNS of SNMP trap sender. The variable works only when container command is modified and "-n" command argument is removed from argument list. By default, value is false.

-

SNMPTRAP_OUTPUT_OPTIONS

-

Modify standard output options for SNMP traps. By default, value is STte. Corresponding to "OUTPUT OPTIONS" ("-O" command line argument).

-

Allowed volumes for the Zabbix snmptraps container

-

/var/lib/zabbix/snmptraps

-

The volume contains log file snmptraps.log named with received SNMP traps.

-

/var/lib/zabbix/mibs

-

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

-

/var/lib/zabbix/snmptrapd_config

-

The volume various persistent configuration files generated by snmptrapd daemon. The volume is required usually only for SNMPv3 traps. Do not modify manually anything stored in the volume.

-

The volume also can be used for custom configuration file snmptrapd_custom.conf. The configuration file can be used for SNMPv3 authentification details.

diff --git a/Dockerfiles/snmptraps/rhel/build.sh b/Dockerfiles/snmptraps/rhel/build.sh deleted file mode 120000 index 46b20313..00000000 --- a/Dockerfiles/snmptraps/rhel/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../../build.sh \ No newline at end of file diff --git a/Dockerfiles/snmptraps/rhel/licenses/AGPL-v3.0.txt b/Dockerfiles/snmptraps/rhel/licenses/AGPL-v3.0.txt deleted file mode 100644 index be3f7b28..00000000 --- a/Dockerfiles/snmptraps/rhel/licenses/AGPL-v3.0.txt +++ /dev/null @@ -1,661 +0,0 @@ - GNU AFFERO GENERAL PUBLIC LICENSE - Version 3, 19 November 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU Affero General Public License is a free, copyleft license for -software and other kinds of works, specifically designed to ensure -cooperation with the community in the case of network server software. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -our General Public Licenses are intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - Developers that use our General Public Licenses protect your rights -with two steps: (1) assert copyright on the software, and (2) offer -you this License which gives you legal permission to copy, distribute -and/or modify the software. - - A secondary benefit of defending all users' freedom is that -improvements made in alternate versions of the program, if they -receive widespread use, become available for other developers to -incorporate. Many developers of free software are heartened and -encouraged by the resulting cooperation. However, in the case of -software used on network servers, this result may fail to come about. -The GNU General Public License permits making a modified version and -letting the public access it on a server without ever releasing its -source code to the public. - - The GNU Affero General Public License is designed specifically to -ensure that, in such cases, the modified source code becomes available -to the community. It requires the operator of a network server to -provide the source code of the modified version running there to the -users of that server. Therefore, public use of a modified version, on -a publicly accessible server, gives the public access to the source -code of the modified version. - - An older license, called the Affero General Public License and -published by Affero, was designed to accomplish similar goals. This is -a different license, not a version of the Affero GPL, but Affero has -released a new version of the Affero GPL which permits relicensing under -this license. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU Affero General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Remote Network Interaction; Use with the GNU General Public License. - - Notwithstanding any other provision of this License, if you modify the -Program, your modified version must prominently offer all users -interacting with it remotely through a computer network (if your version -supports such interaction) an opportunity to receive the Corresponding -Source of your version by providing access to the Corresponding Source -from a network server at no charge, through some standard or customary -means of facilitating copying of software. This Corresponding Source -shall include the Corresponding Source for any work covered by version 3 -of the GNU General Public License that is incorporated pursuant to the -following paragraph. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the work with which it is combined will remain governed by version -3 of the GNU General Public License. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU Affero General Public License from time to time. Such new versions -will be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU Affero General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU Affero General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU Affero General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Affero General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Affero General Public License for more details. - - You should have received a copy of the GNU Affero General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If your software can interact with users remotely through a computer -network, you should also make sure that it provides a way for users to -get its source. For example, if your program is a web application, its -interface could display a "Source" link that leads users to an archive -of the code. There are many ways you could offer source, and different -solutions will be better for different programs; see section 13 for the -specific requirements. - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU AGPL, see -. diff --git a/Dockerfiles/snmptraps/ubuntu/.dockerignore b/Dockerfiles/snmptraps/ubuntu/.dockerignore deleted file mode 100644 index 88a84e55..00000000 --- a/Dockerfiles/snmptraps/ubuntu/.dockerignore +++ /dev/null @@ -1 +0,0 @@ -build.sh diff --git a/Dockerfiles/snmptraps/ubuntu/Dockerfile b/Dockerfiles/snmptraps/ubuntu/Dockerfile deleted file mode 100644 index 8d3d8956..00000000 --- a/Dockerfiles/snmptraps/ubuntu/Dockerfile +++ /dev/null @@ -1,91 +0,0 @@ -# syntax=docker/dockerfile:1.6 -ARG OS_BASE_IMAGE=ubuntu:resolute -FROM ${OS_BASE_IMAGE} - -ARG MAJOR_VERSION=7.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.12 -ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git - -ENV TERM=xterm \ - ZBX_VERSION=${ZBX_VERSION} \ - ZBX_SOURCES=${ZBX_SOURCES} \ - MIBDIRS=/var/lib/mibs/ietf:/var/lib/mibs/iana:/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL \ - ZBX_SNMP_TRAP_DATE_FORMAT=+%Y-%m-%dT%T%z ZBX_SNMP_TRAP_FORMAT="\n" \ - ZBX_SNMP_TRAP_USE_DNS=false \ - ZABBIX_USER_HOME_DIR=/var/lib/zabbix - -ENV SNMP_PERSISTENT_DIR=${ZABBIX_USER_HOME_DIR}/snmptrapd_config - -LABEL org.opencontainers.image.authors="Alexey Pustovalov " \ - org.opencontainers.image.description="Zabbix SNMP traps receiver" \ - org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ - org.opencontainers.image.licenses="AGPL v3.0" \ - org.opencontainers.image.title="zabbix-snmptraps" \ - org.opencontainers.image.url="https://zabbix.com/" \ - org.opencontainers.image.vendor="Zabbix SIA" \ - org.opencontainers.image.version="${ZBX_VERSION}" - -STOPSIGNAL SIGTERM - -RUN --mount=type=cache,target=/var/cache/apt/,sharing=locked \ - --mount=type=cache,target=/var/lib/apt/,sharing=locked \ - --mount=from=config_templates,target=/tmp/conf,ro \ - --mount=from=scripts,target=/tmp/scripts,ro \ - set -eux && \ - INSTALL_PKGS="bash \ - tzdata \ - snmptrapd \ - snmp-mibs-downloader" && \ - apt-get update && \ - DEBIAN_FRONTEND=noninteractive apt-get install -y \ - --no-install-recommends \ - ${INSTALL_PKGS} && \ - groupadd \ - --system \ - --gid 1995 \ - zabbix && \ - useradd \ - --system \ - --comment "Zabbix monitoring system" \ - -g zabbix \ - --uid 1997 \ - --shell /sbin/nologin \ - --home-dir ${ZABBIX_USER_HOME_DIR} \ - zabbix && \ - download-mibs && \ - rm -f \ - /var/lib/mibs/ietf/VM-MIB \ - /var/lib/mibs/ietf/TRILL-OAM-MIB \ - /var/lib/mibs/ietf/SMF-MIB \ - /var/lib/mibs/ietf/ENERGY-OBJECT-MIB \ - /var/lib/mibs/ietf/POWER-ATTRIBUTES-MIB \ - /var/lib/mibs/ietf/OLSRv2-MIB \ - /var/lib/mibs/ietf/ENERGY-OBJECT-CONTEXT-MIB \ - /var/lib/mibs/ietf/BFD-STD-MIB \ - /var/lib/mibs/ietf/SNMPv2-PDU && \ - mkdir -p ${ZABBIX_USER_HOME_DIR} \ - ${ZABBIX_USER_HOME_DIR}/snmptraps \ - ${ZABBIX_USER_HOME_DIR}/mibs \ - ${SNMP_PERSISTENT_DIR} && \ - cp /tmp/conf/logrotate.d/zabbix_snmptraps /etc/logrotate.d/ && \ - cp /tmp/conf/snmp/snmptrapd.conf /etc/snmp/ && \ - cp /tmp/scripts/zabbix_trap_handler.sh /usr/sbin/ && \ - cp /tmp/scripts/snmptrapd_runner.sh /usr/sbin/ && \ - FIX_PERM_LIST="\ - /etc/snmp/ \ - ${ZABBIX_USER_HOME_DIR}/ \ - /var/tmp/ \ - /var/run/" && \ - chown --quiet -R zabbix:root ${FIX_PERM_LIST} && \ - chgrp -R 0 ${FIX_PERM_LIST} && \ - chmod -R g=u ${FIX_PERM_LIST} - -EXPOSE 1162/udp - -WORKDIR ${ZABBIX_USER_HOME_DIR}/snmptraps/ - -VOLUME ["${ZABBIX_USER_HOME_DIR}/snmptraps", "${SNMP_PERSISTENT_DIR}"] - -USER 1997 - -CMD ["/usr/sbin/snmptrapd_runner.sh"] diff --git a/Dockerfiles/snmptraps/ubuntu/README.md b/Dockerfiles/snmptraps/ubuntu/README.md deleted file mode 120000 index 32d46ee8..00000000 --- a/Dockerfiles/snmptraps/ubuntu/README.md +++ /dev/null @@ -1 +0,0 @@ -../README.md \ No newline at end of file diff --git a/Dockerfiles/snmptraps/ubuntu/build.sh b/Dockerfiles/snmptraps/ubuntu/build.sh deleted file mode 120000 index 46b20313..00000000 --- a/Dockerfiles/snmptraps/ubuntu/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../../build.sh \ No newline at end of file diff --git a/Dockerfiles/web-apache-mysql/README.md b/Dockerfiles/web-apache-mysql/README.md deleted file mode 100644 index cf6a8a73..00000000 --- a/Dockerfiles/web-apache-mysql/README.md +++ /dev/null @@ -1,333 +0,0 @@ -![logo](https://assets.zabbix.com/img/logo/zabbix_logo_500x131.png) - -# What is Zabbix? - -Zabbix is an enterprise-class open source distributed monitoring solution. - -Zabbix is software that monitors numerous parameters of a network and the health and integrity of servers. Zabbix uses a flexible notification mechanism that allows users to configure e-mail based alerts for virtually any event. This allows a fast reaction to server problems. Zabbix offers excellent reporting and data visualisation features based on the stored data. This makes Zabbix ideal for capacity planning. - -For more information and related downloads for Zabbix components, please visit https://hub.docker.com/u/zabbix/ and https://zabbix.com - -# What is Zabbix web interface? - -Zabbix web interface is a part of Zabbix software. It is used to manage resources under monitoring and view monitoring statistics. - -# Zabbix web interface images - -These are the only official Zabbix web interface Docker images. They are based on Alpine Linux v3.24, Ubuntu 26.04 (resolute), CentOS Stream 10 and Oracle Linux 10 images. The available versions of Zabbix web interface are: - - Zabbix web interface 6.0 (tags: alpine-6.0-latest, ubuntu-6.0-latest, ol-6.0-latest) - Zabbix web interface 6.0.* (tags: alpine-6.0.*, ubuntu-6.0.*, ol-6.0.*) - Zabbix web interface 7.0 (tags: alpine-7.0-latest, ubuntu-7.0-latest, ol-7.0-latest) - Zabbix web interface 7.0.* (tags: alpine-7.0.*, ubuntu-7.0.*, ol-7.0.*) - Zabbix web interface 7.2 (tags: alpine-7.2-latest, ubuntu-7.2-latest, ol-7.2-latest) - Zabbix web interface 7.2.* (tags: alpine-7.2.*, ubuntu-7.2.*, ol-7.2.*) - Zabbix web interface 7.4 (tags: alpine-7.4-latest, ubuntu-7.4-latest, ol-7.4-latest, alpine-latest, ubuntu-latest, ol-latest, latest) - Zabbix web interface 7.4.* (tags: alpine-7.4.*, ubuntu-7.4.*, ol-7.4.*) - Zabbix web interface 8.0 (tags: alpine-trunk, ubuntu-trunk, ol-trunk) - -Images are updated when new releases are published. The image with ``latest`` tag is based on Alpine Linux. - -Zabbix web interface available in four editions: -- Zabbix web-interface based on Apache2 web server with MySQL database support -- Zabbix web-interface based on Apache2 web server with PostgreSQL database support -- Zabbix web-interface based on Nginx web server with MySQL database support -- Zabbix web-interface based on Nginx web server with PostgreSQL database support - -The image based on Apache2 web server with MySQL database support. - -# How to use this image - -## Start `zabbix-web-apache-mysql` - -Start a Zabbix web-interface container as follows: - - docker run --name some-zabbix-web-apache-mysql -e DB_SERVER_HOST="some-mysql-server" -e MYSQL_USER="some-user" -e MYSQL_PASSWORD="some-password" -e ZBX_SERVER_HOST="some-zabbix-server" -e PHP_TZ="some-timezone" -d zabbix/zabbix-web-apache-mysql:tag - -Where `some-zabbix-web-apache-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, `some-zabbix-server` is IP or DNS name of Zabbix server or proxy, `some-timezone` is PHP like timezone name and `tag` is the tag specifying the version you want. See the list above for relevant tags, or look at the [full list of tags](https://hub.docker.com/r/zabbix/zabbix-web-apache-mysql/tags/). - -## Linking the container to Zabbix server - - docker run --name some-zabbix-web-apache-mysql --link some-zabbix-server:zabbix-server -e DB_SERVER_HOST="some-mysql-server" -e MYSQL_USER="some-user" -e MYSQL_PASSWORD="some-password" -e ZBX_SERVER_HOST="some-zabbix-server" -e PHP_TZ="some-timezone" -d zabbix/zabbix-web-apache-mysql:tag - -## Linking the container to MySQL database - - docker run --name some-zabbix-web-apache-mysql --link some-mysql-server:mysql -e DB_SERVER_HOST="some-mysql-server" -e MYSQL_USER="some-user" -e MYSQL_PASSWORD="some-password" -e ZBX_SERVER_HOST="some-zabbix-server" -e PHP_TZ="some-timezone" -d zabbix/zabbix-web-apache-mysql:tag - -## Container shell access and viewing Zabbix web interface logs - -The `docker exec` command allows you to run commands inside a Docker container. The following command line will give you a bash shell inside your `zabbix-web-apache-mysql` container: - -```console -$ docker exec -ti some-zabbix-web-apache-mysql /bin/bash -``` - -The Zabbix web interface log is available through Docker's container log: - -```console -$ docker logs some-zabbix-web-apache-mysql -``` - -## Environment Variables - -When you start the `zabbix-web-apache-mysql` image, you can adjust the configuration of the Zabbix web interface by passing one or more environment variables on the `docker run` command line. - -### `ZBX_SERVER_HOST` - -This variable is IP or DNS name of Zabbix server. By default, value is `zabbix-server`. - -### `ZBX_SERVER_PORT` - -This variable is port Zabbix server listening on. By default, value is `10051`. - -### `DB_SERVER_HOST` - -This variable is IP or DNS name of MySQL server. By default, value is 'mysql-server' - -### `DB_SERVER_PORT` - -This variable is port of MySQL server. By default, value is '3306'. - -### `MYSQL_USER`, `MYSQL_PASSWORD`, `MYSQL_USER_FILE`, `MYSQL_PASSWORD_FILE` - -These variables are used by Zabbix web-interface to connect to Zabbix database. With the `_FILE` variables you can instead provide the path to a file which contains the user / the password instead. Without Docker Swarm or Kubernetes you also have to map the files. Those are exclusive so you can just provide one type - either `MYSQL_USER` or `MYSQL_USER_FILE`! - -```console -docker run --name some-zabbix-web-apache-mysql -e DB_SERVER_HOST="some-mysql-server" -v ./.MYSQL_USER:/run/secrets/MYSQL_USER -e MYSQL_USER_FILE=/run/secrets/MYSQL_USER -v ./.MYSQL_PASSWORD:/run/secrets/MYSQL_PASSWORD -e MYSQL_PASSWORD_FILE=/var/run/secrets/MYSQL_PASSWORD -e PHP_TZ="some-timezone" -d zabbix/zabbix-web-apache-mysql:tag -``` - -With Docker Swarm or Kubernetes this works with secrets. That way it is replicated in your cluster! - -```console -printf "zabbix" | docker secret create MYSQL_USER - -printf "zabbix" | docker secret create MYSQL_PASSWORD - -docker run --name some-zabbix-web-apache-mysql -e DB_SERVER_HOST="some-mysql-server" -e MYSQL_USER_FILE=/run/secrets/MYSQL_USER -e MYSQL_PASSWORD_FILE=/run/secrets/MYSQL_PASSWORD -e ZBX_SERVER_HOST="some-zabbix-server" -e PHP_TZ="some-timezone" -d zabbix/zabbix-web-apache-mysql:tag -``` - -By default, values for `MYSQL_USER` and `MYSQL_PASSWORD` are `zabbix`, `zabbix`. - -### `MYSQL_DATABASE` - -The variable is Zabbix database name. By default, value is `zabbix`. - -### `ZBX_HISTORYSTORAGEURL` - -History storage HTTP[S] URL. This parameter is used for Elasticsearch setup. Available since 3.4.5. - -### `ZBX_HISTORYSTORAGETYPES` - -Array of value types to be sent to the history storage. An example: ['uint', 'dbl']. This parameter is used for Elasticsearch setup. Available since 3.4.5. - -### `PHP_TZ` - -The variable is timezone in PHP format. Full list of supported timezones are available on [`php.net`](http://php.net/manual/en/timezones.php). By default, value is 'Europe/Riga' and system timezone since Zabbix 5.2.0. - -### `ZBX_SERVER_NAME` - -The variable is visible Zabbix installation name in right or left top corner of the web interface. - -### `DB_DOUBLE_IEEE754` - -Use IEEE754 compatible value range for 64-bit Numeric (float) history values. Available since 5.0.0. Enabled by default. - -### `ENABLE_WEB_ACCESS_LOG` - -The variable sets the Access Log directive for Web server. By default, value corresponds to standard output. - -### `HTTP_INDEX_FILE` - -The variable controls default index page. By default, `index.php`. - -### `EXPOSE_WEB_SERVER_INFO` - -The variable allows to hide Web server and PHP versions. By default, `on`. - -### `ZBX_MAXEXECUTIONTIME` - -The variable is PHP ``max_execution_time`` option. By default, value is `300`. - -### `ZBX_MEMORYLIMIT` - -The variable is PHP ``memory_limit`` option. By default, value is `128M`. - -### `ZBX_POSTMAXSIZE` - -The variable is PHP ``post_max_size`` option. By default, value is `16M`. - -### `ZBX_UPLOADMAXFILESIZE` - -The variable is PHP ``upload_max_filesize`` option. By default, value is `2M`. - -### `ZBX_MAXINPUTTIME` - -The variable is PHP ``max_input_time`` option. By default, value is `300`. - -### `ZBX_SESSION_NAME` - -The variable is Zabbix frontend [definition](https://www.zabbix.com/documentation/current/manual/web_interface/definitions). String used as the name of the Zabbix frontend session cookie. By default, value is `zbx_sessionid`. - -### `ZBX_DENY_GUI_ACCESS` - -Enable (``true``) maintenance mode for Zabbix web-interface. - -### `ZBX_GUI_ACCESS_IP_RANGE` - -Array of IP addresses which are allowed for accessing to Zabbix web-interface during maintenance period. - -### `ZBX_GUI_WARNING_MSG` - -Information message about maintenance period for Zabbix web-interface. - -### `ZBX_DB_ENCRYPTION` - -The variable allows to activate encryption for connections to Zabbix database. Even if no other environment variables are specified, connections will be TLS-encrypted if `ZBX_DB_ENCRYPTION=true` specified. Available since 5.0.0. Disabled by default. - -### `ZBX_DB_KEY_FILE` - -The variable allows to specify the full path to a valid TLS key file. Available since 5.0.0. - -### `ZBX_DB_CERT_FILE` - -The variable allows to specify the full path to a valid TLS certificate file. Available since 5.0.0. - -### `ZBX_DB_CA_FILE` - -The variable allows to specify the full path to a valid TLS certificate authority file. Available since 5.0.0. - -### `ZBX_DB_VERIFY_HOST` - -The variable allows to activate host verification. Available since 5.0.0. - -### `ZBX_DB_CIPHER_LIST` - -The variable allows to specify a custom list of valid ciphers. The format of the cipher list must conform to the OpenSSL standard. Available since 5.0.0. - -### `ZBX_SSO_SP_KEY` - -The variable allows to specify a custom file path to the Service Provider (SP) private key file. - -### `ZBX_SSO_SP_CERT` - -The variable allows to specify a custom file path to the Service Provider (SP) cert file. - -### `ZBX_SSO_IDP_CERT` - -The variable allows to specify a custom file path to the SAML Certificate provided by the Identity Provider (ID) file. - -## `ZBX_SSO_SETTINGS` - -The variable allows to specify custom SSO settings in JSON format. Available since 5.0.0. - -Example of YAML Mapping to Sequences - -``` -.... - environment: - ZBX_SSO_SETTINGS: "{'baseurl': 'https://zabbix-docker.mydomain.com', 'use_proxy_headers': true, 'strict': false}" - .... -.... -``` - -## `ZBX_ALLOW_HTTP_AUTH` - -The variable allows to disable user HTTP authentication. - -### Other variables - -Additionally the image allows to specify many other environment variables listed below: - -``` -ZBX_VAULT=HashiCorp # Allowed values: HashiCorp, CyberArk. Required when Vault is used. Available since 6.2.0 -ZBX_VAULTDBPATH= # Available since 5.2.0 -ZBX_VAULTURL=https://127.0.0.1:8200 # Available since 5.2.0 -VAULT_TOKEN= # Available since 5.2.0 -ZBX_VAULTPREFIX= # Available since 7.0.0 -ZBX_VAULTCERTFILE= # Available since 6.2.0 -ZBX_VAULTKEYFILE= # Available since 6.2.0 -ZBX_VAULTCACHE=false # Available since 6.2.0 - -ZBX_SERVER_TLS_ACTIVE=false # Available since 7.4.0 -ZBX_SERVER_TLS_CAFILE= # Available since 7.4.0 -ZBX_SERVER_TLS_CA= # Available since 7.4.0 -ZBX_SERVER_TLS_KEYFILE= # Available since 7.4.0 -ZBX_SERVER_TLS_KEY= # Available since 7.4.0 -ZBX_SERVER_TLS_CERTFILE= # Available since 7.4.0 -ZBX_SERVER_TLS_CERT= # Available since 7.4.0 -ZBX_SERVER_TLS_CERT_ISSUER= # Available since 7.4.0 -ZBX_SERVER_TLS_CERT_SUBJECT= # Available since 7.4.0 - -Allowed PHP-FPM configuration options: -PHP_FPM_PM=dynamic -PHP_FPM_PM_MAX_CHILDREN=50 -PHP_FPM_PM_START_SERVERS=5 -PHP_FPM_PM_MIN_SPARE_SERVERS=5 -PHP_FPM_PM_MAX_SPARE_SERVERS=35 -PHP_FPM_PM_MAX_REQUESTS=0 - -Allowed Apache configuration options: -WEB_REAL_IP_FROM= -WEB_REAL_IP_HEADER= -``` - -## Allowed volumes for the Zabbix web interface container - -### ``/etc/ssl/apache2`` - -The volume allows to enable HTTPS for the Zabbix web interface. The volume must contain two files ``ssl.crt`` and ``ssl.key`` prepared for Apache2 SSL connections. - -Please follow official Apache2 [documentation](https://httpd.apache.org/docs/2.4/ssl/ssl_howto.html) to get more details about how to create certificate files. - -### ``/etc/zabbix/web/certs`` - -The volume allows to use custom certificates for SAML authentication. The volume must contain three files ``sp.key``, ``sp.crt`` and ``idp.crt``. Available since 5.0.0. - -### ``/var/lib/zabbix/enc`` - -The volume is used to store TLS related files. These file names are specified using ``ZBX_SERVER_TLS_CAFILE``, ``ZBX_SERVER_TLS_KEYFILE`` and ``ZBX_SERVER_TLS_CERTFILE`` variables. Additionally it is possible to use environment variables ``ZBX_SERVER_TLS_CA``, ``ZBX_SERVER_TLS_KEY`` and ``ZBX_SERVER_TLS_CERT`` with plaintext values. Available since 7.4.0. - -# The image variants - -The `zabbix-web-apache-mysql` images come in many flavors, each designed for a specific use case. - -## `zabbix-web-apache-mysql:alpine-` - -This image is based on the popular [Alpine Linux project](http://alpinelinux.org), available in [the `alpine` official image](https://hub.docker.com/_/alpine). Alpine Linux is much smaller than most distribution base images (~5MB), and thus leads to much slimmer images in general. - -This variant is highly recommended when final image size being as small as possible is desired. The main caveat to note is that it does use [musl libc](http://www.musl-libc.org) instead of [glibc and friends](http://www.etalabs.net/compare_libcs.html), so certain software might run into issues depending on the depth of their libc requirements. However, most software doesn't have an issue with this, so this variant is usually a very safe choice. See [this Hacker News comment thread](https://news.ycombinator.com/item?id=10782897) for more discussion of the issues that might arise and some pro/con comparisons of using Alpine-based images. - -To minimize image size, it's uncommon for additional related tools (such as `git` or `bash`) to be included in Alpine-based images. Using this image as a base, add the things you need in your own Dockerfile (see the [`alpine` image description](https://hub.docker.com/_/alpine/) for examples of how to install packages if you are unfamiliar). - -## `zabbix-web-apache-mysql:ubuntu-` - -This is the defacto image. If you are unsure about what your needs are, you probably want to use this one. It is designed to be used both as a throw away container (mount your source code and start the container to start your app), as well as the base to build other images off of. - -## `zabbix-web-apache-mysql:ol-` - -Oracle Linux is an open-source operating system available under the GNU General Public License (GPLv2). Suitable for general purpose or Oracle workloads, it benefits from rigorous testing of more than 128,000 hours per day with real-world workloads and includes unique innovations such as Ksplice for zero-downtime kernel patching, DTrace for real-time diagnostics, the powerful Btrfs file system, and more. - -# User Feedback - -## Documentation - -Documentation for this image is stored in the [`web-apache-mysql/` directory](https://github.com/zabbix/zabbix-docker/tree/7.4/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.4/README.md) before attempting a pull request. - -## Issues - -If you have any problems with or questions about this image, please contact us through a [GitHub issue](https://github.com/zabbix/zabbix-docker/issues). - -### Known issues - -## Contributing - -You are invited to contribute new features, fixes, or updates, large or small; we are always thrilled to receive pull requests, and do our best to process them as fast as we can. - -Before you start to code, we recommend discussing your plans through a [GitHub issue](https://github.com/zabbix/zabbix-docker/issues), especially for more ambitious contributions. This gives other contributors a chance to point you in the right direction, give you feedback on your design, and help you find out if someone else is working on the same thing. - -## License - -Starting from Zabbix version 7.0, all subsequent Zabbix versions will be released under the GNU Affero General Public License version 3 (AGPLv3). -You can modify the relevant version and propagate such modified version under the terms of the AGPLv3 as published by the Free Software Foundation. -For additional details, including answers to common questions about the AGPLv3, see the generic FAQ from the [Free Software Foundation](http://www.fsf.org/licenses/gpl-faq.html). - -Zabbix is Open Source Software, however, if you use Zabbix in a commercial context we kindly ask you to support the development of Zabbix by purchasing some level of technical support. -All previous Zabbix software versions up to 6.4 are released under the GNU General Public License version 2 (GPLv2). The formal terms of the GPLv2 and AGPLv3 can be found at http://www.fsf.org/licenses/. diff --git a/Dockerfiles/web-apache-mysql/alpine/.dockerignore b/Dockerfiles/web-apache-mysql/alpine/.dockerignore deleted file mode 100644 index 88a84e55..00000000 --- a/Dockerfiles/web-apache-mysql/alpine/.dockerignore +++ /dev/null @@ -1 +0,0 @@ -build.sh diff --git a/Dockerfiles/web-apache-mysql/alpine/Dockerfile b/Dockerfiles/web-apache-mysql/alpine/Dockerfile deleted file mode 100644 index 23cd7e88..00000000 --- a/Dockerfiles/web-apache-mysql/alpine/Dockerfile +++ /dev/null @@ -1,151 +0,0 @@ -# syntax=docker/dockerfile:1.6 -ARG OS_BASE_IMAGE=alpine:3.24 -ARG MAJOR_VERSION=7.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.12 -ARG BUILD_BASE_IMAGE=zabbix-build-mysql:alpine-${ZBX_VERSION} - -FROM ${BUILD_BASE_IMAGE} AS builder -FROM builder AS clean_builder - -ARG ZBX_VERSION - -RUN set -eux && \ - rm -rf \ - "/tmp/zabbix-${ZBX_VERSION}/ui/tests" \ - "/tmp/zabbix-${ZBX_VERSION}/ui/conf/zabbix.conf.php" \ - "/tmp/zabbix-${ZBX_VERSION}/ui/conf/zabbix.conf.php.example" \ - "/tmp/zabbix-${ZBX_VERSION}/ui/conf/maintenance.inc.php" && \ - find "/tmp/zabbix-${ZBX_VERSION}/ui/locale" -name '*.po' -delete && \ - find "/tmp/zabbix-${ZBX_VERSION}/ui/locale" -name '*.sh' -delete - -FROM ${OS_BASE_IMAGE} - -ARG MAJOR_VERSION -ARG ZBX_VERSION -ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git - -ENV TERM=xterm \ - ZBX_VERSION=${ZBX_VERSION} \ - ZBX_SOURCES=${ZBX_SOURCES} \ - ZABBIX_CONF_DIR=/etc/zabbix \ - ZABBIX_USER_HOME_DIR=/var/lib/zabbix \ - ZABBIX_WWW_ROOT=/usr/share/zabbix - -ENV DB_ENGINE=mariadb \ - APACHE_BIN=/usr/sbin/httpd \ - PHP_FPM_BIN=/usr/sbin/php-fpm85 \ - APACHE_RUN_DIR=/tmp/apache2 \ - HTTPD_CONF_FILE=/etc/apache2/httpd.conf \ - APACHE_SITES_DIR=/etc/apache2/conf.d \ - PHP_FPM_CONFIG=/etc/php85/php-fpm.conf \ - PHP_ZBX_CONFIG_FILE=/etc/php85/php-fpm.d/zabbix.conf - -LABEL org.opencontainers.image.authors="Alexey Pustovalov " \ - org.opencontainers.image.description="Zabbix web-interface based on Apache2 web server with MySQL database support" \ - org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ - org.opencontainers.image.licenses="AGPL v3.0" \ - org.opencontainers.image.source="${ZBX_SOURCES}" \ - org.opencontainers.image.title="Zabbix web-interface (Apache, MySQL)" \ - org.opencontainers.image.url="https://zabbix.com/" \ - org.opencontainers.image.vendor="Zabbix SIA" \ - org.opencontainers.image.version="${ZBX_VERSION}" - -STOPSIGNAL SIGTERM - -COPY --from=clean_builder /tmp/zabbix-${ZBX_VERSION}/ui ${ZABBIX_WWW_ROOT}/ -COPY --from=clean_builder /tmp/zabbix-${ZBX_VERSION}-output/web/conf ${ZABBIX_CONF_DIR}/web/ -COPY conf/etc/ /etc/ - -RUN set -eux && \ - INSTALL_PKGS="bash \ - curl \ - jq \ - tzdata \ - mariadb-connector-c \ - apache2 \ - php85-fpm \ - apache2-proxy \ - php85-bcmath \ - php85-ctype \ - php85-curl \ - php85-fileinfo \ - php85-gd \ - php85-gettext \ - php85-json \ - php85-ldap \ - php85-mbstring \ - php85-mysqli \ - php85-openssl \ - php85-session \ - php85-simplexml \ - php85-sockets \ - php85-xmlreader \ - php85-xmlwriter \ - mariadb-client" && \ - apk add \ - --no-cache \ - --clean-protected \ - ${INSTALL_PKGS} && \ - apk add \ - --clean-protected \ - --no-cache \ - --no-scripts \ - apache2-ssl && \ - addgroup \ - --system \ - --gid 1995 \ - zabbix && \ - adduser \ - --system \ - --gecos "Zabbix monitoring system" \ - --disabled-password \ - --uid 1997 \ - --ingroup zabbix \ - --shell /sbin/nologin \ - --home ${ZABBIX_USER_HOME_DIR} \ - zabbix && \ - mkdir -p ${ZABBIX_CONF_DIR} \ - ${ZABBIX_CONF_DIR}/web \ - ${ZABBIX_CONF_DIR}/web/certs \ - ${ZABBIX_USER_HOME_DIR}/enc \ - ${ZABBIX_USER_HOME_DIR}/enc_internal \ - /var/lib/php/session && \ - rm -rf /etc/apache2/conf.d/default.conf \ - /etc/apache2/conf.d/ssl.conf \ - /etc/apache2/conf.d/info.conf \ - /etc/apache2/conf.d/mpm.conf \ - /etc/apache2/conf.d/proxy.conf \ - /etc/apache2/conf.d/languages.conf \ - /etc/apache2/conf.d/userdir.conf \ - /etc/php85/php-fpm.d/www.conf \ - /var/run/apache2/ && \ - ln -sf "${ZABBIX_CONF_DIR}/web/zabbix.conf.php" "${ZABBIX_WWW_ROOT}/conf/zabbix.conf.php" && \ - ln -sf "${ZABBIX_CONF_DIR}/web/maintenance.inc.php" "${ZABBIX_WWW_ROOT}/conf/maintenance.inc.php" && \ - FIX_PERM_LIST="\ - ${ZABBIX_CONF_DIR}/ \ - ${ZABBIX_WWW_ROOT}/include/defines.inc.php \ - ${ZABBIX_WWW_ROOT}/modules/ \ - ${ZABBIX_USER_HOME_DIR} \ - /etc/apache2/ \ - /etc/php85/php-fpm.d/ \ - /etc/php85/php-fpm.conf \ - /var/lib/php/session/" && \ - chown --quiet -R zabbix:0 ${FIX_PERM_LIST} && \ - chmod -R g=u ${FIX_PERM_LIST} - -RUN --mount=from=entrypoints,target=/tmp/entrypoints,ro \ - set -eux && \ - install -d /usr/lib/docker-entrypoint && \ - install -m 0755 /tmp/entrypoints/web-apache-mysql.sh /usr/bin/docker-entrypoint.sh && \ - install -m 0644 /tmp/entrypoints/lib/*.sh /usr/lib/docker-entrypoint/ - -HEALTHCHECK --interval=1m30s --timeout=3s --retries=3 --start-period=40s --start-interval=5s \ - CMD curl -f http://localhost:8080/ping || exit 1 - -EXPOSE 8080/tcp 8443/tcp - -WORKDIR ${ZABBIX_WWW_ROOT} - -USER 1997 - -ENTRYPOINT ["docker-entrypoint.sh"] diff --git a/Dockerfiles/web-apache-mysql/alpine/README.md b/Dockerfiles/web-apache-mysql/alpine/README.md deleted file mode 120000 index 32d46ee8..00000000 --- a/Dockerfiles/web-apache-mysql/alpine/README.md +++ /dev/null @@ -1 +0,0 @@ -../README.md \ No newline at end of file diff --git a/Dockerfiles/web-apache-mysql/alpine/build.sh b/Dockerfiles/web-apache-mysql/alpine/build.sh deleted file mode 120000 index 46b20313..00000000 --- a/Dockerfiles/web-apache-mysql/alpine/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../../build.sh \ No newline at end of file diff --git a/Dockerfiles/web-apache-mysql/alpine/conf/etc/apache2/conf.d/mime.conf b/Dockerfiles/web-apache-mysql/alpine/conf/etc/apache2/conf.d/mime.conf deleted file mode 100644 index 9d0a0a6d..00000000 --- a/Dockerfiles/web-apache-mysql/alpine/conf/etc/apache2/conf.d/mime.conf +++ /dev/null @@ -1,8 +0,0 @@ - - TypesConfig /etc/apache2/mime.types - AddType application/x-compress .Z - AddType application/x-gzip .gz .tgz - - - MIMEMagicFile /etc/apache2/magic - diff --git a/Dockerfiles/web-apache-mysql/alpine/conf/etc/apache2/conf.d/server-common.inc b/Dockerfiles/web-apache-mysql/alpine/conf/etc/apache2/conf.d/server-common.inc deleted file mode 100644 index 6de74def..00000000 --- a/Dockerfiles/web-apache-mysql/alpine/conf/etc/apache2/conf.d/server-common.inc +++ /dev/null @@ -1,59 +0,0 @@ -RemoteIPInternalProxy ${WEB_REAL_IP_FROM} -RemoteIPHeader ${WEB_REAL_IP_HEADER} - - - Require all granted - SetHandler "proxy:unix:/tmp/php-fpm.sock|fcgi://localhost" - - - - Require all denied - - Require all denied - - - - - - Require all denied - - - - - Require all granted - - - - Require all denied - - - - Options FollowSymLinks - AllowOverride None - Require all granted - - - SetHandler "proxy:unix:/tmp/php-fpm.sock|fcgi://localhost" - - - ExpiresActive On - ExpiresByType image/x-icon "access plus 1 year" - ExpiresByType text/css "access plus 14 days" - ExpiresByType application/javascript "access plus 14 days" - ExpiresByType text/javascript "access plus 14 days" - ExpiresByType image/png "access plus 14 days" - ExpiresByType image/jpeg "access plus 14 days" - ExpiresByType image/gif "access plus 14 days" - ExpiresByType text/plain "access plus 14 days" - ExpiresByType application/xml "access plus 14 days" - - ExpiresByType image/svg+xml "access plus 14 days" - ExpiresByType font/woff "access plus 30 days" - ExpiresByType font/woff2 "access plus 30 days" - ExpiresByType font/ttf "access plus 30 days" - ExpiresByType font/otf "access plus 30 days" - - - Header append Cache-Control "public" - - diff --git a/Dockerfiles/web-apache-mysql/alpine/conf/etc/apache2/httpd.conf b/Dockerfiles/web-apache-mysql/alpine/conf/etc/apache2/httpd.conf deleted file mode 100644 index f7033e01..00000000 --- a/Dockerfiles/web-apache-mysql/alpine/conf/etc/apache2/httpd.conf +++ /dev/null @@ -1,82 +0,0 @@ -ServerRoot /var/www/ -DefaultRuntimeDir ${APACHE_RUN_DIR} -PidFile /tmp/apache2.pid - -ServerName zabbix - -IncludeOptional /etc/apache2/includes.conf - -Timeout 300 -KeepAlive On -MaxKeepAliveRequests 100 -KeepAliveTimeout 5 - - - User ${APACHE_RUN_USER} - Group ${APACHE_RUN_GROUP} - - -HostnameLookups Off - -LogLevel warn - - - SetEnvIf Request_URI "^/(robots\.txt|favicon\.ico|status|ping|apache-status)$" exclude_from_logs - - LogFormat "%v:%p %h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" vhost_combined - - CustomLog ${APACHE_CUSTOM_LOG} vhost_combined env=!exclude_from_logs - - -ErrorLog /proc/self/fd/2 - -LogLevel warn - - - StartServers 2 - MinSpareThreads 25 - MaxSpareThreads 75 - ThreadLimit 64 - ThreadsPerChild 25 - MaxRequestWorkers 150 - MaxConnectionsPerChild 0 - - -# Deny all attempts to access hidden files such as .htaccess, .htpasswd, .DS_Store (Mac). - - Require all denied - - -ServerTokens ${APACHE_SERVER_TOKENS} - -ServerSignature ${APACHE_SERVER_SIGNATURE} - -TraceEnable Off - -AddDefaultCharset UTF-8 - - - RequestReadTimeout handshake=0 header=20-40,MinRate=500 body=20,MinRate=500 - - -SetEnvIfNoCase ^Authorization$ "(.+)" HTTP_AUTHORIZATION=$1 - -AddType application/x-httpd-php .php .php3 .php4 .php5 .phtml -AddType application/x-httpd-php-source .phps - -DirectoryIndex ${HTTP_INDEX_FILE} - -DocumentRoot "${ZABBIX_WWW_ROOT}" - - - - SetHandler server-status - Require local - - - ExtendedStatus On - - - ProxyStatus On - - diff --git a/Dockerfiles/web-apache-mysql/alpine/conf/etc/apache2/includes.conf b/Dockerfiles/web-apache-mysql/alpine/conf/etc/apache2/includes.conf deleted file mode 100644 index 1c093db0..00000000 --- a/Dockerfiles/web-apache-mysql/alpine/conf/etc/apache2/includes.conf +++ /dev/null @@ -1,3 +0,0 @@ -IncludeOptional /etc/apache2/modules.conf - -IncludeOptional /etc/apache2/conf.d/*.conf diff --git a/Dockerfiles/web-apache-mysql/alpine/conf/etc/apache2/modules.conf b/Dockerfiles/web-apache-mysql/alpine/conf/etc/apache2/modules.conf deleted file mode 100644 index 89a21169..00000000 --- a/Dockerfiles/web-apache-mysql/alpine/conf/etc/apache2/modules.conf +++ /dev/null @@ -1,18 +0,0 @@ -LoadModule logio_module modules/mod_logio.so -LoadModule unixd_module modules/mod_unixd.so -LoadModule log_config_module modules/mod_log_config.so -LoadModule auth_basic_module modules/mod_auth_basic.so -LoadModule authz_core_module modules/mod_authz_core.so -LoadModule authz_host_module modules/mod_authz_host.so -LoadModule dir_module modules/mod_dir.so -LoadModule mime_module modules/mod_mime.so -LoadModule mpm_event_module modules/mod_mpm_event.so -LoadModule reqtimeout_module modules/mod_reqtimeout.so -LoadModule setenvif_module modules/mod_setenvif.so -LoadModule status_module modules/mod_status.so - -LoadModule proxy_module modules/mod_proxy.so -LoadModule proxy_fcgi_module modules/mod_proxy_fcgi.so -LoadModule expires_module modules/mod_expires.so -LoadModule headers_module modules/mod_headers.so -LoadModule remoteip_module modules/mod_remoteip.so diff --git a/Dockerfiles/web-apache-mysql/alpine/conf/etc/php85/php-fpm.conf b/Dockerfiles/web-apache-mysql/alpine/conf/etc/php85/php-fpm.conf deleted file mode 100644 index 3f077424..00000000 --- a/Dockerfiles/web-apache-mysql/alpine/conf/etc/php85/php-fpm.conf +++ /dev/null @@ -1,10 +0,0 @@ -include=/etc/php85/php-fpm.d/*.conf - -[global] - -pid = /tmp/php-fpm.pid - -error_log = /dev/fd/2 -log_level = notice - -daemonize = no diff --git a/Dockerfiles/web-apache-mysql/alpine/conf/etc/php85/php-fpm.d/zabbix.conf b/Dockerfiles/web-apache-mysql/alpine/conf/etc/php85/php-fpm.d/zabbix.conf deleted file mode 100644 index 4ee70ccd..00000000 --- a/Dockerfiles/web-apache-mysql/alpine/conf/etc/php85/php-fpm.d/zabbix.conf +++ /dev/null @@ -1,39 +0,0 @@ -[zabbix] - -; https://www.php.net/manual/en/security.hiding.php -php_value[expose_php] = ${EXPOSE_WEB_SERVER_INFO} - -listen = /tmp/php-fpm.sock - -clear_env = no - -pm = ${PHP_FPM_PM} -pm.max_children = ${PHP_FPM_PM_MAX_CHILDREN} -pm.start_servers = ${PHP_FPM_PM_START_SERVERS} -pm.min_spare_servers = ${PHP_FPM_PM_MIN_SPARE_SERVERS} -pm.max_spare_servers = ${PHP_FPM_PM_MAX_SPARE_SERVERS} -pm.max_requests = ${PHP_FPM_PM_MAX_REQUESTS} - -slowlog = /dev/fd/1 - -php_admin_value[error_log] = /dev/fd/2 -php_admin_flag[log_errors] = on -catch_workers_output = yes - -php_value[session.save_handler] = files -php_value[session.save_path] = /var/lib/php/session - -php_value[max_execution_time] = ${ZBX_MAXEXECUTIONTIME} -php_value[memory_limit] = ${ZBX_MEMORYLIMIT} -php_value[post_max_size] = ${ZBX_POSTMAXSIZE} -php_value[upload_max_filesize] = ${ZBX_UPLOADMAXFILESIZE} -php_value[max_input_time] = ${ZBX_MAXINPUTTIME} -php_value[max_input_vars] = 10000 -php_value[date.timezone] = ${PHP_TZ} - -; PHP-FPM monitoring -pm.status_path = /status -ping.path = /ping - -; Set the socket equal to DB_SERVER_SOCKET set by user -php_value[mysqli.default_socket] = ${DB_SERVER_SOCKET} diff --git a/Dockerfiles/web-apache-mysql/alpine/conf/etc/zabbix/apache.conf b/Dockerfiles/web-apache-mysql/alpine/conf/etc/zabbix/apache.conf deleted file mode 100644 index d76b6f57..00000000 --- a/Dockerfiles/web-apache-mysql/alpine/conf/etc/zabbix/apache.conf +++ /dev/null @@ -1,5 +0,0 @@ -Listen 8080 - - - Include /etc/apache2/conf.d/server-common.inc - diff --git a/Dockerfiles/web-apache-mysql/alpine/conf/etc/zabbix/apache_ssl.conf b/Dockerfiles/web-apache-mysql/alpine/conf/etc/zabbix/apache_ssl.conf deleted file mode 100644 index e7abdc75..00000000 --- a/Dockerfiles/web-apache-mysql/alpine/conf/etc/zabbix/apache_ssl.conf +++ /dev/null @@ -1,29 +0,0 @@ -LoadModule ssl_module modules/mod_ssl.so -LoadModule socache_shmcb_module modules/mod_socache_shmcb.so - -Listen 8443 https - -SSLRandomSeed startup builtin -SSLRandomSeed startup file:/dev/urandom 512 -SSLRandomSeed connect builtin -SSLRandomSeed connect file:/dev/urandom 512 - -AddType application/x-x509-ca-cert .crt -SSLSessionCache shmcb:${APACHE_RUN_DIR}/ssl_scache(512000) -SSLSessionCacheTimeout 300 - - - SSLEngine on - SSLProtocol -all +TLSv1.2 +TLSv1.3 - SSLCipherSuite ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:DHE-RSA-CHACHA20-POLY1305 - SSLHonorCipherOrder off - SSLSessionTickets off - - SSLCertificateFile /etc/ssl/apache2/ssl.crt - SSLCertificateKeyFile /etc/ssl/apache2/ssl.key - - Protocols h2 http/1.1 - Header always set Strict-Transport-Security "max-age=63072000" - - Include /etc/apache2/conf.d/server-common.inc - diff --git a/Dockerfiles/web-apache-mysql/centos/.dockerignore b/Dockerfiles/web-apache-mysql/centos/.dockerignore deleted file mode 100644 index 88a84e55..00000000 --- a/Dockerfiles/web-apache-mysql/centos/.dockerignore +++ /dev/null @@ -1 +0,0 @@ -build.sh diff --git a/Dockerfiles/web-apache-mysql/centos/Dockerfile b/Dockerfiles/web-apache-mysql/centos/Dockerfile deleted file mode 100644 index e1ffb094..00000000 --- a/Dockerfiles/web-apache-mysql/centos/Dockerfile +++ /dev/null @@ -1,153 +0,0 @@ -# syntax=docker/dockerfile:1.6 -ARG OS_BASE_IMAGE=quay.io/centos/centos:stream10-minimal -ARG MAJOR_VERSION=7.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.12 -ARG BUILD_BASE_IMAGE=zabbix-build-mysql:centos-${ZBX_VERSION} - -FROM ${BUILD_BASE_IMAGE} AS builder -FROM builder AS clean_builder - -ARG ZBX_VERSION - -RUN set -eux && \ - rm -rf \ - "/tmp/zabbix-${ZBX_VERSION}/ui/tests" \ - "/tmp/zabbix-${ZBX_VERSION}/ui/conf/zabbix.conf.php" \ - "/tmp/zabbix-${ZBX_VERSION}/ui/conf/zabbix.conf.php.example" \ - "/tmp/zabbix-${ZBX_VERSION}/ui/conf/maintenance.inc.php" && \ - find "/tmp/zabbix-${ZBX_VERSION}/ui/locale" -name '*.po' -delete && \ - find "/tmp/zabbix-${ZBX_VERSION}/ui/locale" -name '*.sh' -delete - -FROM ${OS_BASE_IMAGE} - -ARG MAJOR_VERSION -ARG ZBX_VERSION -ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git - -ENV TERM=xterm \ - ZBX_VERSION=${ZBX_VERSION} \ - ZBX_SOURCES=${ZBX_SOURCES} \ - ZABBIX_CONF_DIR=/etc/zabbix \ - ZABBIX_USER_HOME_DIR=/var/lib/zabbix \ - ZABBIX_WWW_ROOT=/usr/share/zabbix - -ENV DB_ENGINE=mysql \ - APACHE_BIN=/usr/sbin/httpd \ - PHP_FPM_BIN=/usr/sbin/php-fpm \ - APACHE_RUN_DIR=/tmp/httpd \ - HTTPD_CONF_FILE=/etc/httpd/conf/httpd.conf \ - APACHE_SITES_DIR=/etc/httpd/conf.d \ - PHP_FPM_CONFIG=/etc/php-fpm.conf \ - PHP_ZBX_CONFIG_FILE=/etc/php-fpm.d/zabbix.conf - -LABEL org.opencontainers.image.authors="Alexey Pustovalov " \ - org.opencontainers.image.description="Zabbix web-interface based on Apache2 web server with MySQL database support" \ - org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ - org.opencontainers.image.licenses="AGPL v3.0" \ - org.opencontainers.image.source="${ZBX_SOURCES}" \ - org.opencontainers.image.title="Zabbix web-interface (Apache, MySQL)" \ - org.opencontainers.image.url="https://zabbix.com/" \ - org.opencontainers.image.vendor="Zabbix SIA" \ - org.opencontainers.image.version="${ZBX_VERSION}" - -STOPSIGNAL SIGTERM - -COPY --from=clean_builder /tmp/zabbix-${ZBX_VERSION}/ui ${ZABBIX_WWW_ROOT}/ -COPY --from=clean_builder /tmp/zabbix-${ZBX_VERSION}-output/web/conf ${ZABBIX_CONF_DIR}/web/ -COPY conf/etc/ /etc/ - -RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ - --mount=type=tmpfs,target=/var/cache/yum/ \ - set -eux && \ - INSTALL_PKGS="bash \ - curl-minimal \ - findutils \ - glibc-locale-source \ - gzip \ - jq \ - shadow-utils \ - httpd \ - php \ - php-fpm \ - mod_ssl \ - php-bcmath \ - php-curl \ - php-gd \ - php-json \ - php-ldap \ - php-mbstring \ - php-mysqlnd \ - php-xml \ - mysql8.4" && \ - microdnf -y install \ - --disablerepo="*" \ - --enablerepo="baseos" \ - --enablerepo="appstream" \ - --setopt=install_weak_deps=0 \ - --setopt=keepcache=0 \ - --best \ - --nodocs \ - ${INSTALL_PKGS} && \ - groupadd \ - --system \ - --gid 1995 \ - zabbix && \ - useradd \ - --system \ - --comment "Zabbix monitoring system" \ - -g zabbix \ - --uid 1997 \ - --shell /sbin/nologin \ - --home-dir ${ZABBIX_USER_HOME_DIR} \ - zabbix && \ - mkdir -p ${ZABBIX_CONF_DIR} \ - ${ZABBIX_CONF_DIR}/web \ - ${ZABBIX_CONF_DIR}/web/certs \ - ${ZABBIX_USER_HOME_DIR}/enc \ - ${ZABBIX_USER_HOME_DIR}/enc_internal \ - /var/lib/php/session && \ - rm -rf /etc/httpd/conf.d/default.conf \ - /etc/httpd/conf.d/ssl.conf \ - /etc/httpd/conf.d/autoindex.conf \ - /etc/httpd/conf.d/php.conf \ - /etc/httpd/conf.d/userdir.conf \ - /etc/httpd/conf.d/welcome.conf \ - /etc/php-fpm.d/www.conf && \ - ln -sf "${ZABBIX_CONF_DIR}/web/zabbix.conf.php" "${ZABBIX_WWW_ROOT}/conf/zabbix.conf.php" && \ - ln -sf "${ZABBIX_CONF_DIR}/web/maintenance.inc.php" "${ZABBIX_WWW_ROOT}/conf/maintenance.inc.php" && \ - awk "/display/ && /true/ {gsub(/^[ \t]+|[ \t]+$/, \"\", \$0); print \$0}" "${ZABBIX_WWW_ROOT}/include/locales.inc.php" | \ - cut -d"'" -f 2 | sort -u | \ - xargs -r -I '{}' bash -c 'echo "{}" && localedef -c -i {} -f UTF-8 {}.UTF-8 2>/dev/null' && \ - FIX_PERM_LIST="\ - ${ZABBIX_CONF_DIR}/ \ - ${ZABBIX_WWW_ROOT}/include/defines.inc.php \ - ${ZABBIX_WWW_ROOT}/modules/ \ - ${ZABBIX_USER_HOME_DIR}/ \ - /etc/httpd/ \ - /etc/php-fpm.d/ \ - /etc/php-fpm.conf \ - /run/httpd/ \ - /var/lib/php/session/" && \ - chown --quiet -R zabbix:0 ${FIX_PERM_LIST} && \ - chmod -R g=u ${FIX_PERM_LIST} && \ - microdnf -y remove \ - findutils \ - glibc-locale-source \ - gzip - -RUN --mount=from=entrypoints,target=/tmp/entrypoints,ro \ - set -eux && \ - install -d /usr/lib/docker-entrypoint && \ - install -m 0755 /tmp/entrypoints/web-apache-mysql.sh /usr/bin/docker-entrypoint.sh && \ - install -m 0644 /tmp/entrypoints/lib/*.sh /usr/lib/docker-entrypoint/ - -HEALTHCHECK --interval=1m30s --timeout=3s --retries=3 --start-period=40s --start-interval=5s \ - CMD curl -f http://localhost:8080/ping || exit 1 - -EXPOSE 8080/tcp 8443/tcp - -WORKDIR ${ZABBIX_WWW_ROOT} - -USER 1997 - -ENTRYPOINT ["docker-entrypoint.sh"] diff --git a/Dockerfiles/web-apache-mysql/centos/README.md b/Dockerfiles/web-apache-mysql/centos/README.md deleted file mode 120000 index 32d46ee8..00000000 --- a/Dockerfiles/web-apache-mysql/centos/README.md +++ /dev/null @@ -1 +0,0 @@ -../README.md \ No newline at end of file diff --git a/Dockerfiles/web-apache-mysql/centos/build.sh b/Dockerfiles/web-apache-mysql/centos/build.sh deleted file mode 120000 index 46b20313..00000000 --- a/Dockerfiles/web-apache-mysql/centos/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../../build.sh \ No newline at end of file diff --git a/Dockerfiles/web-apache-mysql/centos/conf/etc/httpd/conf.d/mime.conf b/Dockerfiles/web-apache-mysql/centos/conf/etc/httpd/conf.d/mime.conf deleted file mode 100644 index 6dd43b1c..00000000 --- a/Dockerfiles/web-apache-mysql/centos/conf/etc/httpd/conf.d/mime.conf +++ /dev/null @@ -1,9 +0,0 @@ - - TypesConfig /etc/mime.types - - AddType application/x-compress .Z - AddType application/x-gzip .gz .tgz - - - MIMEMagicFile conf/magic - diff --git a/Dockerfiles/web-apache-mysql/centos/conf/etc/httpd/conf.d/server-common.inc b/Dockerfiles/web-apache-mysql/centos/conf/etc/httpd/conf.d/server-common.inc deleted file mode 100644 index 6de74def..00000000 --- a/Dockerfiles/web-apache-mysql/centos/conf/etc/httpd/conf.d/server-common.inc +++ /dev/null @@ -1,59 +0,0 @@ -RemoteIPInternalProxy ${WEB_REAL_IP_FROM} -RemoteIPHeader ${WEB_REAL_IP_HEADER} - - - Require all granted - SetHandler "proxy:unix:/tmp/php-fpm.sock|fcgi://localhost" - - - - Require all denied - - Require all denied - - - - - - Require all denied - - - - - Require all granted - - - - Require all denied - - - - Options FollowSymLinks - AllowOverride None - Require all granted - - - SetHandler "proxy:unix:/tmp/php-fpm.sock|fcgi://localhost" - - - ExpiresActive On - ExpiresByType image/x-icon "access plus 1 year" - ExpiresByType text/css "access plus 14 days" - ExpiresByType application/javascript "access plus 14 days" - ExpiresByType text/javascript "access plus 14 days" - ExpiresByType image/png "access plus 14 days" - ExpiresByType image/jpeg "access plus 14 days" - ExpiresByType image/gif "access plus 14 days" - ExpiresByType text/plain "access plus 14 days" - ExpiresByType application/xml "access plus 14 days" - - ExpiresByType image/svg+xml "access plus 14 days" - ExpiresByType font/woff "access plus 30 days" - ExpiresByType font/woff2 "access plus 30 days" - ExpiresByType font/ttf "access plus 30 days" - ExpiresByType font/otf "access plus 30 days" - - - Header append Cache-Control "public" - - diff --git a/Dockerfiles/web-apache-mysql/centos/conf/etc/httpd/conf/httpd.conf b/Dockerfiles/web-apache-mysql/centos/conf/etc/httpd/conf/httpd.conf deleted file mode 100644 index a1007af9..00000000 --- a/Dockerfiles/web-apache-mysql/centos/conf/etc/httpd/conf/httpd.conf +++ /dev/null @@ -1,82 +0,0 @@ -ServerRoot /etc/httpd/ -DefaultRuntimeDir ${APACHE_RUN_DIR} -PidFile /tmp/httpd.pid - -ServerName zabbix - -IncludeOptional /etc/httpd/includes.conf - -Timeout 300 -KeepAlive On -MaxKeepAliveRequests 100 -KeepAliveTimeout 5 - - - User ${APACHE_RUN_USER} - Group ${APACHE_RUN_GROUP} - - -HostnameLookups Off - -LogLevel warn - - - SetEnvIf Request_URI "^/(robots\.txt|favicon\.ico|status|ping|apache-status)$" exclude_from_logs - - LogFormat "%v:%p %h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" vhost_combined - - CustomLog ${APACHE_CUSTOM_LOG} vhost_combined env=!exclude_from_logs - - -ErrorLog /proc/self/fd/2 - -LogLevel warn - - - StartServers 2 - MinSpareThreads 25 - MaxSpareThreads 75 - ThreadLimit 64 - ThreadsPerChild 25 - MaxRequestWorkers 150 - MaxConnectionsPerChild 0 - - -# Deny all attempts to access hidden files such as .htaccess, .htpasswd, .DS_Store (Mac). - - Require all denied - - -ServerTokens ${APACHE_SERVER_TOKENS} - -ServerSignature ${APACHE_SERVER_SIGNATURE} - -TraceEnable Off - -AddDefaultCharset UTF-8 - - - RequestReadTimeout handshake=0 header=20-40,MinRate=500 body=20,MinRate=500 - - -SetEnvIfNoCase ^Authorization$ "(.+)" HTTP_AUTHORIZATION=$1 - -AddType application/x-httpd-php .php .php3 .php4 .php5 .phtml -AddType application/x-httpd-php-source .phps - -DirectoryIndex ${HTTP_INDEX_FILE} - -DocumentRoot "${ZABBIX_WWW_ROOT}" - - - - SetHandler server-status - Require local - - - ExtendedStatus On - - - ProxyStatus On - - diff --git a/Dockerfiles/web-apache-mysql/centos/conf/etc/httpd/includes.conf b/Dockerfiles/web-apache-mysql/centos/conf/etc/httpd/includes.conf deleted file mode 100644 index f7ee6da9..00000000 --- a/Dockerfiles/web-apache-mysql/centos/conf/etc/httpd/includes.conf +++ /dev/null @@ -1,3 +0,0 @@ -IncludeOptional /etc/httpd/modules.conf - -IncludeOptional /etc/httpd/conf.d/*.conf diff --git a/Dockerfiles/web-apache-mysql/centos/conf/etc/httpd/modules.conf b/Dockerfiles/web-apache-mysql/centos/conf/etc/httpd/modules.conf deleted file mode 100644 index 89a21169..00000000 --- a/Dockerfiles/web-apache-mysql/centos/conf/etc/httpd/modules.conf +++ /dev/null @@ -1,18 +0,0 @@ -LoadModule logio_module modules/mod_logio.so -LoadModule unixd_module modules/mod_unixd.so -LoadModule log_config_module modules/mod_log_config.so -LoadModule auth_basic_module modules/mod_auth_basic.so -LoadModule authz_core_module modules/mod_authz_core.so -LoadModule authz_host_module modules/mod_authz_host.so -LoadModule dir_module modules/mod_dir.so -LoadModule mime_module modules/mod_mime.so -LoadModule mpm_event_module modules/mod_mpm_event.so -LoadModule reqtimeout_module modules/mod_reqtimeout.so -LoadModule setenvif_module modules/mod_setenvif.so -LoadModule status_module modules/mod_status.so - -LoadModule proxy_module modules/mod_proxy.so -LoadModule proxy_fcgi_module modules/mod_proxy_fcgi.so -LoadModule expires_module modules/mod_expires.so -LoadModule headers_module modules/mod_headers.so -LoadModule remoteip_module modules/mod_remoteip.so diff --git a/Dockerfiles/web-apache-mysql/centos/conf/etc/php-fpm.conf b/Dockerfiles/web-apache-mysql/centos/conf/etc/php-fpm.conf deleted file mode 100644 index ce022534..00000000 --- a/Dockerfiles/web-apache-mysql/centos/conf/etc/php-fpm.conf +++ /dev/null @@ -1,9 +0,0 @@ -include=/etc/php-fpm.d/*.conf - -[global] - -pid = /tmp/php-fpm.pid - -error_log = /dev/fd/2 - -daemonize = no diff --git a/Dockerfiles/web-apache-mysql/centos/conf/etc/php-fpm.d/zabbix.conf b/Dockerfiles/web-apache-mysql/centos/conf/etc/php-fpm.d/zabbix.conf deleted file mode 100644 index 4ee70ccd..00000000 --- a/Dockerfiles/web-apache-mysql/centos/conf/etc/php-fpm.d/zabbix.conf +++ /dev/null @@ -1,39 +0,0 @@ -[zabbix] - -; https://www.php.net/manual/en/security.hiding.php -php_value[expose_php] = ${EXPOSE_WEB_SERVER_INFO} - -listen = /tmp/php-fpm.sock - -clear_env = no - -pm = ${PHP_FPM_PM} -pm.max_children = ${PHP_FPM_PM_MAX_CHILDREN} -pm.start_servers = ${PHP_FPM_PM_START_SERVERS} -pm.min_spare_servers = ${PHP_FPM_PM_MIN_SPARE_SERVERS} -pm.max_spare_servers = ${PHP_FPM_PM_MAX_SPARE_SERVERS} -pm.max_requests = ${PHP_FPM_PM_MAX_REQUESTS} - -slowlog = /dev/fd/1 - -php_admin_value[error_log] = /dev/fd/2 -php_admin_flag[log_errors] = on -catch_workers_output = yes - -php_value[session.save_handler] = files -php_value[session.save_path] = /var/lib/php/session - -php_value[max_execution_time] = ${ZBX_MAXEXECUTIONTIME} -php_value[memory_limit] = ${ZBX_MEMORYLIMIT} -php_value[post_max_size] = ${ZBX_POSTMAXSIZE} -php_value[upload_max_filesize] = ${ZBX_UPLOADMAXFILESIZE} -php_value[max_input_time] = ${ZBX_MAXINPUTTIME} -php_value[max_input_vars] = 10000 -php_value[date.timezone] = ${PHP_TZ} - -; PHP-FPM monitoring -pm.status_path = /status -ping.path = /ping - -; Set the socket equal to DB_SERVER_SOCKET set by user -php_value[mysqli.default_socket] = ${DB_SERVER_SOCKET} diff --git a/Dockerfiles/web-apache-mysql/centos/conf/etc/zabbix/apache.conf b/Dockerfiles/web-apache-mysql/centos/conf/etc/zabbix/apache.conf deleted file mode 100644 index e6af6afc..00000000 --- a/Dockerfiles/web-apache-mysql/centos/conf/etc/zabbix/apache.conf +++ /dev/null @@ -1,5 +0,0 @@ -Listen 8080 - - - Include /etc/httpd/conf.d/server-common.inc - diff --git a/Dockerfiles/web-apache-mysql/centos/conf/etc/zabbix/apache_ssl.conf b/Dockerfiles/web-apache-mysql/centos/conf/etc/zabbix/apache_ssl.conf deleted file mode 100644 index 8621aed5..00000000 --- a/Dockerfiles/web-apache-mysql/centos/conf/etc/zabbix/apache_ssl.conf +++ /dev/null @@ -1,29 +0,0 @@ -LoadModule ssl_module modules/mod_ssl.so -LoadModule socache_shmcb_module modules/mod_socache_shmcb.so - -Listen 8443 https - -SSLRandomSeed startup builtin -SSLRandomSeed startup file:/dev/urandom 512 -SSLRandomSeed connect builtin -SSLRandomSeed connect file:/dev/urandom 512 - -AddType application/x-x509-ca-cert .crt -SSLSessionCache shmcb:${APACHE_RUN_DIR}/ssl_scache(512000) -SSLSessionCacheTimeout 300 - - - SSLEngine on - SSLProtocol -all +TLSv1.2 +TLSv1.3 - SSLCipherSuite ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:DHE-RSA-CHACHA20-POLY1305 - SSLHonorCipherOrder off - SSLSessionTickets off - - SSLCertificateFile /etc/ssl/apache2/ssl.crt - SSLCertificateKeyFile /etc/ssl/apache2/ssl.key - - Protocols h2 http/1.1 - Header always set Strict-Transport-Security "max-age=63072000" - - Include /etc/httpd/conf.d/server-common.inc - diff --git a/Dockerfiles/web-apache-mysql/ol/.dockerignore b/Dockerfiles/web-apache-mysql/ol/.dockerignore deleted file mode 100644 index 88a84e55..00000000 --- a/Dockerfiles/web-apache-mysql/ol/.dockerignore +++ /dev/null @@ -1 +0,0 @@ -build.sh diff --git a/Dockerfiles/web-apache-mysql/ol/Dockerfile b/Dockerfiles/web-apache-mysql/ol/Dockerfile deleted file mode 100644 index 66c0498b..00000000 --- a/Dockerfiles/web-apache-mysql/ol/Dockerfile +++ /dev/null @@ -1,152 +0,0 @@ -# syntax=docker/dockerfile:1.6 -ARG OS_BASE_IMAGE=container-registry.oracle.com/os/oraclelinux:10-slim -ARG MAJOR_VERSION=7.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.12 -ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ol-${ZBX_VERSION} - -FROM ${BUILD_BASE_IMAGE} AS builder -FROM builder AS clean_builder - -ARG ZBX_VERSION - -RUN set -eux && \ - rm -rf \ - "/tmp/zabbix-${ZBX_VERSION}/ui/tests" \ - "/tmp/zabbix-${ZBX_VERSION}/ui/conf/zabbix.conf.php" \ - "/tmp/zabbix-${ZBX_VERSION}/ui/conf/zabbix.conf.php.example" \ - "/tmp/zabbix-${ZBX_VERSION}/ui/conf/maintenance.inc.php" && \ - find "/tmp/zabbix-${ZBX_VERSION}/ui/locale" -name '*.po' -delete && \ - find "/tmp/zabbix-${ZBX_VERSION}/ui/locale" -name '*.sh' -delete - -FROM ${OS_BASE_IMAGE} - -ARG MAJOR_VERSION -ARG ZBX_VERSION -ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git - -ENV TERM=xterm \ - ZBX_VERSION=${ZBX_VERSION} \ - ZBX_SOURCES=${ZBX_SOURCES} \ - ZABBIX_CONF_DIR=/etc/zabbix \ - ZABBIX_USER_HOME_DIR=/var/lib/zabbix \ - ZABBIX_WWW_ROOT=/usr/share/zabbix - -ENV DB_ENGINE=mysql \ - APACHE_BIN=/usr/sbin/httpd \ - PHP_FPM_BIN=/usr/sbin/php-fpm \ - APACHE_RUN_DIR=/tmp/httpd \ - HTTPD_CONF_FILE=/etc/httpd/conf/httpd.conf \ - APACHE_SITES_DIR=/etc/httpd/conf.d \ - PHP_FPM_CONFIG=/etc/php-fpm.conf \ - PHP_ZBX_CONFIG_FILE=/etc/php-fpm.d/zabbix.conf - -LABEL org.opencontainers.image.authors="Alexey Pustovalov " \ - org.opencontainers.image.description="Zabbix web-interface based on Apache2 web server with MySQL database support" \ - org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ - org.opencontainers.image.licenses="AGPL v3.0" \ - org.opencontainers.image.source="${ZBX_SOURCES}" \ - org.opencontainers.image.title="Zabbix web-interface (Apache, MySQL)" \ - org.opencontainers.image.url="https://zabbix.com/" \ - org.opencontainers.image.vendor="Zabbix SIA" \ - org.opencontainers.image.version="${ZBX_VERSION}" - -STOPSIGNAL SIGTERM - -COPY --from=clean_builder /tmp/zabbix-${ZBX_VERSION}/ui ${ZABBIX_WWW_ROOT}/ -COPY --from=clean_builder /tmp/zabbix-${ZBX_VERSION}-output/web/conf ${ZABBIX_CONF_DIR}/web/ -COPY conf/etc/ /etc/ - -RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ - --mount=type=tmpfs,target=/var/cache/yum/ \ - set -eux && \ - INSTALL_PKGS="bash \ - curl \ - findutils \ - glibc-locale-source \ - gzip \ - jq \ - httpd \ - php \ - php-fpm \ - mod_ssl \ - php-bcmath \ - php-curl \ - php-gd \ - php-json \ - php-ldap \ - php-mbstring \ - php-mysqlnd \ - php-xml \ - mysql8.4" && \ - microdnf -y install \ - --disablerepo="*" \ - --enablerepo="ol10_baseos_latest" \ - --enablerepo="ol10_appstream" \ - --setopt=install_weak_deps=0 \ - --setopt=keepcache=0 \ - --best \ - --nodocs \ - ${INSTALL_PKGS} && \ - groupadd \ - --system \ - --gid 1995 \ - zabbix && \ - useradd \ - --system \ - --comment "Zabbix monitoring system" \ - -g zabbix \ - --uid 1997 \ - --shell /sbin/nologin \ - --home-dir ${ZABBIX_USER_HOME_DIR} \ - zabbix && \ - mkdir -p ${ZABBIX_CONF_DIR} \ - ${ZABBIX_CONF_DIR}/web \ - ${ZABBIX_CONF_DIR}/web/certs \ - ${ZABBIX_USER_HOME_DIR}/enc \ - ${ZABBIX_USER_HOME_DIR}/enc_internal \ - /var/lib/php/session && \ - rm -rf /etc/httpd/conf.d/default.conf \ - /etc/httpd/conf.d/ssl.conf \ - /etc/httpd/conf.d/autoindex.conf \ - /etc/httpd/conf.d/php.conf \ - /etc/httpd/conf.d/userdir.conf \ - /etc/httpd/conf.d/welcome.conf \ - /etc/php-fpm.d/www.conf && \ - ln -sf "${ZABBIX_CONF_DIR}/web/zabbix.conf.php" "${ZABBIX_WWW_ROOT}/conf/zabbix.conf.php" && \ - ln -sf "${ZABBIX_CONF_DIR}/web/maintenance.inc.php" "${ZABBIX_WWW_ROOT}/conf/maintenance.inc.php" && \ - awk "/display/ && /true/ {gsub(/^[ \t]+|[ \t]+$/, \"\", \$0); print \$0}" "${ZABBIX_WWW_ROOT}/include/locales.inc.php" | \ - cut -d"'" -f 2 | sort -u | \ - xargs -r -I '{}' bash -c 'echo "{}" && localedef -c -i {} -f UTF-8 {}.UTF-8 2>/dev/null' && \ - FIX_PERM_LIST="\ - ${ZABBIX_CONF_DIR}/ \ - ${ZABBIX_WWW_ROOT}/include/defines.inc.php \ - ${ZABBIX_WWW_ROOT}/modules/ \ - ${ZABBIX_USER_HOME_DIR}/ \ - /etc/httpd/ \ - /etc/php-fpm.d/ \ - /etc/php-fpm.conf \ - /run/httpd/ \ - /var/lib/php/session/" && \ - chown --quiet -R zabbix:0 ${FIX_PERM_LIST} && \ - chmod -R g=u ${FIX_PERM_LIST} && \ - microdnf -y remove \ - findutils \ - glibc-locale-source \ - gzip - -RUN --mount=from=entrypoints,target=/tmp/entrypoints,ro \ - set -eux && \ - install -d /usr/lib/docker-entrypoint && \ - install -m 0755 /tmp/entrypoints/web-apache-mysql.sh /usr/bin/docker-entrypoint.sh && \ - install -m 0644 /tmp/entrypoints/lib/*.sh /usr/lib/docker-entrypoint/ - -HEALTHCHECK --interval=1m30s --timeout=3s --retries=3 --start-period=40s --start-interval=5s \ - CMD curl -f http://localhost:8080/ping || exit 1 - -EXPOSE 8080/tcp 8443/tcp - -WORKDIR ${ZABBIX_WWW_ROOT} - -USER 1997 - -ENTRYPOINT ["docker-entrypoint.sh"] diff --git a/Dockerfiles/web-apache-mysql/ol/README.md b/Dockerfiles/web-apache-mysql/ol/README.md deleted file mode 120000 index 32d46ee8..00000000 --- a/Dockerfiles/web-apache-mysql/ol/README.md +++ /dev/null @@ -1 +0,0 @@ -../README.md \ No newline at end of file diff --git a/Dockerfiles/web-apache-mysql/ol/build.sh b/Dockerfiles/web-apache-mysql/ol/build.sh deleted file mode 120000 index 46b20313..00000000 --- a/Dockerfiles/web-apache-mysql/ol/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../../build.sh \ No newline at end of file diff --git a/Dockerfiles/web-apache-mysql/ol/conf/etc/httpd/conf.d/mime.conf b/Dockerfiles/web-apache-mysql/ol/conf/etc/httpd/conf.d/mime.conf deleted file mode 100644 index 6dd43b1c..00000000 --- a/Dockerfiles/web-apache-mysql/ol/conf/etc/httpd/conf.d/mime.conf +++ /dev/null @@ -1,9 +0,0 @@ - - TypesConfig /etc/mime.types - - AddType application/x-compress .Z - AddType application/x-gzip .gz .tgz - - - MIMEMagicFile conf/magic - diff --git a/Dockerfiles/web-apache-mysql/ol/conf/etc/httpd/conf.d/server-common.inc b/Dockerfiles/web-apache-mysql/ol/conf/etc/httpd/conf.d/server-common.inc deleted file mode 100644 index 6de74def..00000000 --- a/Dockerfiles/web-apache-mysql/ol/conf/etc/httpd/conf.d/server-common.inc +++ /dev/null @@ -1,59 +0,0 @@ -RemoteIPInternalProxy ${WEB_REAL_IP_FROM} -RemoteIPHeader ${WEB_REAL_IP_HEADER} - - - Require all granted - SetHandler "proxy:unix:/tmp/php-fpm.sock|fcgi://localhost" - - - - Require all denied - - Require all denied - - - - - - Require all denied - - - - - Require all granted - - - - Require all denied - - - - Options FollowSymLinks - AllowOverride None - Require all granted - - - SetHandler "proxy:unix:/tmp/php-fpm.sock|fcgi://localhost" - - - ExpiresActive On - ExpiresByType image/x-icon "access plus 1 year" - ExpiresByType text/css "access plus 14 days" - ExpiresByType application/javascript "access plus 14 days" - ExpiresByType text/javascript "access plus 14 days" - ExpiresByType image/png "access plus 14 days" - ExpiresByType image/jpeg "access plus 14 days" - ExpiresByType image/gif "access plus 14 days" - ExpiresByType text/plain "access plus 14 days" - ExpiresByType application/xml "access plus 14 days" - - ExpiresByType image/svg+xml "access plus 14 days" - ExpiresByType font/woff "access plus 30 days" - ExpiresByType font/woff2 "access plus 30 days" - ExpiresByType font/ttf "access plus 30 days" - ExpiresByType font/otf "access plus 30 days" - - - Header append Cache-Control "public" - - diff --git a/Dockerfiles/web-apache-mysql/ol/conf/etc/httpd/conf/httpd.conf b/Dockerfiles/web-apache-mysql/ol/conf/etc/httpd/conf/httpd.conf deleted file mode 100644 index a1007af9..00000000 --- a/Dockerfiles/web-apache-mysql/ol/conf/etc/httpd/conf/httpd.conf +++ /dev/null @@ -1,82 +0,0 @@ -ServerRoot /etc/httpd/ -DefaultRuntimeDir ${APACHE_RUN_DIR} -PidFile /tmp/httpd.pid - -ServerName zabbix - -IncludeOptional /etc/httpd/includes.conf - -Timeout 300 -KeepAlive On -MaxKeepAliveRequests 100 -KeepAliveTimeout 5 - - - User ${APACHE_RUN_USER} - Group ${APACHE_RUN_GROUP} - - -HostnameLookups Off - -LogLevel warn - - - SetEnvIf Request_URI "^/(robots\.txt|favicon\.ico|status|ping|apache-status)$" exclude_from_logs - - LogFormat "%v:%p %h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" vhost_combined - - CustomLog ${APACHE_CUSTOM_LOG} vhost_combined env=!exclude_from_logs - - -ErrorLog /proc/self/fd/2 - -LogLevel warn - - - StartServers 2 - MinSpareThreads 25 - MaxSpareThreads 75 - ThreadLimit 64 - ThreadsPerChild 25 - MaxRequestWorkers 150 - MaxConnectionsPerChild 0 - - -# Deny all attempts to access hidden files such as .htaccess, .htpasswd, .DS_Store (Mac). - - Require all denied - - -ServerTokens ${APACHE_SERVER_TOKENS} - -ServerSignature ${APACHE_SERVER_SIGNATURE} - -TraceEnable Off - -AddDefaultCharset UTF-8 - - - RequestReadTimeout handshake=0 header=20-40,MinRate=500 body=20,MinRate=500 - - -SetEnvIfNoCase ^Authorization$ "(.+)" HTTP_AUTHORIZATION=$1 - -AddType application/x-httpd-php .php .php3 .php4 .php5 .phtml -AddType application/x-httpd-php-source .phps - -DirectoryIndex ${HTTP_INDEX_FILE} - -DocumentRoot "${ZABBIX_WWW_ROOT}" - - - - SetHandler server-status - Require local - - - ExtendedStatus On - - - ProxyStatus On - - diff --git a/Dockerfiles/web-apache-mysql/ol/conf/etc/httpd/includes.conf b/Dockerfiles/web-apache-mysql/ol/conf/etc/httpd/includes.conf deleted file mode 100644 index f7ee6da9..00000000 --- a/Dockerfiles/web-apache-mysql/ol/conf/etc/httpd/includes.conf +++ /dev/null @@ -1,3 +0,0 @@ -IncludeOptional /etc/httpd/modules.conf - -IncludeOptional /etc/httpd/conf.d/*.conf diff --git a/Dockerfiles/web-apache-mysql/ol/conf/etc/httpd/modules.conf b/Dockerfiles/web-apache-mysql/ol/conf/etc/httpd/modules.conf deleted file mode 100644 index 89a21169..00000000 --- a/Dockerfiles/web-apache-mysql/ol/conf/etc/httpd/modules.conf +++ /dev/null @@ -1,18 +0,0 @@ -LoadModule logio_module modules/mod_logio.so -LoadModule unixd_module modules/mod_unixd.so -LoadModule log_config_module modules/mod_log_config.so -LoadModule auth_basic_module modules/mod_auth_basic.so -LoadModule authz_core_module modules/mod_authz_core.so -LoadModule authz_host_module modules/mod_authz_host.so -LoadModule dir_module modules/mod_dir.so -LoadModule mime_module modules/mod_mime.so -LoadModule mpm_event_module modules/mod_mpm_event.so -LoadModule reqtimeout_module modules/mod_reqtimeout.so -LoadModule setenvif_module modules/mod_setenvif.so -LoadModule status_module modules/mod_status.so - -LoadModule proxy_module modules/mod_proxy.so -LoadModule proxy_fcgi_module modules/mod_proxy_fcgi.so -LoadModule expires_module modules/mod_expires.so -LoadModule headers_module modules/mod_headers.so -LoadModule remoteip_module modules/mod_remoteip.so diff --git a/Dockerfiles/web-apache-mysql/ol/conf/etc/php-fpm.conf b/Dockerfiles/web-apache-mysql/ol/conf/etc/php-fpm.conf deleted file mode 100644 index ce022534..00000000 --- a/Dockerfiles/web-apache-mysql/ol/conf/etc/php-fpm.conf +++ /dev/null @@ -1,9 +0,0 @@ -include=/etc/php-fpm.d/*.conf - -[global] - -pid = /tmp/php-fpm.pid - -error_log = /dev/fd/2 - -daemonize = no diff --git a/Dockerfiles/web-apache-mysql/ol/conf/etc/php-fpm.d/zabbix.conf b/Dockerfiles/web-apache-mysql/ol/conf/etc/php-fpm.d/zabbix.conf deleted file mode 100644 index 4ee70ccd..00000000 --- a/Dockerfiles/web-apache-mysql/ol/conf/etc/php-fpm.d/zabbix.conf +++ /dev/null @@ -1,39 +0,0 @@ -[zabbix] - -; https://www.php.net/manual/en/security.hiding.php -php_value[expose_php] = ${EXPOSE_WEB_SERVER_INFO} - -listen = /tmp/php-fpm.sock - -clear_env = no - -pm = ${PHP_FPM_PM} -pm.max_children = ${PHP_FPM_PM_MAX_CHILDREN} -pm.start_servers = ${PHP_FPM_PM_START_SERVERS} -pm.min_spare_servers = ${PHP_FPM_PM_MIN_SPARE_SERVERS} -pm.max_spare_servers = ${PHP_FPM_PM_MAX_SPARE_SERVERS} -pm.max_requests = ${PHP_FPM_PM_MAX_REQUESTS} - -slowlog = /dev/fd/1 - -php_admin_value[error_log] = /dev/fd/2 -php_admin_flag[log_errors] = on -catch_workers_output = yes - -php_value[session.save_handler] = files -php_value[session.save_path] = /var/lib/php/session - -php_value[max_execution_time] = ${ZBX_MAXEXECUTIONTIME} -php_value[memory_limit] = ${ZBX_MEMORYLIMIT} -php_value[post_max_size] = ${ZBX_POSTMAXSIZE} -php_value[upload_max_filesize] = ${ZBX_UPLOADMAXFILESIZE} -php_value[max_input_time] = ${ZBX_MAXINPUTTIME} -php_value[max_input_vars] = 10000 -php_value[date.timezone] = ${PHP_TZ} - -; PHP-FPM monitoring -pm.status_path = /status -ping.path = /ping - -; Set the socket equal to DB_SERVER_SOCKET set by user -php_value[mysqli.default_socket] = ${DB_SERVER_SOCKET} diff --git a/Dockerfiles/web-apache-mysql/ol/conf/etc/zabbix/apache.conf b/Dockerfiles/web-apache-mysql/ol/conf/etc/zabbix/apache.conf deleted file mode 100644 index e6af6afc..00000000 --- a/Dockerfiles/web-apache-mysql/ol/conf/etc/zabbix/apache.conf +++ /dev/null @@ -1,5 +0,0 @@ -Listen 8080 - - - Include /etc/httpd/conf.d/server-common.inc - diff --git a/Dockerfiles/web-apache-mysql/ol/conf/etc/zabbix/apache_ssl.conf b/Dockerfiles/web-apache-mysql/ol/conf/etc/zabbix/apache_ssl.conf deleted file mode 100644 index 8621aed5..00000000 --- a/Dockerfiles/web-apache-mysql/ol/conf/etc/zabbix/apache_ssl.conf +++ /dev/null @@ -1,29 +0,0 @@ -LoadModule ssl_module modules/mod_ssl.so -LoadModule socache_shmcb_module modules/mod_socache_shmcb.so - -Listen 8443 https - -SSLRandomSeed startup builtin -SSLRandomSeed startup file:/dev/urandom 512 -SSLRandomSeed connect builtin -SSLRandomSeed connect file:/dev/urandom 512 - -AddType application/x-x509-ca-cert .crt -SSLSessionCache shmcb:${APACHE_RUN_DIR}/ssl_scache(512000) -SSLSessionCacheTimeout 300 - - - SSLEngine on - SSLProtocol -all +TLSv1.2 +TLSv1.3 - SSLCipherSuite ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:DHE-RSA-CHACHA20-POLY1305 - SSLHonorCipherOrder off - SSLSessionTickets off - - SSLCertificateFile /etc/ssl/apache2/ssl.crt - SSLCertificateKeyFile /etc/ssl/apache2/ssl.key - - Protocols h2 http/1.1 - Header always set Strict-Transport-Security "max-age=63072000" - - Include /etc/httpd/conf.d/server-common.inc - diff --git a/Dockerfiles/web-apache-mysql/ubuntu/.dockerignore b/Dockerfiles/web-apache-mysql/ubuntu/.dockerignore deleted file mode 100644 index 88a84e55..00000000 --- a/Dockerfiles/web-apache-mysql/ubuntu/.dockerignore +++ /dev/null @@ -1 +0,0 @@ -build.sh diff --git a/Dockerfiles/web-apache-mysql/ubuntu/Dockerfile b/Dockerfiles/web-apache-mysql/ubuntu/Dockerfile deleted file mode 100644 index 23b5c1e9..00000000 --- a/Dockerfiles/web-apache-mysql/ubuntu/Dockerfile +++ /dev/null @@ -1,147 +0,0 @@ -# syntax=docker/dockerfile:1.6 -ARG OS_BASE_IMAGE=ubuntu:resolute -ARG MAJOR_VERSION=7.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.12 -ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION} - -FROM ${BUILD_BASE_IMAGE} AS builder -FROM builder AS clean_builder - -ARG ZBX_VERSION - -RUN set -eux && \ - rm -rf \ - "/tmp/zabbix-${ZBX_VERSION}/ui/tests" \ - "/tmp/zabbix-${ZBX_VERSION}/ui/conf/zabbix.conf.php" \ - "/tmp/zabbix-${ZBX_VERSION}/ui/conf/zabbix.conf.php.example" \ - "/tmp/zabbix-${ZBX_VERSION}/ui/conf/maintenance.inc.php" && \ - find "/tmp/zabbix-${ZBX_VERSION}/ui/locale" -name '*.po' -delete && \ - find "/tmp/zabbix-${ZBX_VERSION}/ui/locale" -name '*.sh' -delete - -FROM ${OS_BASE_IMAGE} - -ARG MAJOR_VERSION -ARG ZBX_VERSION -ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git - -ENV TERM=xterm \ - ZBX_VERSION=${ZBX_VERSION} \ - ZBX_SOURCES=${ZBX_SOURCES} \ - ZABBIX_CONF_DIR=/etc/zabbix \ - ZABBIX_USER_HOME_DIR=/var/lib/zabbix \ - ZABBIX_WWW_ROOT=/usr/share/zabbix \ - PYTHONDONTWRITEBYTECODE=1 - -ENV DB_ENGINE=mysql \ - DAEMON_USER=www-data \ - DAEMON_GROUP=www-data \ - APACHE_BIN=/usr/sbin/apache2 \ - PHP_FPM_BIN=/usr/sbin/php-fpm8.5 \ - APACHE_RUN_DIR=/tmp/apache2 \ - HTTPD_CONF_FILE=/etc/apache2/apache2.conf \ - APACHE_SITES_DIR=/etc/apache2/sites-enabled \ - PHP_FPM_CONFIG=/etc/php/8.5/fpm/php-fpm.conf \ - PHP_ZBX_CONFIG_FILE=/etc/php/8.5/fpm/pool.d/zabbix.conf - -LABEL org.opencontainers.image.authors="Alexey Pustovalov " \ - org.opencontainers.image.description="Zabbix web-interface based on Apache2 web server with MySQL database support" \ - org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ - org.opencontainers.image.licenses="AGPL v3.0" \ - org.opencontainers.image.source="${ZBX_SOURCES}" \ - org.opencontainers.image.title="Zabbix web-interface (Apache, MySQL)" \ - org.opencontainers.image.url="https://zabbix.com/" \ - org.opencontainers.image.vendor="Zabbix SIA" \ - org.opencontainers.image.version="${ZBX_VERSION}" - -STOPSIGNAL SIGTERM - -COPY --from=clean_builder /tmp/zabbix-${ZBX_VERSION}/ui ${ZABBIX_WWW_ROOT}/ -COPY --from=clean_builder /tmp/zabbix-${ZBX_VERSION}-output/web/conf ${ZABBIX_CONF_DIR}/web/ -COPY conf/etc/ /etc/ - -RUN --mount=type=cache,target=/var/cache/apt/,sharing=locked \ - --mount=type=cache,target=/var/lib/apt/,sharing=locked \ - set -eux && \ - INSTALL_PKGS="bash \ - ca-certificates \ - curl \ - jq \ - locales \ - tzdata \ - libldap-common \ - apache2 \ - php8.5-fpm \ - php8.5-bcmath \ - php8.5-curl \ - php8.5-gd \ - php8.5-ldap \ - php8.5-mbstring \ - php8.5-mysql \ - php8.5-xml \ - mysql-client" && \ - apt-get update && \ - DEBIAN_FRONTEND=noninteractive apt-get -y \ - -o Dpkg::Options::="--force-confdef" \ - -o Dpkg::Options::="--force-confold" \ - --no-install-recommends install \ - ${INSTALL_PKGS} && \ - groupadd \ - --system \ - --gid 1995 \ - zabbix && \ - useradd \ - --system \ - --comment "Zabbix monitoring system" \ - -g zabbix \ - --uid 1997 \ - --shell /sbin/nologin \ - --home-dir ${ZABBIX_USER_HOME_DIR}/ \ - zabbix && \ - mkdir -p \ - ${ZABBIX_CONF_DIR} \ - ${ZABBIX_CONF_DIR}/web \ - ${ZABBIX_CONF_DIR}/web/certs \ - ${ZABBIX_USER_HOME_DIR} \ - ${ZABBIX_USER_HOME_DIR}/enc \ - ${ZABBIX_USER_HOME_DIR}/enc_internal \ - /var/lib/php/session \ - /var/lib/locales/supported.d && \ - rm -rf /etc/apache2/sites-available/* \ - ${APACHE_SITES_DIR}/*.conf \ - /etc/php/8.5/fpm/pool.d/www.conf \ - /var/run/apache2/ \ - /var/lib/locales/supported.d/local && \ - ln -sf "${ZABBIX_CONF_DIR}/web/zabbix.conf.php" "${ZABBIX_WWW_ROOT}/conf/zabbix.conf.php" && \ - ln -sf "${ZABBIX_CONF_DIR}/web/maintenance.inc.php" "${ZABBIX_WWW_ROOT}/conf/maintenance.inc.php" && \ - awk "/display/ && /true/ {gsub(/^[ \t]+|[ \t]+$/, \"\", \$0); print \$0}" "${ZABBIX_WWW_ROOT}/include/locales.inc.php" | \ - cut -d"'" -f 2 | sort -u | \ - xargs -r -I '{}' bash -c 'echo "{}.UTF-8 UTF-8" >> /var/lib/locales/supported.d/local' && \ - dpkg-reconfigure locales && \ - FIX_PERM_LIST="\ - ${ZABBIX_CONF_DIR}/ \ - ${ZABBIX_WWW_ROOT}/include/defines.inc.php \ - ${ZABBIX_WWW_ROOT}/modules/ \ - ${ZABBIX_USER_HOME_DIR}/ \ - /etc/apache2/ \ - /etc/php/8.5/fpm/php-fpm.conf \ - /etc/php/8.5/fpm/pool.d/ \ - /var/lib/php/session/" && \ - chown --quiet -R zabbix:0 ${FIX_PERM_LIST} && \ - chmod -R g=u ${FIX_PERM_LIST} - -RUN --mount=from=entrypoints,target=/tmp/entrypoints,ro \ - set -eux && \ - install -d /usr/lib/docker-entrypoint && \ - install -m 0755 /tmp/entrypoints/web-apache-mysql.sh /usr/bin/docker-entrypoint.sh && \ - install -m 0644 /tmp/entrypoints/lib/*.sh /usr/lib/docker-entrypoint/ - -HEALTHCHECK --interval=1m30s --timeout=3s --retries=3 --start-period=40s --start-interval=5s \ - CMD curl -f http://localhost:8080/ping || exit 1 - -EXPOSE 8080/tcp 8443/tcp - -WORKDIR ${ZABBIX_WWW_ROOT} - -USER 1997 - -ENTRYPOINT ["docker-entrypoint.sh"] diff --git a/Dockerfiles/web-apache-mysql/ubuntu/README.md b/Dockerfiles/web-apache-mysql/ubuntu/README.md deleted file mode 120000 index 32d46ee8..00000000 --- a/Dockerfiles/web-apache-mysql/ubuntu/README.md +++ /dev/null @@ -1 +0,0 @@ -../README.md \ No newline at end of file diff --git a/Dockerfiles/web-apache-mysql/ubuntu/build.sh b/Dockerfiles/web-apache-mysql/ubuntu/build.sh deleted file mode 120000 index 46b20313..00000000 --- a/Dockerfiles/web-apache-mysql/ubuntu/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../../build.sh \ No newline at end of file diff --git a/Dockerfiles/web-apache-mysql/ubuntu/conf/etc/apache2/apache2.conf b/Dockerfiles/web-apache-mysql/ubuntu/conf/etc/apache2/apache2.conf deleted file mode 100644 index 74606784..00000000 --- a/Dockerfiles/web-apache-mysql/ubuntu/conf/etc/apache2/apache2.conf +++ /dev/null @@ -1,82 +0,0 @@ -ServerRoot /etc/apache2/ -DefaultRuntimeDir ${APACHE_RUN_DIR} -PidFile /tmp/apache2.pid - -ServerName zabbix - -IncludeOptional /etc/apache2/includes.conf - -Timeout 300 -KeepAlive On -MaxKeepAliveRequests 100 -KeepAliveTimeout 5 - - - User ${APACHE_RUN_USER} - Group ${APACHE_RUN_GROUP} - - -HostnameLookups Off - -LogLevel warn - - - SetEnvIf Request_URI "^/(robots\.txt|favicon\.ico|status|ping|apache-status)$" exclude_from_logs - - LogFormat "%v:%p %h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" vhost_combined - - CustomLog ${APACHE_CUSTOM_LOG} vhost_combined env=!exclude_from_logs - - -ErrorLog /proc/self/fd/2 - -LogLevel warn - - - StartServers 2 - MinSpareThreads 25 - MaxSpareThreads 75 - ThreadLimit 64 - ThreadsPerChild 25 - MaxRequestWorkers 150 - MaxConnectionsPerChild 0 - - -# Deny all attempts to access hidden files such as .htaccess, .htpasswd, .DS_Store (Mac). - - Require all denied - - -ServerTokens ${APACHE_SERVER_TOKENS} - -ServerSignature ${APACHE_SERVER_SIGNATURE} - -TraceEnable Off - -AddDefaultCharset UTF-8 - - - RequestReadTimeout handshake=0 header=20-40,MinRate=500 body=20,MinRate=500 - - -SetEnvIfNoCase ^Authorization$ "(.+)" HTTP_AUTHORIZATION=$1 - -AddType application/x-httpd-php .php .php3 .php4 .php5 .phtml -AddType application/x-httpd-php-source .phps - -DirectoryIndex ${HTTP_INDEX_FILE} - -DocumentRoot "${ZABBIX_WWW_ROOT}" - - - - SetHandler server-status - Require local - - - ExtendedStatus On - - - ProxyStatus On - - diff --git a/Dockerfiles/web-apache-mysql/ubuntu/conf/etc/apache2/includes.conf b/Dockerfiles/web-apache-mysql/ubuntu/conf/etc/apache2/includes.conf deleted file mode 100644 index 30cd645e..00000000 --- a/Dockerfiles/web-apache-mysql/ubuntu/conf/etc/apache2/includes.conf +++ /dev/null @@ -1,5 +0,0 @@ -IncludeOptional /etc/apache2/modules.conf - -IncludeOptional /etc/apache2/mods-enabled/mime.conf - -IncludeOptional ${APACHE_SITES_DIR}/*.conf diff --git a/Dockerfiles/web-apache-mysql/ubuntu/conf/etc/apache2/modules.conf b/Dockerfiles/web-apache-mysql/ubuntu/conf/etc/apache2/modules.conf deleted file mode 100644 index 6eb7a763..00000000 --- a/Dockerfiles/web-apache-mysql/ubuntu/conf/etc/apache2/modules.conf +++ /dev/null @@ -1,15 +0,0 @@ -LoadModule auth_basic_module /usr/lib/apache2/modules/mod_auth_basic.so -LoadModule authz_core_module /usr/lib/apache2/modules/mod_authz_core.so -LoadModule authz_host_module /usr/lib/apache2/modules/mod_authz_host.so -LoadModule dir_module /usr/lib/apache2/modules/mod_dir.so -LoadModule mime_module /usr/lib/apache2/modules/mod_mime.so -LoadModule mpm_event_module /usr/lib/apache2/modules/mod_mpm_event.so -LoadModule reqtimeout_module /usr/lib/apache2/modules/mod_reqtimeout.so -LoadModule setenvif_module /usr/lib/apache2/modules/mod_setenvif.so -LoadModule status_module /usr/lib/apache2/modules/mod_status.so - -LoadModule proxy_module /usr/lib/apache2/modules/mod_proxy.so -LoadModule proxy_fcgi_module /usr/lib/apache2/modules/mod_proxy_fcgi.so -LoadModule expires_module /usr/lib/apache2/modules/mod_expires.so -LoadModule headers_module /usr/lib/apache2/modules/mod_headers.so -LoadModule remoteip_module /usr/lib/apache2/modules/mod_remoteip.so diff --git a/Dockerfiles/web-apache-mysql/ubuntu/conf/etc/apache2/sites-enabled/server-common.inc b/Dockerfiles/web-apache-mysql/ubuntu/conf/etc/apache2/sites-enabled/server-common.inc deleted file mode 100644 index 6de74def..00000000 --- a/Dockerfiles/web-apache-mysql/ubuntu/conf/etc/apache2/sites-enabled/server-common.inc +++ /dev/null @@ -1,59 +0,0 @@ -RemoteIPInternalProxy ${WEB_REAL_IP_FROM} -RemoteIPHeader ${WEB_REAL_IP_HEADER} - - - Require all granted - SetHandler "proxy:unix:/tmp/php-fpm.sock|fcgi://localhost" - - - - Require all denied - - Require all denied - - - - - - Require all denied - - - - - Require all granted - - - - Require all denied - - - - Options FollowSymLinks - AllowOverride None - Require all granted - - - SetHandler "proxy:unix:/tmp/php-fpm.sock|fcgi://localhost" - - - ExpiresActive On - ExpiresByType image/x-icon "access plus 1 year" - ExpiresByType text/css "access plus 14 days" - ExpiresByType application/javascript "access plus 14 days" - ExpiresByType text/javascript "access plus 14 days" - ExpiresByType image/png "access plus 14 days" - ExpiresByType image/jpeg "access plus 14 days" - ExpiresByType image/gif "access plus 14 days" - ExpiresByType text/plain "access plus 14 days" - ExpiresByType application/xml "access plus 14 days" - - ExpiresByType image/svg+xml "access plus 14 days" - ExpiresByType font/woff "access plus 30 days" - ExpiresByType font/woff2 "access plus 30 days" - ExpiresByType font/ttf "access plus 30 days" - ExpiresByType font/otf "access plus 30 days" - - - Header append Cache-Control "public" - - diff --git a/Dockerfiles/web-apache-mysql/ubuntu/conf/etc/php/8.5/fpm/php-fpm.conf b/Dockerfiles/web-apache-mysql/ubuntu/conf/etc/php/8.5/fpm/php-fpm.conf deleted file mode 100644 index a2ae51f4..00000000 --- a/Dockerfiles/web-apache-mysql/ubuntu/conf/etc/php/8.5/fpm/php-fpm.conf +++ /dev/null @@ -1,10 +0,0 @@ -include=/etc/php/8.5/fpm/pool.d/*.conf - -[global] - -pid = /tmp/php-fpm.pid - -error_log = /dev/fd/2 -log_level = notice - -daemonize = no diff --git a/Dockerfiles/web-apache-mysql/ubuntu/conf/etc/php/8.5/fpm/pool.d/zabbix.conf b/Dockerfiles/web-apache-mysql/ubuntu/conf/etc/php/8.5/fpm/pool.d/zabbix.conf deleted file mode 100644 index 4ee70ccd..00000000 --- a/Dockerfiles/web-apache-mysql/ubuntu/conf/etc/php/8.5/fpm/pool.d/zabbix.conf +++ /dev/null @@ -1,39 +0,0 @@ -[zabbix] - -; https://www.php.net/manual/en/security.hiding.php -php_value[expose_php] = ${EXPOSE_WEB_SERVER_INFO} - -listen = /tmp/php-fpm.sock - -clear_env = no - -pm = ${PHP_FPM_PM} -pm.max_children = ${PHP_FPM_PM_MAX_CHILDREN} -pm.start_servers = ${PHP_FPM_PM_START_SERVERS} -pm.min_spare_servers = ${PHP_FPM_PM_MIN_SPARE_SERVERS} -pm.max_spare_servers = ${PHP_FPM_PM_MAX_SPARE_SERVERS} -pm.max_requests = ${PHP_FPM_PM_MAX_REQUESTS} - -slowlog = /dev/fd/1 - -php_admin_value[error_log] = /dev/fd/2 -php_admin_flag[log_errors] = on -catch_workers_output = yes - -php_value[session.save_handler] = files -php_value[session.save_path] = /var/lib/php/session - -php_value[max_execution_time] = ${ZBX_MAXEXECUTIONTIME} -php_value[memory_limit] = ${ZBX_MEMORYLIMIT} -php_value[post_max_size] = ${ZBX_POSTMAXSIZE} -php_value[upload_max_filesize] = ${ZBX_UPLOADMAXFILESIZE} -php_value[max_input_time] = ${ZBX_MAXINPUTTIME} -php_value[max_input_vars] = 10000 -php_value[date.timezone] = ${PHP_TZ} - -; PHP-FPM monitoring -pm.status_path = /status -ping.path = /ping - -; Set the socket equal to DB_SERVER_SOCKET set by user -php_value[mysqli.default_socket] = ${DB_SERVER_SOCKET} diff --git a/Dockerfiles/web-apache-mysql/ubuntu/conf/etc/zabbix/apache.conf b/Dockerfiles/web-apache-mysql/ubuntu/conf/etc/zabbix/apache.conf deleted file mode 100644 index 6c2041f7..00000000 --- a/Dockerfiles/web-apache-mysql/ubuntu/conf/etc/zabbix/apache.conf +++ /dev/null @@ -1,5 +0,0 @@ -Listen 8080 - - - Include ${APACHE_SITES_DIR}/server-common.inc - diff --git a/Dockerfiles/web-apache-mysql/ubuntu/conf/etc/zabbix/apache_ssl.conf b/Dockerfiles/web-apache-mysql/ubuntu/conf/etc/zabbix/apache_ssl.conf deleted file mode 100644 index ab9d29a2..00000000 --- a/Dockerfiles/web-apache-mysql/ubuntu/conf/etc/zabbix/apache_ssl.conf +++ /dev/null @@ -1,29 +0,0 @@ -LoadModule ssl_module /usr/lib/apache2/modules/mod_ssl.so -LoadModule socache_shmcb_module /usr/lib/apache2/modules/mod_socache_shmcb.so - -Listen 8443 https - -SSLRandomSeed startup builtin -SSLRandomSeed startup file:/dev/urandom 512 -SSLRandomSeed connect builtin -SSLRandomSeed connect file:/dev/urandom 512 - -AddType application/x-x509-ca-cert .crt -SSLSessionCache shmcb:${APACHE_RUN_DIR}/ssl_scache(512000) -SSLSessionCacheTimeout 300 - - - SSLEngine on - SSLProtocol -all +TLSv1.2 +TLSv1.3 - SSLCipherSuite ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:DHE-RSA-CHACHA20-POLY1305 - SSLHonorCipherOrder off - SSLSessionTickets off - - SSLCertificateFile /etc/ssl/apache2/ssl.crt - SSLCertificateKeyFile /etc/ssl/apache2/ssl.key - - Protocols h2 http/1.1 - Header always set Strict-Transport-Security "max-age=63072000" - - Include ${APACHE_SITES_DIR}/server-common.inc - diff --git a/Dockerfiles/web-apache-pgsql/README.md b/Dockerfiles/web-apache-pgsql/README.md deleted file mode 100644 index ca6ef39f..00000000 --- a/Dockerfiles/web-apache-pgsql/README.md +++ /dev/null @@ -1,333 +0,0 @@ -![logo](https://assets.zabbix.com/img/logo/zabbix_logo_500x131.png) - -# What is Zabbix? - -Zabbix is an enterprise-class open source distributed monitoring solution. - -Zabbix is software that monitors numerous parameters of a network and the health and integrity of servers. Zabbix uses a flexible notification mechanism that allows users to configure e-mail based alerts for virtually any event. This allows a fast reaction to server problems. Zabbix offers excellent reporting and data visualisation features based on the stored data. This makes Zabbix ideal for capacity planning. - -For more information and related downloads for Zabbix components, please visit https://hub.docker.com/u/zabbix/ and https://zabbix.com - -# What is Zabbix web interface? - -Zabbix web interface is a part of Zabbix software. It is used to manage resources under monitoring and view monitoring statistics. - -# Zabbix web interface images - -These are the only official Zabbix web interface Docker images. They are based on Alpine Linux v3.24, Ubuntu 26.04 (resolute), CentOS Stream 10 and Oracle Linux 10 images. The available versions of Zabbix web interface are: - - Zabbix web interface 6.0 (tags: alpine-6.0-latest, ubuntu-6.0-latest, ol-6.0-latest) - Zabbix web interface 6.0.* (tags: alpine-6.0.*, ubuntu-6.0.*, ol-6.0.*) - Zabbix web interface 7.0 (tags: alpine-7.0-latest, ubuntu-7.0-latest, ol-7.0-latest) - Zabbix web interface 7.0.* (tags: alpine-7.0.*, ubuntu-7.0.*, ol-7.0.*) - Zabbix web interface 7.2 (tags: alpine-7.2-latest, ubuntu-7.2-latest, ol-7.2-latest) - Zabbix web interface 7.2.* (tags: alpine-7.2.*, ubuntu-7.2.*, ol-7.2.*) - Zabbix web interface 7.4 (tags: alpine-7.4-latest, ubuntu-7.4-latest, ol-7.4-latest, alpine-latest, ubuntu-latest, ol-latest, latest) - Zabbix web interface 7.4.* (tags: alpine-7.4.*, ubuntu-7.4.*, ol-7.4.*) - Zabbix web interface 8.0 (tags: alpine-trunk, ubuntu-trunk, ol-trunk) - -Images are updated when new releases are published. The image with ``latest`` tag is based on Alpine Linux. - -Zabbix web interface available in four editions: -- Zabbix web-interface based on Apache2 web server with MySQL database support -- Zabbix web-interface based on Apache2 web server with PostgreSQL database support -- Zabbix web-interface based on Nginx web server with MySQL database support -- Zabbix web-interface based on Nginx web server with PostgreSQL database support - -The image based on Apache2 web server with PostgreSQL database support. - -# How to use this image - -## Start `zabbix-web-apache-pgsql` - -Start a Zabbix web-interface container as follows: - - docker run --name some-zabbix-web-apache-pgsql -e DB_SERVER_HOST="some-postgres-server" -e POSTGRES_USER="some-user" -e POSTGRES_PASSWORD="some-password" -e ZBX_SERVER_HOST="some-zabbix-server" -e PHP_TZ="some-timezone" -d zabbix/zabbix-web-apache-pgsql:tag - -Where `some-zabbix-web-apache-pgsql` is the name you want to assign to your container, `some-postgres-server` is IP or DNS name of PostgreSQL server, `some-user` is user to connect to Zabbix database on PostgreSQL server, `some-password` is the password to connect to PostgreSQL server, `some-zabbix-server` is IP or DNS name of Zabbix server or proxy, `some-timezone` is PHP like timezone name and `tag` is the tag specifying the version you want. See the list above for relevant tags, or look at the [full list of tags](https://hub.docker.com/r/zabbix/zabbix-web-apache-pgsql/tags/). - -## Linking the container to Zabbix server - - docker run --name some-zabbix-web-apache-pgsql --link some-zabbix-server:zabbix-server -e DB_SERVER_HOST="some-postgres-server" -e POSTGRES_USER="some-user" -e POSTGRES_PASSWORD="some-password" -e ZBX_SERVER_HOST="some-zabbix-server" -e PHP_TZ="some-timezone" -d zabbix/zabbix-web-apache-pgsql:tag - -## Linking the container to PostgreSQL database - - docker run --name some-zabbix-web-apache-pgsql --link some-postgres-server:postgres -e DB_SERVER_HOST="some-postgres-server" -e POSTGRES_USER="some-user" -e POSTGRES_PASSWORD="some-password" -e ZBX_SERVER_HOST="some-zabbix-server" -e PHP_TZ="some-timezone" -d zabbix/zabbix-web-apache-pgsql:tag - -## Container shell access and viewing Zabbix web interface logs - -The `docker exec` command allows you to run commands inside a Docker container. The following command line will give you a bash shell inside your `zabbix-web-apache-pgsql` container: - -```console -$ docker exec -ti some-zabbix-web-apache-pgsql /bin/bash -``` - -The Zabbix web interface log is available through Docker's container log: - -```console -$ docker logs some-zabbix-web-apache-pgsql -``` - -## Environment Variables - -When you start the `zabbix-web-apache-pgsql` image, you can adjust the configuration of the Zabbix web interface by passing one or more environment variables on the `docker run` command line. - -### `ZBX_SERVER_HOST` - -This variable is IP or DNS name of Zabbix server. By default, value is `zabbix-server`. - -### `ZBX_SERVER_PORT` - -This variable is port Zabbix server listening on. By default, value is `10051`. - -### `DB_SERVER_HOST` - -This variable is IP or DNS name of PostgreSQL server. By default, value is 'postgres-server' - -### `DB_SERVER_PORT` - -This variable is port of PostgreSQL server. By default, value is '5432'. - -### `POSTGRES_USER`, `POSTGRES_PASSWORD`, `POSTGRES_USER_FILE`, `POSTGRES_PASSWORD_FILE` - -These variables are used by Zabbix web interface to connect to Zabbix database. With the `_FILE` variables you can instead provide the path to a file which contains the user / the password instead. Without Docker Swarm or Kubernetes you also have to map the files. Those are exclusive so you can just provide one type - either `POSTGRES_USER` or `POSTGRES_USER_FILE`! - -```console -docker run --name some-zabbix-web-apache-pgsql -e DB_SERVER_HOST="some-postgres-server" -v ./.POSTGRES_USER:/run/secrets/POSTGRES_USER -e POSTGRES_USER_FILE=/run/secrets/POSTGRES_USER -v ./.POSTGRES_PASSWORD:/run/secrets/POSTGRES_PASSWORD -e POSTGRES_PASSWORD_FILE=/var/run/secrets/POSTGRES_PASSWORD -e ZBX_SERVER_HOST="some-zabbix-server" -e PHP_TZ="some-timezone" -d zabbix/zabbix-web-apache-pgsql:tag -``` - -With Docker Swarm or Kubernetes this works with secrets. That way it is replicated in your cluster! - -```console -printf "zabbix" | docker secret create POSTGRES_USER - -printf "zabbix" | docker secret create POSTGRES_PASSWORD - -docker run --name some-zabbix-web-apache-pgsql -e DB_SERVER_HOST="some-postgres-server" -e POSTGRES_USER_FILE=/run/secrets/POSTGRES_USER -e POSTGRES_PASSWORD_FILE=/run/secrets/POSTGRES_PASSWORD -e ZBX_SERVER_HOST="some-zabbix-server" -e PHP_TZ="some-timezone" -d zabbix/zabbix-web-apache-pgsql:tag -``` - -By default, values for `POSTGRES_USER` and `POSTGRES_PASSWORD` are `zabbix`, `zabbix`. - -### `POSTGRES_DB` - -The variable is Zabbix database name. By default, value is `zabbix`. - -### `POSTGRES_USE_IMPLICIT_SEARCH_PATH` - -In some setups, for example including [PgBouncer](https://www.pgbouncer.org), setting the `search_path` via connection parameters fails. If this variable is set to `"true"`, the image skips setting the `search_path` and trusts that the `search_path` of the Zabbix user is setup correctly in PostgreSQL database. - -### `ZBX_HISTORYSTORAGEURL` - -History storage HTTP[S] URL. This parameter is used for Elasticsearch setup. Available since 3.4.5. - -### `ZBX_HISTORYSTORAGETYPES` - -Array of value types to be sent to the history storage. An example: ['uint', 'dbl']. This parameter is used for Elasticsearch setup. Available since 3.4.5. - -### `PHP_TZ` - -The variable is timezone in PHP format. Full list of supported timezones are available on [`php.net`](http://php.net/manual/en/timezones.php). By default, value is 'Europe/Riga' and system timezone since Zabbix 5.2.0. - -### `ZBX_SERVER_NAME` - -The variable is visible Zabbix installation name in right or left top corner of the web interface. - -### `DB_DOUBLE_IEEE754` - -Use IEEE754 compatible value range for 64-bit Numeric (float) history values. Available since 5.0.0. Enabled by default. - -### `ENABLE_WEB_ACCESS_LOG` - -The variable sets the Access Log directive for Web server. By default, value corresponds to standard output. - -### `HTTP_INDEX_FILE` - -The variable controls default index page. By default, `index.php`. - -### `EXPOSE_WEB_SERVER_INFO` - -The variable allows to hide Web server and PHP versions. By default, `on`. - -### `ZBX_MAXEXECUTIONTIME` - -The variable is PHP ``max_execution_time`` option. By default, value is `300`. - -### `ZBX_MEMORYLIMIT` - -The variable is PHP ``memory_limit`` option. By default, value is `128M`. - -### `ZBX_POSTMAXSIZE` - -The variable is PHP ``post_max_size`` option. By default, value is `16M`. - -### `ZBX_UPLOADMAXFILESIZE` - -The variable is PHP ``upload_max_filesize`` option. By default, value is `2M`. - -### `ZBX_MAXINPUTTIME` - -The variable is PHP ``max_input_time`` option. By default, value is `300`. - -### `ZBX_SESSION_NAME` - -The variable is Zabbix frontend [definition](https://www.zabbix.com/documentation/current/manual/web_interface/definitions). String used as the name of the Zabbix frontend session cookie. By default, value is `zbx_sessionid`. - -### `ZBX_DENY_GUI_ACCESS` - -Enable (``true``) maintenance mode for Zabbix web-interface. - -### `ZBX_GUI_ACCESS_IP_RANGE` - -Array of IP addresses which are allowed for accessing to Zabbix web-interface during maintenance period. - -### `ZBX_GUI_WARNING_MSG` - -Information message about maintenance period for Zabbix web-interface. - -### `ZBX_DB_ENCRYPTION` - -The variable allows to activate encryption for connections to Zabbix database. Even if no other environment variables are specified, connections will be TLS-encrypted if `ZBX_DB_ENCRYPTION=true` specified. Available since 5.0.0. Disabled by default. - -### `ZBX_DB_KEY_FILE` - -The variable allows to specify the full path to a valid TLS key file. Available since 5.0.0. - -### `ZBX_DB_CERT_FILE` - -The variable allows to specify the full path to a valid TLS certificate file. Available since 5.0.0. - -### `ZBX_DB_CA_FILE` - -The variable allows to specify the full path to a valid TLS certificate authority file. Available since 5.0.0. - -### `ZBX_DB_VERIFY_HOST` - -The variable allows to activate host verification. Available since 5.0.0. - -### `ZBX_SSO_SP_KEY` - -The variable allows to specify a custom file path to the Service Provider (SP) private key file. - -### `ZBX_SSO_SP_CERT` - -The variable allows to specify a custom file path to the Service Provider (SP) cert file. - -### `ZBX_SSO_IDP_CERT` - -The variable allows to specify a custom file path to the SAML Certificate provided by the Identity Provider (ID) file. - -## `ZBX_SSO_SETTINGS` - -The variable allows to specify custom SSO settings in JSON format. Available since 5.0.0. - -Example of YAML Mapping to Sequences - -``` -.... - environment: - ZBX_SSO_SETTINGS: "{'baseurl': 'https://zabbix-docker.mydomain.com', 'use_proxy_headers': true, 'strict': false}" - .... -.... -``` - -## `ZBX_ALLOW_HTTP_AUTH` - -The variable allows to disable user HTTP authentication. - -### Other variables - -Additionally the image allows to specify many other environment variables listed below: - -``` -ZBX_VAULT=HashiCorp # Allowed values: HashiCorp, CyberArk. Required when Vault is used. Available since 6.2.0 -ZBX_VAULTDBPATH= # Available since 5.2.0 -ZBX_VAULTURL=https://127.0.0.1:8200 # Available since 5.2.0 -VAULT_TOKEN= # Available since 5.2.0 -ZBX_VAULTPREFIX= # Available since 7.0.0 -ZBX_VAULTCERTFILE= # Available since 6.2.0 -ZBX_VAULTKEYFILE= # Available since 6.2.0 -ZBX_VAULTCACHE=false # Available since 6.2.0 - -ZBX_SERVER_TLS_ACTIVE=false # Available since 7.4.0 -ZBX_SERVER_TLS_CAFILE= # Available since 7.4.0 -ZBX_SERVER_TLS_CA= # Available since 7.4.0 -ZBX_SERVER_TLS_KEYFILE= # Available since 7.4.0 -ZBX_SERVER_TLS_KEY= # Available since 7.4.0 -ZBX_SERVER_TLS_CERTFILE= # Available since 7.4.0 -ZBX_SERVER_TLS_CERT= # Available since 7.4.0 -ZBX_SERVER_TLS_CERT_ISSUER= # Available since 7.4.0 -ZBX_SERVER_TLS_CERT_SUBJECT= # Available since 7.4.0 - -Allowed PHP-FPM configuration options: -PHP_FPM_PM=dynamic -PHP_FPM_PM_MAX_CHILDREN=50 -PHP_FPM_PM_START_SERVERS=5 -PHP_FPM_PM_MIN_SPARE_SERVERS=5 -PHP_FPM_PM_MAX_SPARE_SERVERS=35 -PHP_FPM_PM_MAX_REQUESTS=0 - -Allowed Apache configuration options: -WEB_REAL_IP_FROM= -WEB_REAL_IP_HEADER= -``` - -## Allowed volumes for the Zabbix web interface container - -### ``/etc/ssl/apache2`` - -The volume allows to enable HTTPS for the Zabbix web interface. The volume must contain two files ``ssl.crt`` and ``ssl.key`` prepared for Apache2 SSL connections. - -Please follow official Apache2 [documentation](https://httpd.apache.org/docs/2.4/ssl/ssl_howto.html) to get more details about how to create certificate files. - -### ``/etc/zabbix/web/certs`` - -The volume allows to use custom certificates for SAML authentication. The volume must contain three files ``sp.key``, ``sp.crt`` and ``idp.crt``. Available since 5.0.0. - -### ``/var/lib/zabbix/enc`` - -The volume is used to store TLS related files. These file names are specified using ``ZBX_SERVER_TLS_CAFILE``, ``ZBX_SERVER_TLS_KEYFILE`` and ``ZBX_SERVER_TLS_CERTFILE`` variables. Additionally it is possible to use environment variables ``ZBX_SERVER_TLS_CA``, ``ZBX_SERVER_TLS_KEY`` and ``ZBX_SERVER_TLS_CERT`` with plaintext values. Available since 7.4.0. - -# The image variants - -The `zabbix-web-apache-pgsql` images come in many flavors, each designed for a specific use case. - -## `zabbix-web-apache-pgsql:alpine-` - -This image is based on the popular [Alpine Linux project](http://alpinelinux.org), available in [the `alpine` official image](https://hub.docker.com/_/alpine). Alpine Linux is much smaller than most distribution base images (~5MB), and thus leads to much slimmer images in general. - -This variant is highly recommended when final image size being as small as possible is desired. The main caveat to note is that it does use [musl libc](http://www.musl-libc.org) instead of [glibc and friends](http://www.etalabs.net/compare_libcs.html), so certain software might run into issues depending on the depth of their libc requirements. However, most software doesn't have an issue with this, so this variant is usually a very safe choice. See [this Hacker News comment thread](https://news.ycombinator.com/item?id=10782897) for more discussion of the issues that might arise and some pro/con comparisons of using Alpine-based images. - -To minimize image size, it's uncommon for additional related tools (such as `git` or `bash`) to be included in Alpine-based images. Using this image as a base, add the things you need in your own Dockerfile (see the [`alpine` image description](https://hub.docker.com/_/alpine/) for examples of how to install packages if you are unfamiliar). - -## `zabbix-web-apache-pgsql:ubuntu-` - -This is the defacto image. If you are unsure about what your needs are, you probably want to use this one. It is designed to be used both as a throw away container (mount your source code and start the container to start your app), as well as the base to build other images off of. - -## `zabbix-web-apache-pgsql:ol-` - -Oracle Linux is an open-source operating system available under the GNU General Public License (GPLv2). Suitable for general purpose or Oracle workloads, it benefits from rigorous testing of more than 128,000 hours per day with real-world workloads and includes unique innovations such as Ksplice for zero-downtime kernel patching, DTrace for real-time diagnostics, the powerful Btrfs file system, and more. - -# User Feedback - -## Documentation - -Documentation for this image is stored in the [`web-apache-pgsql/` directory](https://github.com/zabbix/zabbix-docker/tree/7.4/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.4/README.md) before attempting a pull request. - -## Issues - -If you have any problems with or questions about this image, please contact us through a [GitHub issue](https://github.com/zabbix/zabbix-docker/issues). - -### Known issues - -## Contributing - -You are invited to contribute new features, fixes, or updates, large or small; we are always thrilled to receive pull requests, and do our best to process them as fast as we can. - -Before you start to code, we recommend discussing your plans through a [GitHub issue](https://github.com/zabbix/zabbix-docker/issues), especially for more ambitious contributions. This gives other contributors a chance to point you in the right direction, give you feedback on your design, and help you find out if someone else is working on the same thing. - -## License - -Starting from Zabbix version 7.0, all subsequent Zabbix versions will be released under the GNU Affero General Public License version 3 (AGPLv3). -You can modify the relevant version and propagate such modified version under the terms of the AGPLv3 as published by the Free Software Foundation. -For additional details, including answers to common questions about the AGPLv3, see the generic FAQ from the [Free Software Foundation](http://www.fsf.org/licenses/gpl-faq.html). - -Zabbix is Open Source Software, however, if you use Zabbix in a commercial context we kindly ask you to support the development of Zabbix by purchasing some level of technical support. -All previous Zabbix software versions up to 6.4 are released under the GNU General Public License version 2 (GPLv2). The formal terms of the GPLv2 and AGPLv3 can be found at http://www.fsf.org/licenses/. diff --git a/Dockerfiles/web-apache-pgsql/alpine/.dockerignore b/Dockerfiles/web-apache-pgsql/alpine/.dockerignore deleted file mode 100644 index 88a84e55..00000000 --- a/Dockerfiles/web-apache-pgsql/alpine/.dockerignore +++ /dev/null @@ -1 +0,0 @@ -build.sh diff --git a/Dockerfiles/web-apache-pgsql/alpine/Dockerfile b/Dockerfiles/web-apache-pgsql/alpine/Dockerfile deleted file mode 100644 index d1ed5d21..00000000 --- a/Dockerfiles/web-apache-pgsql/alpine/Dockerfile +++ /dev/null @@ -1,149 +0,0 @@ -# syntax=docker/dockerfile:1.6 -ARG OS_BASE_IMAGE=alpine:3.24 -ARG MAJOR_VERSION=7.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.12 -ARG BUILD_BASE_IMAGE=zabbix-build-pgsql:alpine-${ZBX_VERSION} - -FROM ${BUILD_BASE_IMAGE} AS builder -FROM builder AS clean_builder - -ARG ZBX_VERSION - -RUN set -eux && \ - rm -rf \ - "/tmp/zabbix-${ZBX_VERSION}/ui/tests" \ - "/tmp/zabbix-${ZBX_VERSION}/ui/conf/zabbix.conf.php" \ - "/tmp/zabbix-${ZBX_VERSION}/ui/conf/zabbix.conf.php.example" \ - "/tmp/zabbix-${ZBX_VERSION}/ui/conf/maintenance.inc.php" && \ - find "/tmp/zabbix-${ZBX_VERSION}/ui/locale" -name '*.po' -delete && \ - find "/tmp/zabbix-${ZBX_VERSION}/ui/locale" -name '*.sh' -delete - -FROM ${OS_BASE_IMAGE} - -ARG MAJOR_VERSION -ARG ZBX_VERSION -ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git - -ENV TERM=xterm \ - ZBX_VERSION=${ZBX_VERSION} \ - ZBX_SOURCES=${ZBX_SOURCES} \ - ZABBIX_CONF_DIR=/etc/zabbix \ - ZABBIX_USER_HOME_DIR=/var/lib/zabbix \ - ZABBIX_WWW_ROOT=/usr/share/zabbix - -ENV APACHE_BIN=/usr/sbin/httpd \ - PHP_FPM_BIN=/usr/sbin/php-fpm85 \ - APACHE_RUN_DIR=/tmp/apache2 \ - HTTPD_CONF_FILE=/etc/apache2/httpd.conf \ - APACHE_SITES_DIR=/etc/apache2/conf.d \ - PHP_FPM_CONFIG=/etc/php85/php-fpm.conf \ - PHP_ZBX_CONFIG_FILE=/etc/php85/php-fpm.d/zabbix.conf - -LABEL org.opencontainers.image.authors="Alexey Pustovalov " \ - org.opencontainers.image.description="Zabbix web-interface based on Apache2 web server with PostgreSQL database support" \ - org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ - org.opencontainers.image.licenses="AGPL v3.0" \ - org.opencontainers.image.source="${ZBX_SOURCES}" \ - org.opencontainers.image.title="Zabbix web-interface (Apache, PostgreSQL)" \ - org.opencontainers.image.url="https://zabbix.com/" \ - org.opencontainers.image.vendor="Zabbix SIA" \ - org.opencontainers.image.version="${ZBX_VERSION}" - -STOPSIGNAL SIGTERM - -COPY --from=clean_builder /tmp/zabbix-${ZBX_VERSION}/ui ${ZABBIX_WWW_ROOT}/ -COPY --from=clean_builder /tmp/zabbix-${ZBX_VERSION}-output/web/conf ${ZABBIX_CONF_DIR}/web/ -COPY conf/etc/ /etc/ - -RUN set -eux && \ - INSTALL_PKGS="bash \ - curl \ - jq \ - tzdata \ - apache2 \ - php85-fpm \ - apache2-proxy \ - php85-bcmath \ - php85-ctype \ - php85-curl \ - php85-fileinfo \ - php85-gd \ - php85-gettext \ - php85-json \ - php85-ldap \ - php85-mbstring \ - php85-openssl \ - php85-pgsql \ - php85-session \ - php85-simplexml \ - php85-sockets \ - php85-xmlreader \ - php85-xmlwriter \ - postgresql18-client" && \ - apk add \ - --no-cache \ - --clean-protected \ - ${INSTALL_PKGS} && \ - apk add \ - --clean-protected \ - --no-cache \ - --no-scripts \ - apache2-ssl && \ - addgroup \ - --system \ - --gid 1995 \ - zabbix && \ - adduser \ - --system \ - --gecos "Zabbix monitoring system" \ - --disabled-password \ - --uid 1997 \ - --ingroup zabbix \ - --shell /sbin/nologin \ - --home ${ZABBIX_USER_HOME_DIR} \ - zabbix && \ - mkdir -p ${ZABBIX_CONF_DIR} \ - ${ZABBIX_CONF_DIR}/web \ - ${ZABBIX_CONF_DIR}/web/certs \ - ${ZABBIX_USER_HOME_DIR}/enc \ - ${ZABBIX_USER_HOME_DIR}/enc_internal \ - /var/lib/php/session && \ - rm -rf /etc/apache2/conf.d/default.conf \ - /etc/apache2/conf.d/ssl.conf \ - /etc/apache2/conf.d/info.conf \ - /etc/apache2/conf.d/mpm.conf \ - /etc/apache2/conf.d/proxy.conf \ - /etc/apache2/conf.d/languages.conf \ - /etc/apache2/conf.d/userdir.conf \ - /etc/php85/php-fpm.d/www.conf \ - /var/run/apache2/ && \ - ln -sf "${ZABBIX_CONF_DIR}/web/zabbix.conf.php" "${ZABBIX_WWW_ROOT}/conf/zabbix.conf.php" && \ - ln -sf "${ZABBIX_CONF_DIR}/web/maintenance.inc.php" "${ZABBIX_WWW_ROOT}/conf/maintenance.inc.php" && \ - FIX_PERM_LIST="\ - ${ZABBIX_CONF_DIR}/ \ - ${ZABBIX_WWW_ROOT}/include/defines.inc.php \ - ${ZABBIX_WWW_ROOT}/modules/ \ - ${ZABBIX_USER_HOME_DIR} \ - /etc/apache2/ \ - /etc/php85/php-fpm.d/ \ - /etc/php85/php-fpm.conf \ - /var/lib/php/session/" && \ - chown --quiet -R zabbix:0 ${FIX_PERM_LIST} && \ - chmod -R g=u ${FIX_PERM_LIST} - -RUN --mount=from=entrypoints,target=/tmp/entrypoints,ro \ - set -eux && \ - install -d /usr/lib/docker-entrypoint && \ - install -m 0755 /tmp/entrypoints/web-apache-pgsql.sh /usr/bin/docker-entrypoint.sh && \ - install -m 0644 /tmp/entrypoints/lib/*.sh /usr/lib/docker-entrypoint/ - -HEALTHCHECK --interval=1m30s --timeout=3s --retries=3 --start-period=40s --start-interval=5s \ - CMD curl -f http://localhost:8080/ping || exit 1 - -EXPOSE 8080/tcp 8443/tcp - -WORKDIR ${ZABBIX_WWW_ROOT} - -USER 1997 - -ENTRYPOINT ["docker-entrypoint.sh"] diff --git a/Dockerfiles/web-apache-pgsql/alpine/README.md b/Dockerfiles/web-apache-pgsql/alpine/README.md deleted file mode 120000 index 32d46ee8..00000000 --- a/Dockerfiles/web-apache-pgsql/alpine/README.md +++ /dev/null @@ -1 +0,0 @@ -../README.md \ No newline at end of file diff --git a/Dockerfiles/web-apache-pgsql/alpine/build.sh b/Dockerfiles/web-apache-pgsql/alpine/build.sh deleted file mode 120000 index 46b20313..00000000 --- a/Dockerfiles/web-apache-pgsql/alpine/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../../build.sh \ No newline at end of file diff --git a/Dockerfiles/web-apache-pgsql/alpine/conf/etc/apache2/conf.d/mime.conf b/Dockerfiles/web-apache-pgsql/alpine/conf/etc/apache2/conf.d/mime.conf deleted file mode 100644 index 9d0a0a6d..00000000 --- a/Dockerfiles/web-apache-pgsql/alpine/conf/etc/apache2/conf.d/mime.conf +++ /dev/null @@ -1,8 +0,0 @@ - - TypesConfig /etc/apache2/mime.types - AddType application/x-compress .Z - AddType application/x-gzip .gz .tgz - - - MIMEMagicFile /etc/apache2/magic - diff --git a/Dockerfiles/web-apache-pgsql/alpine/conf/etc/apache2/conf.d/server-common.inc b/Dockerfiles/web-apache-pgsql/alpine/conf/etc/apache2/conf.d/server-common.inc deleted file mode 100644 index 6de74def..00000000 --- a/Dockerfiles/web-apache-pgsql/alpine/conf/etc/apache2/conf.d/server-common.inc +++ /dev/null @@ -1,59 +0,0 @@ -RemoteIPInternalProxy ${WEB_REAL_IP_FROM} -RemoteIPHeader ${WEB_REAL_IP_HEADER} - - - Require all granted - SetHandler "proxy:unix:/tmp/php-fpm.sock|fcgi://localhost" - - - - Require all denied - - Require all denied - - - - - - Require all denied - - - - - Require all granted - - - - Require all denied - - - - Options FollowSymLinks - AllowOverride None - Require all granted - - - SetHandler "proxy:unix:/tmp/php-fpm.sock|fcgi://localhost" - - - ExpiresActive On - ExpiresByType image/x-icon "access plus 1 year" - ExpiresByType text/css "access plus 14 days" - ExpiresByType application/javascript "access plus 14 days" - ExpiresByType text/javascript "access plus 14 days" - ExpiresByType image/png "access plus 14 days" - ExpiresByType image/jpeg "access plus 14 days" - ExpiresByType image/gif "access plus 14 days" - ExpiresByType text/plain "access plus 14 days" - ExpiresByType application/xml "access plus 14 days" - - ExpiresByType image/svg+xml "access plus 14 days" - ExpiresByType font/woff "access plus 30 days" - ExpiresByType font/woff2 "access plus 30 days" - ExpiresByType font/ttf "access plus 30 days" - ExpiresByType font/otf "access plus 30 days" - - - Header append Cache-Control "public" - - diff --git a/Dockerfiles/web-apache-pgsql/alpine/conf/etc/apache2/httpd.conf b/Dockerfiles/web-apache-pgsql/alpine/conf/etc/apache2/httpd.conf deleted file mode 100644 index f7033e01..00000000 --- a/Dockerfiles/web-apache-pgsql/alpine/conf/etc/apache2/httpd.conf +++ /dev/null @@ -1,82 +0,0 @@ -ServerRoot /var/www/ -DefaultRuntimeDir ${APACHE_RUN_DIR} -PidFile /tmp/apache2.pid - -ServerName zabbix - -IncludeOptional /etc/apache2/includes.conf - -Timeout 300 -KeepAlive On -MaxKeepAliveRequests 100 -KeepAliveTimeout 5 - - - User ${APACHE_RUN_USER} - Group ${APACHE_RUN_GROUP} - - -HostnameLookups Off - -LogLevel warn - - - SetEnvIf Request_URI "^/(robots\.txt|favicon\.ico|status|ping|apache-status)$" exclude_from_logs - - LogFormat "%v:%p %h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" vhost_combined - - CustomLog ${APACHE_CUSTOM_LOG} vhost_combined env=!exclude_from_logs - - -ErrorLog /proc/self/fd/2 - -LogLevel warn - - - StartServers 2 - MinSpareThreads 25 - MaxSpareThreads 75 - ThreadLimit 64 - ThreadsPerChild 25 - MaxRequestWorkers 150 - MaxConnectionsPerChild 0 - - -# Deny all attempts to access hidden files such as .htaccess, .htpasswd, .DS_Store (Mac). - - Require all denied - - -ServerTokens ${APACHE_SERVER_TOKENS} - -ServerSignature ${APACHE_SERVER_SIGNATURE} - -TraceEnable Off - -AddDefaultCharset UTF-8 - - - RequestReadTimeout handshake=0 header=20-40,MinRate=500 body=20,MinRate=500 - - -SetEnvIfNoCase ^Authorization$ "(.+)" HTTP_AUTHORIZATION=$1 - -AddType application/x-httpd-php .php .php3 .php4 .php5 .phtml -AddType application/x-httpd-php-source .phps - -DirectoryIndex ${HTTP_INDEX_FILE} - -DocumentRoot "${ZABBIX_WWW_ROOT}" - - - - SetHandler server-status - Require local - - - ExtendedStatus On - - - ProxyStatus On - - diff --git a/Dockerfiles/web-apache-pgsql/alpine/conf/etc/apache2/includes.conf b/Dockerfiles/web-apache-pgsql/alpine/conf/etc/apache2/includes.conf deleted file mode 100644 index 1c093db0..00000000 --- a/Dockerfiles/web-apache-pgsql/alpine/conf/etc/apache2/includes.conf +++ /dev/null @@ -1,3 +0,0 @@ -IncludeOptional /etc/apache2/modules.conf - -IncludeOptional /etc/apache2/conf.d/*.conf diff --git a/Dockerfiles/web-apache-pgsql/alpine/conf/etc/apache2/modules.conf b/Dockerfiles/web-apache-pgsql/alpine/conf/etc/apache2/modules.conf deleted file mode 100644 index 89a21169..00000000 --- a/Dockerfiles/web-apache-pgsql/alpine/conf/etc/apache2/modules.conf +++ /dev/null @@ -1,18 +0,0 @@ -LoadModule logio_module modules/mod_logio.so -LoadModule unixd_module modules/mod_unixd.so -LoadModule log_config_module modules/mod_log_config.so -LoadModule auth_basic_module modules/mod_auth_basic.so -LoadModule authz_core_module modules/mod_authz_core.so -LoadModule authz_host_module modules/mod_authz_host.so -LoadModule dir_module modules/mod_dir.so -LoadModule mime_module modules/mod_mime.so -LoadModule mpm_event_module modules/mod_mpm_event.so -LoadModule reqtimeout_module modules/mod_reqtimeout.so -LoadModule setenvif_module modules/mod_setenvif.so -LoadModule status_module modules/mod_status.so - -LoadModule proxy_module modules/mod_proxy.so -LoadModule proxy_fcgi_module modules/mod_proxy_fcgi.so -LoadModule expires_module modules/mod_expires.so -LoadModule headers_module modules/mod_headers.so -LoadModule remoteip_module modules/mod_remoteip.so diff --git a/Dockerfiles/web-apache-pgsql/alpine/conf/etc/php85/php-fpm.conf b/Dockerfiles/web-apache-pgsql/alpine/conf/etc/php85/php-fpm.conf deleted file mode 100644 index 3f077424..00000000 --- a/Dockerfiles/web-apache-pgsql/alpine/conf/etc/php85/php-fpm.conf +++ /dev/null @@ -1,10 +0,0 @@ -include=/etc/php85/php-fpm.d/*.conf - -[global] - -pid = /tmp/php-fpm.pid - -error_log = /dev/fd/2 -log_level = notice - -daemonize = no diff --git a/Dockerfiles/web-apache-pgsql/alpine/conf/etc/php85/php-fpm.d/zabbix.conf b/Dockerfiles/web-apache-pgsql/alpine/conf/etc/php85/php-fpm.d/zabbix.conf deleted file mode 100644 index 66c3c125..00000000 --- a/Dockerfiles/web-apache-pgsql/alpine/conf/etc/php85/php-fpm.d/zabbix.conf +++ /dev/null @@ -1,36 +0,0 @@ -[zabbix] - -; https://www.php.net/manual/en/security.hiding.php -php_value[expose_php] = ${EXPOSE_WEB_SERVER_INFO} - -listen = /tmp/php-fpm.sock - -clear_env = no - -pm = ${PHP_FPM_PM} -pm.max_children = ${PHP_FPM_PM_MAX_CHILDREN} -pm.start_servers = ${PHP_FPM_PM_START_SERVERS} -pm.min_spare_servers = ${PHP_FPM_PM_MIN_SPARE_SERVERS} -pm.max_spare_servers = ${PHP_FPM_PM_MAX_SPARE_SERVERS} -pm.max_requests = ${PHP_FPM_PM_MAX_REQUESTS} - -slowlog = /dev/fd/1 - -php_admin_value[error_log] = /dev/fd/2 -php_admin_flag[log_errors] = on -catch_workers_output = yes - -php_value[session.save_handler] = files -php_value[session.save_path] = /var/lib/php/session - -php_value[max_execution_time] = ${ZBX_MAXEXECUTIONTIME} -php_value[memory_limit] = ${ZBX_MEMORYLIMIT} -php_value[post_max_size] = ${ZBX_POSTMAXSIZE} -php_value[upload_max_filesize] = ${ZBX_UPLOADMAXFILESIZE} -php_value[max_input_time] = ${ZBX_MAXINPUTTIME} -php_value[max_input_vars] = 10000 -php_value[date.timezone] = ${PHP_TZ} - -; PHP-FPM monitoring -pm.status_path = /status -ping.path = /ping diff --git a/Dockerfiles/web-apache-pgsql/alpine/conf/etc/zabbix/apache.conf b/Dockerfiles/web-apache-pgsql/alpine/conf/etc/zabbix/apache.conf deleted file mode 100644 index d76b6f57..00000000 --- a/Dockerfiles/web-apache-pgsql/alpine/conf/etc/zabbix/apache.conf +++ /dev/null @@ -1,5 +0,0 @@ -Listen 8080 - - - Include /etc/apache2/conf.d/server-common.inc - diff --git a/Dockerfiles/web-apache-pgsql/alpine/conf/etc/zabbix/apache_ssl.conf b/Dockerfiles/web-apache-pgsql/alpine/conf/etc/zabbix/apache_ssl.conf deleted file mode 100644 index e7abdc75..00000000 --- a/Dockerfiles/web-apache-pgsql/alpine/conf/etc/zabbix/apache_ssl.conf +++ /dev/null @@ -1,29 +0,0 @@ -LoadModule ssl_module modules/mod_ssl.so -LoadModule socache_shmcb_module modules/mod_socache_shmcb.so - -Listen 8443 https - -SSLRandomSeed startup builtin -SSLRandomSeed startup file:/dev/urandom 512 -SSLRandomSeed connect builtin -SSLRandomSeed connect file:/dev/urandom 512 - -AddType application/x-x509-ca-cert .crt -SSLSessionCache shmcb:${APACHE_RUN_DIR}/ssl_scache(512000) -SSLSessionCacheTimeout 300 - - - SSLEngine on - SSLProtocol -all +TLSv1.2 +TLSv1.3 - SSLCipherSuite ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:DHE-RSA-CHACHA20-POLY1305 - SSLHonorCipherOrder off - SSLSessionTickets off - - SSLCertificateFile /etc/ssl/apache2/ssl.crt - SSLCertificateKeyFile /etc/ssl/apache2/ssl.key - - Protocols h2 http/1.1 - Header always set Strict-Transport-Security "max-age=63072000" - - Include /etc/apache2/conf.d/server-common.inc - diff --git a/Dockerfiles/web-apache-pgsql/centos/.dockerignore b/Dockerfiles/web-apache-pgsql/centos/.dockerignore deleted file mode 100644 index 88a84e55..00000000 --- a/Dockerfiles/web-apache-pgsql/centos/.dockerignore +++ /dev/null @@ -1 +0,0 @@ -build.sh diff --git a/Dockerfiles/web-apache-pgsql/centos/Dockerfile b/Dockerfiles/web-apache-pgsql/centos/Dockerfile deleted file mode 100644 index ed0b7422..00000000 --- a/Dockerfiles/web-apache-pgsql/centos/Dockerfile +++ /dev/null @@ -1,152 +0,0 @@ -# syntax=docker/dockerfile:1.6 -ARG OS_BASE_IMAGE=quay.io/centos/centos:stream10-minimal -ARG MAJOR_VERSION=7.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.12 -ARG BUILD_BASE_IMAGE=zabbix-build-pgsql:centos-${ZBX_VERSION} - -FROM ${BUILD_BASE_IMAGE} AS builder -FROM builder AS clean_builder - -ARG ZBX_VERSION - -RUN set -eux && \ - rm -rf \ - "/tmp/zabbix-${ZBX_VERSION}/ui/tests" \ - "/tmp/zabbix-${ZBX_VERSION}/ui/conf/zabbix.conf.php" \ - "/tmp/zabbix-${ZBX_VERSION}/ui/conf/zabbix.conf.php.example" \ - "/tmp/zabbix-${ZBX_VERSION}/ui/conf/maintenance.inc.php" && \ - find "/tmp/zabbix-${ZBX_VERSION}/ui/locale" -name '*.po' -delete && \ - find "/tmp/zabbix-${ZBX_VERSION}/ui/locale" -name '*.sh' -delete - -FROM ${OS_BASE_IMAGE} - -ARG MAJOR_VERSION -ARG ZBX_VERSION -ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git - -ENV TERM=xterm \ - ZBX_VERSION=${ZBX_VERSION} \ - ZBX_SOURCES=${ZBX_SOURCES} \ - ZABBIX_CONF_DIR=/etc/zabbix \ - ZABBIX_USER_HOME_DIR=/var/lib/zabbix \ - ZABBIX_WWW_ROOT=/usr/share/zabbix - -ENV APACHE_BIN=/usr/sbin/httpd \ - PHP_FPM_BIN=/usr/sbin/php-fpm \ - APACHE_RUN_DIR=/tmp/httpd \ - HTTPD_CONF_FILE=/etc/httpd/conf/httpd.conf \ - APACHE_SITES_DIR=/etc/httpd/conf.d \ - PHP_FPM_CONFIG=/etc/php-fpm.conf \ - PHP_ZBX_CONFIG_FILE=/etc/php-fpm.d/zabbix.conf - -LABEL org.opencontainers.image.authors="Alexey Pustovalov " \ - org.opencontainers.image.description="Zabbix web-interface based on Apache2 web server with PostgreSQL database support" \ - org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ - org.opencontainers.image.licenses="AGPL v3.0" \ - org.opencontainers.image.source="${ZBX_SOURCES}" \ - org.opencontainers.image.title="Zabbix web-interface (Apache, PostgreSQL)" \ - org.opencontainers.image.url="https://zabbix.com/" \ - org.opencontainers.image.vendor="Zabbix SIA" \ - org.opencontainers.image.version="${ZBX_VERSION}" - -STOPSIGNAL SIGTERM - -COPY --from=clean_builder /tmp/zabbix-${ZBX_VERSION}/ui ${ZABBIX_WWW_ROOT}/ -COPY --from=clean_builder /tmp/zabbix-${ZBX_VERSION}-output/web/conf ${ZABBIX_CONF_DIR}/web/ -COPY conf/etc/ /etc/ - -RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ - --mount=type=tmpfs,target=/var/cache/yum/ \ - set -eux && \ - INSTALL_PKGS="bash \ - curl-minimal \ - findutils \ - glibc-locale-source \ - gzip \ - jq \ - shadow-utils \ - httpd \ - php \ - php-fpm \ - mod_ssl \ - php-bcmath \ - php-curl \ - php-gd \ - php-json \ - php-ldap \ - php-mbstring \ - php-pgsql \ - php-xml \ - postgresql18" && \ - microdnf -y install \ - --disablerepo="*" \ - --enablerepo="baseos" \ - --enablerepo="appstream" \ - --setopt=install_weak_deps=0 \ - --setopt=keepcache=0 \ - --best \ - --nodocs \ - ${INSTALL_PKGS} && \ - groupadd \ - --system \ - --gid 1995 \ - zabbix && \ - useradd \ - --system \ - --comment "Zabbix monitoring system" \ - -g zabbix \ - --uid 1997 \ - --shell /sbin/nologin \ - --home-dir ${ZABBIX_USER_HOME_DIR} \ - zabbix && \ - mkdir -p ${ZABBIX_CONF_DIR} \ - ${ZABBIX_CONF_DIR}/web \ - ${ZABBIX_CONF_DIR}/web/certs \ - ${ZABBIX_USER_HOME_DIR}/enc \ - ${ZABBIX_USER_HOME_DIR}/enc_internal \ - /var/lib/php/session && \ - rm -rf /etc/httpd/conf.d/default.conf \ - /etc/httpd/conf.d/ssl.conf \ - /etc/httpd/conf.d/autoindex.conf \ - /etc/httpd/conf.d/php.conf \ - /etc/httpd/conf.d/userdir.conf \ - /etc/httpd/conf.d/welcome.conf \ - /etc/php-fpm.d/www.conf && \ - ln -sf "${ZABBIX_CONF_DIR}/web/zabbix.conf.php" "${ZABBIX_WWW_ROOT}/conf/zabbix.conf.php" && \ - ln -sf "${ZABBIX_CONF_DIR}/web/maintenance.inc.php" "${ZABBIX_WWW_ROOT}/conf/maintenance.inc.php" && \ - awk "/display/ && /true/ {gsub(/^[ \t]+|[ \t]+$/, \"\", \$0); print \$0}" "${ZABBIX_WWW_ROOT}/include/locales.inc.php" | \ - cut -d"'" -f 2 | sort -u | \ - xargs -r -I '{}' bash -c 'echo "{}" && localedef -c -i {} -f UTF-8 {}.UTF-8 2>/dev/null' && \ - FIX_PERM_LIST="\ - ${ZABBIX_CONF_DIR}/ \ - ${ZABBIX_WWW_ROOT}/include/defines.inc.php \ - ${ZABBIX_WWW_ROOT}/modules/ \ - ${ZABBIX_USER_HOME_DIR}/ \ - /etc/httpd/ \ - /etc/php-fpm.d/ \ - /etc/php-fpm.conf \ - /run/httpd/ \ - /var/lib/php/session/" && \ - chown --quiet -R zabbix:0 ${FIX_PERM_LIST} && \ - chmod -R g=u ${FIX_PERM_LIST} && \ - microdnf -y remove \ - findutils \ - glibc-locale-source \ - gzip - -RUN --mount=from=entrypoints,target=/tmp/entrypoints,ro \ - set -eux && \ - install -d /usr/lib/docker-entrypoint && \ - install -m 0755 /tmp/entrypoints/web-apache-pgsql.sh /usr/bin/docker-entrypoint.sh && \ - install -m 0644 /tmp/entrypoints/lib/*.sh /usr/lib/docker-entrypoint/ - -HEALTHCHECK --interval=1m30s --timeout=3s --retries=3 --start-period=40s --start-interval=5s \ - CMD curl -f http://localhost:8080/ping || exit 1 - -EXPOSE 8080/tcp 8443/tcp - -WORKDIR ${ZABBIX_WWW_ROOT} - -USER 1997 - -ENTRYPOINT ["docker-entrypoint.sh"] diff --git a/Dockerfiles/web-apache-pgsql/centos/README.md b/Dockerfiles/web-apache-pgsql/centos/README.md deleted file mode 120000 index 32d46ee8..00000000 --- a/Dockerfiles/web-apache-pgsql/centos/README.md +++ /dev/null @@ -1 +0,0 @@ -../README.md \ No newline at end of file diff --git a/Dockerfiles/web-apache-pgsql/centos/build.sh b/Dockerfiles/web-apache-pgsql/centos/build.sh deleted file mode 120000 index 46b20313..00000000 --- a/Dockerfiles/web-apache-pgsql/centos/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../../build.sh \ No newline at end of file diff --git a/Dockerfiles/web-apache-pgsql/centos/conf/etc/httpd/conf.d/mime.conf b/Dockerfiles/web-apache-pgsql/centos/conf/etc/httpd/conf.d/mime.conf deleted file mode 100644 index 6dd43b1c..00000000 --- a/Dockerfiles/web-apache-pgsql/centos/conf/etc/httpd/conf.d/mime.conf +++ /dev/null @@ -1,9 +0,0 @@ - - TypesConfig /etc/mime.types - - AddType application/x-compress .Z - AddType application/x-gzip .gz .tgz - - - MIMEMagicFile conf/magic - diff --git a/Dockerfiles/web-apache-pgsql/centos/conf/etc/httpd/conf.d/server-common.inc b/Dockerfiles/web-apache-pgsql/centos/conf/etc/httpd/conf.d/server-common.inc deleted file mode 100644 index 6de74def..00000000 --- a/Dockerfiles/web-apache-pgsql/centos/conf/etc/httpd/conf.d/server-common.inc +++ /dev/null @@ -1,59 +0,0 @@ -RemoteIPInternalProxy ${WEB_REAL_IP_FROM} -RemoteIPHeader ${WEB_REAL_IP_HEADER} - - - Require all granted - SetHandler "proxy:unix:/tmp/php-fpm.sock|fcgi://localhost" - - - - Require all denied - - Require all denied - - - - - - Require all denied - - - - - Require all granted - - - - Require all denied - - - - Options FollowSymLinks - AllowOverride None - Require all granted - - - SetHandler "proxy:unix:/tmp/php-fpm.sock|fcgi://localhost" - - - ExpiresActive On - ExpiresByType image/x-icon "access plus 1 year" - ExpiresByType text/css "access plus 14 days" - ExpiresByType application/javascript "access plus 14 days" - ExpiresByType text/javascript "access plus 14 days" - ExpiresByType image/png "access plus 14 days" - ExpiresByType image/jpeg "access plus 14 days" - ExpiresByType image/gif "access plus 14 days" - ExpiresByType text/plain "access plus 14 days" - ExpiresByType application/xml "access plus 14 days" - - ExpiresByType image/svg+xml "access plus 14 days" - ExpiresByType font/woff "access plus 30 days" - ExpiresByType font/woff2 "access plus 30 days" - ExpiresByType font/ttf "access plus 30 days" - ExpiresByType font/otf "access plus 30 days" - - - Header append Cache-Control "public" - - diff --git a/Dockerfiles/web-apache-pgsql/centos/conf/etc/httpd/conf/httpd.conf b/Dockerfiles/web-apache-pgsql/centos/conf/etc/httpd/conf/httpd.conf deleted file mode 100644 index a1007af9..00000000 --- a/Dockerfiles/web-apache-pgsql/centos/conf/etc/httpd/conf/httpd.conf +++ /dev/null @@ -1,82 +0,0 @@ -ServerRoot /etc/httpd/ -DefaultRuntimeDir ${APACHE_RUN_DIR} -PidFile /tmp/httpd.pid - -ServerName zabbix - -IncludeOptional /etc/httpd/includes.conf - -Timeout 300 -KeepAlive On -MaxKeepAliveRequests 100 -KeepAliveTimeout 5 - - - User ${APACHE_RUN_USER} - Group ${APACHE_RUN_GROUP} - - -HostnameLookups Off - -LogLevel warn - - - SetEnvIf Request_URI "^/(robots\.txt|favicon\.ico|status|ping|apache-status)$" exclude_from_logs - - LogFormat "%v:%p %h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" vhost_combined - - CustomLog ${APACHE_CUSTOM_LOG} vhost_combined env=!exclude_from_logs - - -ErrorLog /proc/self/fd/2 - -LogLevel warn - - - StartServers 2 - MinSpareThreads 25 - MaxSpareThreads 75 - ThreadLimit 64 - ThreadsPerChild 25 - MaxRequestWorkers 150 - MaxConnectionsPerChild 0 - - -# Deny all attempts to access hidden files such as .htaccess, .htpasswd, .DS_Store (Mac). - - Require all denied - - -ServerTokens ${APACHE_SERVER_TOKENS} - -ServerSignature ${APACHE_SERVER_SIGNATURE} - -TraceEnable Off - -AddDefaultCharset UTF-8 - - - RequestReadTimeout handshake=0 header=20-40,MinRate=500 body=20,MinRate=500 - - -SetEnvIfNoCase ^Authorization$ "(.+)" HTTP_AUTHORIZATION=$1 - -AddType application/x-httpd-php .php .php3 .php4 .php5 .phtml -AddType application/x-httpd-php-source .phps - -DirectoryIndex ${HTTP_INDEX_FILE} - -DocumentRoot "${ZABBIX_WWW_ROOT}" - - - - SetHandler server-status - Require local - - - ExtendedStatus On - - - ProxyStatus On - - diff --git a/Dockerfiles/web-apache-pgsql/centos/conf/etc/httpd/includes.conf b/Dockerfiles/web-apache-pgsql/centos/conf/etc/httpd/includes.conf deleted file mode 100644 index f7ee6da9..00000000 --- a/Dockerfiles/web-apache-pgsql/centos/conf/etc/httpd/includes.conf +++ /dev/null @@ -1,3 +0,0 @@ -IncludeOptional /etc/httpd/modules.conf - -IncludeOptional /etc/httpd/conf.d/*.conf diff --git a/Dockerfiles/web-apache-pgsql/centos/conf/etc/httpd/modules.conf b/Dockerfiles/web-apache-pgsql/centos/conf/etc/httpd/modules.conf deleted file mode 100644 index 89a21169..00000000 --- a/Dockerfiles/web-apache-pgsql/centos/conf/etc/httpd/modules.conf +++ /dev/null @@ -1,18 +0,0 @@ -LoadModule logio_module modules/mod_logio.so -LoadModule unixd_module modules/mod_unixd.so -LoadModule log_config_module modules/mod_log_config.so -LoadModule auth_basic_module modules/mod_auth_basic.so -LoadModule authz_core_module modules/mod_authz_core.so -LoadModule authz_host_module modules/mod_authz_host.so -LoadModule dir_module modules/mod_dir.so -LoadModule mime_module modules/mod_mime.so -LoadModule mpm_event_module modules/mod_mpm_event.so -LoadModule reqtimeout_module modules/mod_reqtimeout.so -LoadModule setenvif_module modules/mod_setenvif.so -LoadModule status_module modules/mod_status.so - -LoadModule proxy_module modules/mod_proxy.so -LoadModule proxy_fcgi_module modules/mod_proxy_fcgi.so -LoadModule expires_module modules/mod_expires.so -LoadModule headers_module modules/mod_headers.so -LoadModule remoteip_module modules/mod_remoteip.so diff --git a/Dockerfiles/web-apache-pgsql/centos/conf/etc/php-fpm.conf b/Dockerfiles/web-apache-pgsql/centos/conf/etc/php-fpm.conf deleted file mode 100644 index ce022534..00000000 --- a/Dockerfiles/web-apache-pgsql/centos/conf/etc/php-fpm.conf +++ /dev/null @@ -1,9 +0,0 @@ -include=/etc/php-fpm.d/*.conf - -[global] - -pid = /tmp/php-fpm.pid - -error_log = /dev/fd/2 - -daemonize = no diff --git a/Dockerfiles/web-apache-pgsql/centos/conf/etc/php-fpm.d/zabbix.conf b/Dockerfiles/web-apache-pgsql/centos/conf/etc/php-fpm.d/zabbix.conf deleted file mode 100644 index 66c3c125..00000000 --- a/Dockerfiles/web-apache-pgsql/centos/conf/etc/php-fpm.d/zabbix.conf +++ /dev/null @@ -1,36 +0,0 @@ -[zabbix] - -; https://www.php.net/manual/en/security.hiding.php -php_value[expose_php] = ${EXPOSE_WEB_SERVER_INFO} - -listen = /tmp/php-fpm.sock - -clear_env = no - -pm = ${PHP_FPM_PM} -pm.max_children = ${PHP_FPM_PM_MAX_CHILDREN} -pm.start_servers = ${PHP_FPM_PM_START_SERVERS} -pm.min_spare_servers = ${PHP_FPM_PM_MIN_SPARE_SERVERS} -pm.max_spare_servers = ${PHP_FPM_PM_MAX_SPARE_SERVERS} -pm.max_requests = ${PHP_FPM_PM_MAX_REQUESTS} - -slowlog = /dev/fd/1 - -php_admin_value[error_log] = /dev/fd/2 -php_admin_flag[log_errors] = on -catch_workers_output = yes - -php_value[session.save_handler] = files -php_value[session.save_path] = /var/lib/php/session - -php_value[max_execution_time] = ${ZBX_MAXEXECUTIONTIME} -php_value[memory_limit] = ${ZBX_MEMORYLIMIT} -php_value[post_max_size] = ${ZBX_POSTMAXSIZE} -php_value[upload_max_filesize] = ${ZBX_UPLOADMAXFILESIZE} -php_value[max_input_time] = ${ZBX_MAXINPUTTIME} -php_value[max_input_vars] = 10000 -php_value[date.timezone] = ${PHP_TZ} - -; PHP-FPM monitoring -pm.status_path = /status -ping.path = /ping diff --git a/Dockerfiles/web-apache-pgsql/centos/conf/etc/zabbix/apache.conf b/Dockerfiles/web-apache-pgsql/centos/conf/etc/zabbix/apache.conf deleted file mode 100644 index e6af6afc..00000000 --- a/Dockerfiles/web-apache-pgsql/centos/conf/etc/zabbix/apache.conf +++ /dev/null @@ -1,5 +0,0 @@ -Listen 8080 - - - Include /etc/httpd/conf.d/server-common.inc - diff --git a/Dockerfiles/web-apache-pgsql/centos/conf/etc/zabbix/apache_ssl.conf b/Dockerfiles/web-apache-pgsql/centos/conf/etc/zabbix/apache_ssl.conf deleted file mode 100644 index 8621aed5..00000000 --- a/Dockerfiles/web-apache-pgsql/centos/conf/etc/zabbix/apache_ssl.conf +++ /dev/null @@ -1,29 +0,0 @@ -LoadModule ssl_module modules/mod_ssl.so -LoadModule socache_shmcb_module modules/mod_socache_shmcb.so - -Listen 8443 https - -SSLRandomSeed startup builtin -SSLRandomSeed startup file:/dev/urandom 512 -SSLRandomSeed connect builtin -SSLRandomSeed connect file:/dev/urandom 512 - -AddType application/x-x509-ca-cert .crt -SSLSessionCache shmcb:${APACHE_RUN_DIR}/ssl_scache(512000) -SSLSessionCacheTimeout 300 - - - SSLEngine on - SSLProtocol -all +TLSv1.2 +TLSv1.3 - SSLCipherSuite ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:DHE-RSA-CHACHA20-POLY1305 - SSLHonorCipherOrder off - SSLSessionTickets off - - SSLCertificateFile /etc/ssl/apache2/ssl.crt - SSLCertificateKeyFile /etc/ssl/apache2/ssl.key - - Protocols h2 http/1.1 - Header always set Strict-Transport-Security "max-age=63072000" - - Include /etc/httpd/conf.d/server-common.inc - diff --git a/Dockerfiles/web-apache-pgsql/ol/.dockerignore b/Dockerfiles/web-apache-pgsql/ol/.dockerignore deleted file mode 100644 index 88a84e55..00000000 --- a/Dockerfiles/web-apache-pgsql/ol/.dockerignore +++ /dev/null @@ -1 +0,0 @@ -build.sh diff --git a/Dockerfiles/web-apache-pgsql/ol/Dockerfile b/Dockerfiles/web-apache-pgsql/ol/Dockerfile deleted file mode 100644 index 9a3fd6df..00000000 --- a/Dockerfiles/web-apache-pgsql/ol/Dockerfile +++ /dev/null @@ -1,151 +0,0 @@ -# syntax=docker/dockerfile:1.6 -ARG OS_BASE_IMAGE=container-registry.oracle.com/os/oraclelinux:10-slim -ARG MAJOR_VERSION=7.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.12 -ARG BUILD_BASE_IMAGE=zabbix-build-pgsql:ol-${ZBX_VERSION} - -FROM ${BUILD_BASE_IMAGE} AS builder -FROM builder AS clean_builder - -ARG ZBX_VERSION - -RUN set -eux && \ - rm -rf \ - "/tmp/zabbix-${ZBX_VERSION}/ui/tests" \ - "/tmp/zabbix-${ZBX_VERSION}/ui/conf/zabbix.conf.php" \ - "/tmp/zabbix-${ZBX_VERSION}/ui/conf/zabbix.conf.php.example" \ - "/tmp/zabbix-${ZBX_VERSION}/ui/conf/maintenance.inc.php" && \ - find "/tmp/zabbix-${ZBX_VERSION}/ui/locale" -name '*.po' -delete && \ - find "/tmp/zabbix-${ZBX_VERSION}/ui/locale" -name '*.sh' -delete - -FROM ${OS_BASE_IMAGE} - -ARG MAJOR_VERSION -ARG ZBX_VERSION -ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git - -ENV TERM=xterm \ - ZBX_VERSION=${ZBX_VERSION} \ - ZBX_SOURCES=${ZBX_SOURCES} \ - ZABBIX_CONF_DIR=/etc/zabbix \ - ZABBIX_USER_HOME_DIR=/var/lib/zabbix \ - ZABBIX_WWW_ROOT=/usr/share/zabbix - -ENV APACHE_BIN=/usr/sbin/httpd \ - PHP_FPM_BIN=/usr/sbin/php-fpm \ - APACHE_RUN_DIR=/tmp/httpd \ - HTTPD_CONF_FILE=/etc/httpd/conf/httpd.conf \ - APACHE_SITES_DIR=/etc/httpd/conf.d \ - PHP_FPM_CONFIG=/etc/php-fpm.conf \ - PHP_ZBX_CONFIG_FILE=/etc/php-fpm.d/zabbix.conf - -LABEL org.opencontainers.image.authors="Alexey Pustovalov " \ - org.opencontainers.image.description="Zabbix web-interface based on Apache2 web server with PostgreSQL database support" \ - org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ - org.opencontainers.image.licenses="AGPL v3.0" \ - org.opencontainers.image.source="${ZBX_SOURCES}" \ - org.opencontainers.image.title="Zabbix web-interface (Apache, PostgreSQL)" \ - org.opencontainers.image.url="https://zabbix.com/" \ - org.opencontainers.image.vendor="Zabbix SIA" \ - org.opencontainers.image.version="${ZBX_VERSION}" - -STOPSIGNAL SIGTERM - -COPY --from=clean_builder /tmp/zabbix-${ZBX_VERSION}/ui ${ZABBIX_WWW_ROOT}/ -COPY --from=clean_builder /tmp/zabbix-${ZBX_VERSION}-output/web/conf ${ZABBIX_CONF_DIR}/web/ -COPY conf/etc/ /etc/ - -RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ - --mount=type=tmpfs,target=/var/cache/yum/ \ - set -eux && \ - INSTALL_PKGS="bash \ - curl \ - findutils \ - glibc-locale-source \ - gzip \ - jq \ - httpd \ - php \ - php-fpm \ - mod_ssl \ - php-bcmath \ - php-curl \ - php-gd \ - php-json \ - php-ldap \ - php-mbstring \ - php-pgsql \ - php-xml \ - postgresql" && \ - microdnf -y install \ - --disablerepo="*" \ - --enablerepo="ol10_baseos_latest" \ - --enablerepo="ol10_appstream" \ - --setopt=install_weak_deps=0 \ - --setopt=keepcache=0 \ - --best \ - --nodocs \ - ${INSTALL_PKGS} && \ - groupadd \ - --system \ - --gid 1995 \ - zabbix && \ - useradd \ - --system \ - --comment "Zabbix monitoring system" \ - -g zabbix \ - --uid 1997 \ - --shell /sbin/nologin \ - --home-dir ${ZABBIX_USER_HOME_DIR}/ \ - zabbix && \ - mkdir -p ${ZABBIX_CONF_DIR} \ - ${ZABBIX_CONF_DIR}/web \ - ${ZABBIX_CONF_DIR}/web/certs \ - ${ZABBIX_USER_HOME_DIR}/enc \ - ${ZABBIX_USER_HOME_DIR}/enc_internal \ - /var/lib/php/session && \ - rm -rf /etc/httpd/conf.d/default.conf \ - /etc/httpd/conf.d/ssl.conf \ - /etc/httpd/conf.d/autoindex.conf \ - /etc/httpd/conf.d/php.conf \ - /etc/httpd/conf.d/userdir.conf \ - /etc/httpd/conf.d/welcome.conf \ - /etc/php-fpm.d/www.conf && \ - ln -sf "${ZABBIX_CONF_DIR}/web/zabbix.conf.php" "${ZABBIX_WWW_ROOT}/conf/zabbix.conf.php" && \ - ln -sf "${ZABBIX_CONF_DIR}/web/maintenance.inc.php" "${ZABBIX_WWW_ROOT}/conf/maintenance.inc.php" && \ - awk "/display/ && /true/ {gsub(/^[ \t]+|[ \t]+$/, \"\", \$0); print \$0}" "${ZABBIX_WWW_ROOT}/include/locales.inc.php" | \ - cut -d"'" -f 2 | sort -u | \ - xargs -r -I '{}' bash -c 'echo "{}" && localedef -c -i {} -f UTF-8 {}.UTF-8 2>/dev/null' && \ - FIX_PERM_LIST="\ - ${ZABBIX_CONF_DIR}/ \ - ${ZABBIX_WWW_ROOT}/include/defines.inc.php \ - ${ZABBIX_WWW_ROOT}/modules/ \ - ${ZABBIX_USER_HOME_DIR}/ \ - /etc/httpd/ \ - /etc/php-fpm.d/ \ - /etc/php-fpm.conf \ - /run/httpd/ \ - /var/lib/php/session/" && \ - chown --quiet -R zabbix:0 ${FIX_PERM_LIST} && \ - chmod -R g=u ${FIX_PERM_LIST} && \ - microdnf -y remove \ - findutils \ - glibc-locale-source \ - gzip - -RUN --mount=from=entrypoints,target=/tmp/entrypoints,ro \ - set -eux && \ - install -d /usr/lib/docker-entrypoint && \ - install -m 0755 /tmp/entrypoints/web-apache-pgsql.sh /usr/bin/docker-entrypoint.sh && \ - install -m 0644 /tmp/entrypoints/lib/*.sh /usr/lib/docker-entrypoint/ - -HEALTHCHECK --interval=1m30s --timeout=3s --retries=3 --start-period=40s --start-interval=5s \ - CMD curl -f http://localhost:8080/ping || exit 1 - -EXPOSE 8080/tcp 8443/tcp - -WORKDIR ${ZABBIX_WWW_ROOT} - -USER 1997 - -ENTRYPOINT ["docker-entrypoint.sh"] diff --git a/Dockerfiles/web-apache-pgsql/ol/README.md b/Dockerfiles/web-apache-pgsql/ol/README.md deleted file mode 120000 index 32d46ee8..00000000 --- a/Dockerfiles/web-apache-pgsql/ol/README.md +++ /dev/null @@ -1 +0,0 @@ -../README.md \ No newline at end of file diff --git a/Dockerfiles/web-apache-pgsql/ol/build.sh b/Dockerfiles/web-apache-pgsql/ol/build.sh deleted file mode 120000 index 46b20313..00000000 --- a/Dockerfiles/web-apache-pgsql/ol/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../../build.sh \ No newline at end of file diff --git a/Dockerfiles/web-apache-pgsql/ol/conf/etc/httpd/conf.d/mime.conf b/Dockerfiles/web-apache-pgsql/ol/conf/etc/httpd/conf.d/mime.conf deleted file mode 100644 index 6dd43b1c..00000000 --- a/Dockerfiles/web-apache-pgsql/ol/conf/etc/httpd/conf.d/mime.conf +++ /dev/null @@ -1,9 +0,0 @@ - - TypesConfig /etc/mime.types - - AddType application/x-compress .Z - AddType application/x-gzip .gz .tgz - - - MIMEMagicFile conf/magic - diff --git a/Dockerfiles/web-apache-pgsql/ol/conf/etc/httpd/conf.d/server-common.inc b/Dockerfiles/web-apache-pgsql/ol/conf/etc/httpd/conf.d/server-common.inc deleted file mode 100644 index 6de74def..00000000 --- a/Dockerfiles/web-apache-pgsql/ol/conf/etc/httpd/conf.d/server-common.inc +++ /dev/null @@ -1,59 +0,0 @@ -RemoteIPInternalProxy ${WEB_REAL_IP_FROM} -RemoteIPHeader ${WEB_REAL_IP_HEADER} - - - Require all granted - SetHandler "proxy:unix:/tmp/php-fpm.sock|fcgi://localhost" - - - - Require all denied - - Require all denied - - - - - - Require all denied - - - - - Require all granted - - - - Require all denied - - - - Options FollowSymLinks - AllowOverride None - Require all granted - - - SetHandler "proxy:unix:/tmp/php-fpm.sock|fcgi://localhost" - - - ExpiresActive On - ExpiresByType image/x-icon "access plus 1 year" - ExpiresByType text/css "access plus 14 days" - ExpiresByType application/javascript "access plus 14 days" - ExpiresByType text/javascript "access plus 14 days" - ExpiresByType image/png "access plus 14 days" - ExpiresByType image/jpeg "access plus 14 days" - ExpiresByType image/gif "access plus 14 days" - ExpiresByType text/plain "access plus 14 days" - ExpiresByType application/xml "access plus 14 days" - - ExpiresByType image/svg+xml "access plus 14 days" - ExpiresByType font/woff "access plus 30 days" - ExpiresByType font/woff2 "access plus 30 days" - ExpiresByType font/ttf "access plus 30 days" - ExpiresByType font/otf "access plus 30 days" - - - Header append Cache-Control "public" - - diff --git a/Dockerfiles/web-apache-pgsql/ol/conf/etc/httpd/conf/httpd.conf b/Dockerfiles/web-apache-pgsql/ol/conf/etc/httpd/conf/httpd.conf deleted file mode 100644 index a1007af9..00000000 --- a/Dockerfiles/web-apache-pgsql/ol/conf/etc/httpd/conf/httpd.conf +++ /dev/null @@ -1,82 +0,0 @@ -ServerRoot /etc/httpd/ -DefaultRuntimeDir ${APACHE_RUN_DIR} -PidFile /tmp/httpd.pid - -ServerName zabbix - -IncludeOptional /etc/httpd/includes.conf - -Timeout 300 -KeepAlive On -MaxKeepAliveRequests 100 -KeepAliveTimeout 5 - - - User ${APACHE_RUN_USER} - Group ${APACHE_RUN_GROUP} - - -HostnameLookups Off - -LogLevel warn - - - SetEnvIf Request_URI "^/(robots\.txt|favicon\.ico|status|ping|apache-status)$" exclude_from_logs - - LogFormat "%v:%p %h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" vhost_combined - - CustomLog ${APACHE_CUSTOM_LOG} vhost_combined env=!exclude_from_logs - - -ErrorLog /proc/self/fd/2 - -LogLevel warn - - - StartServers 2 - MinSpareThreads 25 - MaxSpareThreads 75 - ThreadLimit 64 - ThreadsPerChild 25 - MaxRequestWorkers 150 - MaxConnectionsPerChild 0 - - -# Deny all attempts to access hidden files such as .htaccess, .htpasswd, .DS_Store (Mac). - - Require all denied - - -ServerTokens ${APACHE_SERVER_TOKENS} - -ServerSignature ${APACHE_SERVER_SIGNATURE} - -TraceEnable Off - -AddDefaultCharset UTF-8 - - - RequestReadTimeout handshake=0 header=20-40,MinRate=500 body=20,MinRate=500 - - -SetEnvIfNoCase ^Authorization$ "(.+)" HTTP_AUTHORIZATION=$1 - -AddType application/x-httpd-php .php .php3 .php4 .php5 .phtml -AddType application/x-httpd-php-source .phps - -DirectoryIndex ${HTTP_INDEX_FILE} - -DocumentRoot "${ZABBIX_WWW_ROOT}" - - - - SetHandler server-status - Require local - - - ExtendedStatus On - - - ProxyStatus On - - diff --git a/Dockerfiles/web-apache-pgsql/ol/conf/etc/httpd/includes.conf b/Dockerfiles/web-apache-pgsql/ol/conf/etc/httpd/includes.conf deleted file mode 100644 index f7ee6da9..00000000 --- a/Dockerfiles/web-apache-pgsql/ol/conf/etc/httpd/includes.conf +++ /dev/null @@ -1,3 +0,0 @@ -IncludeOptional /etc/httpd/modules.conf - -IncludeOptional /etc/httpd/conf.d/*.conf diff --git a/Dockerfiles/web-apache-pgsql/ol/conf/etc/httpd/modules.conf b/Dockerfiles/web-apache-pgsql/ol/conf/etc/httpd/modules.conf deleted file mode 100644 index 89a21169..00000000 --- a/Dockerfiles/web-apache-pgsql/ol/conf/etc/httpd/modules.conf +++ /dev/null @@ -1,18 +0,0 @@ -LoadModule logio_module modules/mod_logio.so -LoadModule unixd_module modules/mod_unixd.so -LoadModule log_config_module modules/mod_log_config.so -LoadModule auth_basic_module modules/mod_auth_basic.so -LoadModule authz_core_module modules/mod_authz_core.so -LoadModule authz_host_module modules/mod_authz_host.so -LoadModule dir_module modules/mod_dir.so -LoadModule mime_module modules/mod_mime.so -LoadModule mpm_event_module modules/mod_mpm_event.so -LoadModule reqtimeout_module modules/mod_reqtimeout.so -LoadModule setenvif_module modules/mod_setenvif.so -LoadModule status_module modules/mod_status.so - -LoadModule proxy_module modules/mod_proxy.so -LoadModule proxy_fcgi_module modules/mod_proxy_fcgi.so -LoadModule expires_module modules/mod_expires.so -LoadModule headers_module modules/mod_headers.so -LoadModule remoteip_module modules/mod_remoteip.so diff --git a/Dockerfiles/web-apache-pgsql/ol/conf/etc/php-fpm.conf b/Dockerfiles/web-apache-pgsql/ol/conf/etc/php-fpm.conf deleted file mode 100644 index ce022534..00000000 --- a/Dockerfiles/web-apache-pgsql/ol/conf/etc/php-fpm.conf +++ /dev/null @@ -1,9 +0,0 @@ -include=/etc/php-fpm.d/*.conf - -[global] - -pid = /tmp/php-fpm.pid - -error_log = /dev/fd/2 - -daemonize = no diff --git a/Dockerfiles/web-apache-pgsql/ol/conf/etc/php-fpm.d/zabbix.conf b/Dockerfiles/web-apache-pgsql/ol/conf/etc/php-fpm.d/zabbix.conf deleted file mode 100644 index 66c3c125..00000000 --- a/Dockerfiles/web-apache-pgsql/ol/conf/etc/php-fpm.d/zabbix.conf +++ /dev/null @@ -1,36 +0,0 @@ -[zabbix] - -; https://www.php.net/manual/en/security.hiding.php -php_value[expose_php] = ${EXPOSE_WEB_SERVER_INFO} - -listen = /tmp/php-fpm.sock - -clear_env = no - -pm = ${PHP_FPM_PM} -pm.max_children = ${PHP_FPM_PM_MAX_CHILDREN} -pm.start_servers = ${PHP_FPM_PM_START_SERVERS} -pm.min_spare_servers = ${PHP_FPM_PM_MIN_SPARE_SERVERS} -pm.max_spare_servers = ${PHP_FPM_PM_MAX_SPARE_SERVERS} -pm.max_requests = ${PHP_FPM_PM_MAX_REQUESTS} - -slowlog = /dev/fd/1 - -php_admin_value[error_log] = /dev/fd/2 -php_admin_flag[log_errors] = on -catch_workers_output = yes - -php_value[session.save_handler] = files -php_value[session.save_path] = /var/lib/php/session - -php_value[max_execution_time] = ${ZBX_MAXEXECUTIONTIME} -php_value[memory_limit] = ${ZBX_MEMORYLIMIT} -php_value[post_max_size] = ${ZBX_POSTMAXSIZE} -php_value[upload_max_filesize] = ${ZBX_UPLOADMAXFILESIZE} -php_value[max_input_time] = ${ZBX_MAXINPUTTIME} -php_value[max_input_vars] = 10000 -php_value[date.timezone] = ${PHP_TZ} - -; PHP-FPM monitoring -pm.status_path = /status -ping.path = /ping diff --git a/Dockerfiles/web-apache-pgsql/ol/conf/etc/zabbix/apache.conf b/Dockerfiles/web-apache-pgsql/ol/conf/etc/zabbix/apache.conf deleted file mode 100644 index e6af6afc..00000000 --- a/Dockerfiles/web-apache-pgsql/ol/conf/etc/zabbix/apache.conf +++ /dev/null @@ -1,5 +0,0 @@ -Listen 8080 - - - Include /etc/httpd/conf.d/server-common.inc - diff --git a/Dockerfiles/web-apache-pgsql/ol/conf/etc/zabbix/apache_ssl.conf b/Dockerfiles/web-apache-pgsql/ol/conf/etc/zabbix/apache_ssl.conf deleted file mode 100644 index 8621aed5..00000000 --- a/Dockerfiles/web-apache-pgsql/ol/conf/etc/zabbix/apache_ssl.conf +++ /dev/null @@ -1,29 +0,0 @@ -LoadModule ssl_module modules/mod_ssl.so -LoadModule socache_shmcb_module modules/mod_socache_shmcb.so - -Listen 8443 https - -SSLRandomSeed startup builtin -SSLRandomSeed startup file:/dev/urandom 512 -SSLRandomSeed connect builtin -SSLRandomSeed connect file:/dev/urandom 512 - -AddType application/x-x509-ca-cert .crt -SSLSessionCache shmcb:${APACHE_RUN_DIR}/ssl_scache(512000) -SSLSessionCacheTimeout 300 - - - SSLEngine on - SSLProtocol -all +TLSv1.2 +TLSv1.3 - SSLCipherSuite ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:DHE-RSA-CHACHA20-POLY1305 - SSLHonorCipherOrder off - SSLSessionTickets off - - SSLCertificateFile /etc/ssl/apache2/ssl.crt - SSLCertificateKeyFile /etc/ssl/apache2/ssl.key - - Protocols h2 http/1.1 - Header always set Strict-Transport-Security "max-age=63072000" - - Include /etc/httpd/conf.d/server-common.inc - diff --git a/Dockerfiles/web-apache-pgsql/ubuntu/.dockerignore b/Dockerfiles/web-apache-pgsql/ubuntu/.dockerignore deleted file mode 100644 index 88a84e55..00000000 --- a/Dockerfiles/web-apache-pgsql/ubuntu/.dockerignore +++ /dev/null @@ -1 +0,0 @@ -build.sh diff --git a/Dockerfiles/web-apache-pgsql/ubuntu/Dockerfile b/Dockerfiles/web-apache-pgsql/ubuntu/Dockerfile deleted file mode 100644 index 7e4dd502..00000000 --- a/Dockerfiles/web-apache-pgsql/ubuntu/Dockerfile +++ /dev/null @@ -1,146 +0,0 @@ -# syntax=docker/dockerfile:1.6 -ARG OS_BASE_IMAGE=ubuntu:resolute -ARG MAJOR_VERSION=7.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.12 -ARG BUILD_BASE_IMAGE=zabbix-build-pgsql:ubuntu-${ZBX_VERSION} - -FROM ${BUILD_BASE_IMAGE} AS builder -FROM builder AS clean_builder - -ARG ZBX_VERSION - -RUN set -eux && \ - rm -rf \ - "/tmp/zabbix-${ZBX_VERSION}/ui/tests" \ - "/tmp/zabbix-${ZBX_VERSION}/ui/conf/zabbix.conf.php" \ - "/tmp/zabbix-${ZBX_VERSION}/ui/conf/zabbix.conf.php.example" \ - "/tmp/zabbix-${ZBX_VERSION}/ui/conf/maintenance.inc.php" && \ - find "/tmp/zabbix-${ZBX_VERSION}/ui/locale" -name '*.po' -delete && \ - find "/tmp/zabbix-${ZBX_VERSION}/ui/locale" -name '*.sh' -delete - -FROM ${OS_BASE_IMAGE} - -ARG MAJOR_VERSION -ARG ZBX_VERSION -ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git - -ENV TERM=xterm \ - ZBX_VERSION=${ZBX_VERSION} \ - ZBX_SOURCES=${ZBX_SOURCES} \ - ZABBIX_CONF_DIR=/etc/zabbix \ - ZABBIX_USER_HOME_DIR=/var/lib/zabbix \ - ZABBIX_WWW_ROOT=/usr/share/zabbix \ - PYTHONDONTWRITEBYTECODE=1 - -ENV DAEMON_USER=www-data \ - DAEMON_GROUP=www-data \ - APACHE_BIN=/usr/sbin/apache2 \ - PHP_FPM_BIN=/usr/sbin/php-fpm8.5 \ - APACHE_RUN_DIR=/tmp/apache2 \ - HTTPD_CONF_FILE=/etc/apache2/apache2.conf \ - APACHE_SITES_DIR=/etc/apache2/sites-enabled \ - PHP_FPM_CONFIG=/etc/php/8.5/fpm/php-fpm.conf \ - PHP_ZBX_CONFIG_FILE=/etc/php/8.5/fpm/pool.d/zabbix.conf - -LABEL org.opencontainers.image.authors="Alexey Pustovalov " \ - org.opencontainers.image.description="Zabbix web-interface based on Apache2 web server with PostgreSQL database support" \ - org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ - org.opencontainers.image.licenses="AGPL v3.0" \ - org.opencontainers.image.source="${ZBX_SOURCES}" \ - org.opencontainers.image.title="Zabbix web-interface (Apache, PostgreSQL)" \ - org.opencontainers.image.url="https://zabbix.com/" \ - org.opencontainers.image.vendor="Zabbix SIA" \ - org.opencontainers.image.version="${ZBX_VERSION}" - -STOPSIGNAL SIGTERM - -COPY --from=clean_builder /tmp/zabbix-${ZBX_VERSION}/ui ${ZABBIX_WWW_ROOT}/ -COPY --from=clean_builder /tmp/zabbix-${ZBX_VERSION}-output/web/conf ${ZABBIX_CONF_DIR}/web/ -COPY conf/etc/ /etc/ - -RUN --mount=type=cache,target=/var/cache/apt/,sharing=locked \ - --mount=type=cache,target=/var/lib/apt/,sharing=locked \ - set -eux && \ - INSTALL_PKGS="bash \ - ca-certificates \ - curl \ - jq \ - locales \ - tzdata \ - libldap-common \ - apache2 \ - php8.5-fpm \ - php8.5-bcmath \ - php8.5-curl \ - php8.5-gd \ - php8.5-ldap \ - php8.5-mbstring \ - php8.5-pgsql \ - php8.5-xml \ - postgresql-client" && \ - apt-get update && \ - DEBIAN_FRONTEND=noninteractive apt-get -y \ - -o Dpkg::Options::="--force-confdef" \ - -o Dpkg::Options::="--force-confold" \ - --no-install-recommends install \ - ${INSTALL_PKGS} && \ - groupadd \ - --system \ - --gid 1995 \ - zabbix && \ - useradd \ - --system \ - --comment "Zabbix monitoring system" \ - -g zabbix \ - --uid 1997 \ - --shell /sbin/nologin \ - --home-dir ${ZABBIX_USER_HOME_DIR}/ \ - zabbix && \ - mkdir -p \ - ${ZABBIX_CONF_DIR} \ - ${ZABBIX_CONF_DIR}/web \ - ${ZABBIX_CONF_DIR}/web/certs \ - ${ZABBIX_USER_HOME_DIR} \ - ${ZABBIX_USER_HOME_DIR}/enc \ - ${ZABBIX_USER_HOME_DIR}/enc_internal \ - /var/lib/php/session \ - /var/lib/locales/supported.d && \ - rm -rf /etc/apache2/sites-available/* \ - ${APACHE_SITES_DIR}/*.conf \ - /etc/php/8.5/fpm/pool.d/www.conf \ - /var/run/apache2/ \ - /var/lib/locales/supported.d/local && \ - ln -sf "${ZABBIX_CONF_DIR}/web/zabbix.conf.php" "${ZABBIX_WWW_ROOT}/conf/zabbix.conf.php" && \ - ln -sf "${ZABBIX_CONF_DIR}/web/maintenance.inc.php" "${ZABBIX_WWW_ROOT}/conf/maintenance.inc.php" && \ - awk "/display/ && /true/ {gsub(/^[ \t]+|[ \t]+$/, \"\", \$0); print \$0}" "${ZABBIX_WWW_ROOT}/include/locales.inc.php" | \ - cut -d"'" -f 2 | sort -u | \ - xargs -r -I '{}' bash -c 'echo "{}.UTF-8 UTF-8" >> /var/lib/locales/supported.d/local' && \ - dpkg-reconfigure locales && \ - FIX_PERM_LIST="\ - ${ZABBIX_CONF_DIR}/ \ - ${ZABBIX_WWW_ROOT}/include/defines.inc.php \ - ${ZABBIX_WWW_ROOT}/modules/ \ - ${ZABBIX_USER_HOME_DIR}/ \ - /etc/apache2/ \ - /etc/php/8.5/fpm/php-fpm.conf \ - /etc/php/8.5/fpm/pool.d/ \ - /var/lib/php/session/" && \ - chown --quiet -R zabbix:0 ${FIX_PERM_LIST} && \ - chmod -R g=u ${FIX_PERM_LIST} - -RUN --mount=from=entrypoints,target=/tmp/entrypoints,ro \ - set -eux && \ - install -d /usr/lib/docker-entrypoint && \ - install -m 0755 /tmp/entrypoints/web-apache-pgsql.sh /usr/bin/docker-entrypoint.sh && \ - install -m 0644 /tmp/entrypoints/lib/*.sh /usr/lib/docker-entrypoint/ - -HEALTHCHECK --interval=1m30s --timeout=3s --retries=3 --start-period=40s --start-interval=5s \ - CMD curl -f http://localhost:8080/ping || exit 1 - -EXPOSE 8080/tcp 8443/tcp - -WORKDIR ${ZABBIX_WWW_ROOT} - -USER 1997 - -ENTRYPOINT ["docker-entrypoint.sh"] diff --git a/Dockerfiles/web-apache-pgsql/ubuntu/README.md b/Dockerfiles/web-apache-pgsql/ubuntu/README.md deleted file mode 120000 index 32d46ee8..00000000 --- a/Dockerfiles/web-apache-pgsql/ubuntu/README.md +++ /dev/null @@ -1 +0,0 @@ -../README.md \ No newline at end of file diff --git a/Dockerfiles/web-apache-pgsql/ubuntu/build.sh b/Dockerfiles/web-apache-pgsql/ubuntu/build.sh deleted file mode 120000 index 46b20313..00000000 --- a/Dockerfiles/web-apache-pgsql/ubuntu/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../../build.sh \ No newline at end of file diff --git a/Dockerfiles/web-apache-pgsql/ubuntu/conf/etc/apache2/apache2.conf b/Dockerfiles/web-apache-pgsql/ubuntu/conf/etc/apache2/apache2.conf deleted file mode 100644 index 74606784..00000000 --- a/Dockerfiles/web-apache-pgsql/ubuntu/conf/etc/apache2/apache2.conf +++ /dev/null @@ -1,82 +0,0 @@ -ServerRoot /etc/apache2/ -DefaultRuntimeDir ${APACHE_RUN_DIR} -PidFile /tmp/apache2.pid - -ServerName zabbix - -IncludeOptional /etc/apache2/includes.conf - -Timeout 300 -KeepAlive On -MaxKeepAliveRequests 100 -KeepAliveTimeout 5 - - - User ${APACHE_RUN_USER} - Group ${APACHE_RUN_GROUP} - - -HostnameLookups Off - -LogLevel warn - - - SetEnvIf Request_URI "^/(robots\.txt|favicon\.ico|status|ping|apache-status)$" exclude_from_logs - - LogFormat "%v:%p %h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" vhost_combined - - CustomLog ${APACHE_CUSTOM_LOG} vhost_combined env=!exclude_from_logs - - -ErrorLog /proc/self/fd/2 - -LogLevel warn - - - StartServers 2 - MinSpareThreads 25 - MaxSpareThreads 75 - ThreadLimit 64 - ThreadsPerChild 25 - MaxRequestWorkers 150 - MaxConnectionsPerChild 0 - - -# Deny all attempts to access hidden files such as .htaccess, .htpasswd, .DS_Store (Mac). - - Require all denied - - -ServerTokens ${APACHE_SERVER_TOKENS} - -ServerSignature ${APACHE_SERVER_SIGNATURE} - -TraceEnable Off - -AddDefaultCharset UTF-8 - - - RequestReadTimeout handshake=0 header=20-40,MinRate=500 body=20,MinRate=500 - - -SetEnvIfNoCase ^Authorization$ "(.+)" HTTP_AUTHORIZATION=$1 - -AddType application/x-httpd-php .php .php3 .php4 .php5 .phtml -AddType application/x-httpd-php-source .phps - -DirectoryIndex ${HTTP_INDEX_FILE} - -DocumentRoot "${ZABBIX_WWW_ROOT}" - - - - SetHandler server-status - Require local - - - ExtendedStatus On - - - ProxyStatus On - - diff --git a/Dockerfiles/web-apache-pgsql/ubuntu/conf/etc/apache2/includes.conf b/Dockerfiles/web-apache-pgsql/ubuntu/conf/etc/apache2/includes.conf deleted file mode 100644 index 30cd645e..00000000 --- a/Dockerfiles/web-apache-pgsql/ubuntu/conf/etc/apache2/includes.conf +++ /dev/null @@ -1,5 +0,0 @@ -IncludeOptional /etc/apache2/modules.conf - -IncludeOptional /etc/apache2/mods-enabled/mime.conf - -IncludeOptional ${APACHE_SITES_DIR}/*.conf diff --git a/Dockerfiles/web-apache-pgsql/ubuntu/conf/etc/apache2/modules.conf b/Dockerfiles/web-apache-pgsql/ubuntu/conf/etc/apache2/modules.conf deleted file mode 100644 index 6eb7a763..00000000 --- a/Dockerfiles/web-apache-pgsql/ubuntu/conf/etc/apache2/modules.conf +++ /dev/null @@ -1,15 +0,0 @@ -LoadModule auth_basic_module /usr/lib/apache2/modules/mod_auth_basic.so -LoadModule authz_core_module /usr/lib/apache2/modules/mod_authz_core.so -LoadModule authz_host_module /usr/lib/apache2/modules/mod_authz_host.so -LoadModule dir_module /usr/lib/apache2/modules/mod_dir.so -LoadModule mime_module /usr/lib/apache2/modules/mod_mime.so -LoadModule mpm_event_module /usr/lib/apache2/modules/mod_mpm_event.so -LoadModule reqtimeout_module /usr/lib/apache2/modules/mod_reqtimeout.so -LoadModule setenvif_module /usr/lib/apache2/modules/mod_setenvif.so -LoadModule status_module /usr/lib/apache2/modules/mod_status.so - -LoadModule proxy_module /usr/lib/apache2/modules/mod_proxy.so -LoadModule proxy_fcgi_module /usr/lib/apache2/modules/mod_proxy_fcgi.so -LoadModule expires_module /usr/lib/apache2/modules/mod_expires.so -LoadModule headers_module /usr/lib/apache2/modules/mod_headers.so -LoadModule remoteip_module /usr/lib/apache2/modules/mod_remoteip.so diff --git a/Dockerfiles/web-apache-pgsql/ubuntu/conf/etc/apache2/sites-enabled/server-common.inc b/Dockerfiles/web-apache-pgsql/ubuntu/conf/etc/apache2/sites-enabled/server-common.inc deleted file mode 100644 index 6de74def..00000000 --- a/Dockerfiles/web-apache-pgsql/ubuntu/conf/etc/apache2/sites-enabled/server-common.inc +++ /dev/null @@ -1,59 +0,0 @@ -RemoteIPInternalProxy ${WEB_REAL_IP_FROM} -RemoteIPHeader ${WEB_REAL_IP_HEADER} - - - Require all granted - SetHandler "proxy:unix:/tmp/php-fpm.sock|fcgi://localhost" - - - - Require all denied - - Require all denied - - - - - - Require all denied - - - - - Require all granted - - - - Require all denied - - - - Options FollowSymLinks - AllowOverride None - Require all granted - - - SetHandler "proxy:unix:/tmp/php-fpm.sock|fcgi://localhost" - - - ExpiresActive On - ExpiresByType image/x-icon "access plus 1 year" - ExpiresByType text/css "access plus 14 days" - ExpiresByType application/javascript "access plus 14 days" - ExpiresByType text/javascript "access plus 14 days" - ExpiresByType image/png "access plus 14 days" - ExpiresByType image/jpeg "access plus 14 days" - ExpiresByType image/gif "access plus 14 days" - ExpiresByType text/plain "access plus 14 days" - ExpiresByType application/xml "access plus 14 days" - - ExpiresByType image/svg+xml "access plus 14 days" - ExpiresByType font/woff "access plus 30 days" - ExpiresByType font/woff2 "access plus 30 days" - ExpiresByType font/ttf "access plus 30 days" - ExpiresByType font/otf "access plus 30 days" - - - Header append Cache-Control "public" - - diff --git a/Dockerfiles/web-apache-pgsql/ubuntu/conf/etc/php/8.5/fpm/php-fpm.conf b/Dockerfiles/web-apache-pgsql/ubuntu/conf/etc/php/8.5/fpm/php-fpm.conf deleted file mode 100644 index a2ae51f4..00000000 --- a/Dockerfiles/web-apache-pgsql/ubuntu/conf/etc/php/8.5/fpm/php-fpm.conf +++ /dev/null @@ -1,10 +0,0 @@ -include=/etc/php/8.5/fpm/pool.d/*.conf - -[global] - -pid = /tmp/php-fpm.pid - -error_log = /dev/fd/2 -log_level = notice - -daemonize = no diff --git a/Dockerfiles/web-apache-pgsql/ubuntu/conf/etc/php/8.5/fpm/pool.d/zabbix.conf b/Dockerfiles/web-apache-pgsql/ubuntu/conf/etc/php/8.5/fpm/pool.d/zabbix.conf deleted file mode 100644 index 66c3c125..00000000 --- a/Dockerfiles/web-apache-pgsql/ubuntu/conf/etc/php/8.5/fpm/pool.d/zabbix.conf +++ /dev/null @@ -1,36 +0,0 @@ -[zabbix] - -; https://www.php.net/manual/en/security.hiding.php -php_value[expose_php] = ${EXPOSE_WEB_SERVER_INFO} - -listen = /tmp/php-fpm.sock - -clear_env = no - -pm = ${PHP_FPM_PM} -pm.max_children = ${PHP_FPM_PM_MAX_CHILDREN} -pm.start_servers = ${PHP_FPM_PM_START_SERVERS} -pm.min_spare_servers = ${PHP_FPM_PM_MIN_SPARE_SERVERS} -pm.max_spare_servers = ${PHP_FPM_PM_MAX_SPARE_SERVERS} -pm.max_requests = ${PHP_FPM_PM_MAX_REQUESTS} - -slowlog = /dev/fd/1 - -php_admin_value[error_log] = /dev/fd/2 -php_admin_flag[log_errors] = on -catch_workers_output = yes - -php_value[session.save_handler] = files -php_value[session.save_path] = /var/lib/php/session - -php_value[max_execution_time] = ${ZBX_MAXEXECUTIONTIME} -php_value[memory_limit] = ${ZBX_MEMORYLIMIT} -php_value[post_max_size] = ${ZBX_POSTMAXSIZE} -php_value[upload_max_filesize] = ${ZBX_UPLOADMAXFILESIZE} -php_value[max_input_time] = ${ZBX_MAXINPUTTIME} -php_value[max_input_vars] = 10000 -php_value[date.timezone] = ${PHP_TZ} - -; PHP-FPM monitoring -pm.status_path = /status -ping.path = /ping diff --git a/Dockerfiles/web-apache-pgsql/ubuntu/conf/etc/zabbix/apache.conf b/Dockerfiles/web-apache-pgsql/ubuntu/conf/etc/zabbix/apache.conf deleted file mode 100644 index 6c2041f7..00000000 --- a/Dockerfiles/web-apache-pgsql/ubuntu/conf/etc/zabbix/apache.conf +++ /dev/null @@ -1,5 +0,0 @@ -Listen 8080 - - - Include ${APACHE_SITES_DIR}/server-common.inc - diff --git a/Dockerfiles/web-apache-pgsql/ubuntu/conf/etc/zabbix/apache_ssl.conf b/Dockerfiles/web-apache-pgsql/ubuntu/conf/etc/zabbix/apache_ssl.conf deleted file mode 100644 index ab9d29a2..00000000 --- a/Dockerfiles/web-apache-pgsql/ubuntu/conf/etc/zabbix/apache_ssl.conf +++ /dev/null @@ -1,29 +0,0 @@ -LoadModule ssl_module /usr/lib/apache2/modules/mod_ssl.so -LoadModule socache_shmcb_module /usr/lib/apache2/modules/mod_socache_shmcb.so - -Listen 8443 https - -SSLRandomSeed startup builtin -SSLRandomSeed startup file:/dev/urandom 512 -SSLRandomSeed connect builtin -SSLRandomSeed connect file:/dev/urandom 512 - -AddType application/x-x509-ca-cert .crt -SSLSessionCache shmcb:${APACHE_RUN_DIR}/ssl_scache(512000) -SSLSessionCacheTimeout 300 - - - SSLEngine on - SSLProtocol -all +TLSv1.2 +TLSv1.3 - SSLCipherSuite ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:DHE-RSA-CHACHA20-POLY1305 - SSLHonorCipherOrder off - SSLSessionTickets off - - SSLCertificateFile /etc/ssl/apache2/ssl.crt - SSLCertificateKeyFile /etc/ssl/apache2/ssl.key - - Protocols h2 http/1.1 - Header always set Strict-Transport-Security "max-age=63072000" - - Include ${APACHE_SITES_DIR}/server-common.inc - diff --git a/Dockerfiles/web-nginx-mysql/README.md b/Dockerfiles/web-nginx-mysql/README.md deleted file mode 100644 index 8e616b3a..00000000 --- a/Dockerfiles/web-nginx-mysql/README.md +++ /dev/null @@ -1,334 +0,0 @@ -![logo](https://assets.zabbix.com/img/logo/zabbix_logo_500x131.png) - -# What is Zabbix? - -Zabbix is an enterprise-class open source distributed monitoring solution. - -Zabbix is software that monitors numerous parameters of a network and the health and integrity of servers. Zabbix uses a flexible notification mechanism that allows users to configure e-mail based alerts for virtually any event. This allows a fast reaction to server problems. Zabbix offers excellent reporting and data visualisation features based on the stored data. This makes Zabbix ideal for capacity planning. - -For more information and related downloads for Zabbix components, please visit https://hub.docker.com/u/zabbix/ and https://zabbix.com - -# What is Zabbix web interface? - -Zabbix web interface is a part of Zabbix software. It is used to manage resources under monitoring and view monitoring statistics. - -# Zabbix web interface images - -These are the only official Zabbix web interface Docker images. They are based on Alpine Linux v3.24, Ubuntu 26.04 (resolute), CentOS Stream 10 and Oracle Linux 10 images. The available versions of Zabbix web interface are: - - Zabbix web interface 6.0 (tags: alpine-6.0-latest, ubuntu-6.0-latest, ol-6.0-latest) - Zabbix web interface 6.0.* (tags: alpine-6.0.*, ubuntu-6.0.*, ol-6.0.*) - Zabbix web interface 7.0 (tags: alpine-7.0-latest, ubuntu-7.0-latest, ol-7.0-latest) - Zabbix web interface 7.0.* (tags: alpine-7.0.*, ubuntu-7.0.*, ol-7.0.*) - Zabbix web interface 7.2 (tags: alpine-7.2-latest, ubuntu-7.2-latest, ol-7.2-latest) - Zabbix web interface 7.2.* (tags: alpine-7.2.*, ubuntu-7.2.*, ol-7.2.*) - Zabbix web interface 7.4 (tags: alpine-7.4-latest, ubuntu-7.4-latest, ol-7.4-latest, alpine-latest, ubuntu-latest, ol-latest, latest) - Zabbix web interface 7.4.* (tags: alpine-7.4.*, ubuntu-7.4.*, ol-7.4.*) - Zabbix web interface 8.0 (tags: alpine-trunk, ubuntu-trunk, ol-trunk) - -Images are updated when new releases are published. The image with ``latest`` tag is based on Alpine Linux. - -Zabbix web interface available in four editions: -- Zabbix web-interface based on Apache2 web server with MySQL database support -- Zabbix web-interface based on Apache2 web server with PostgreSQL database support -- Zabbix web-interface based on Nginx web server with MySQL database support -- Zabbix web-interface based on Nginx web server with PostgreSQL database support - -The image based on Nginx web server with MySQL database support. - -# How to use this image - -## Start `zabbix-web-nginx-mysql` - -Start a Zabbix web-interface container as follows: - - docker run --name some-zabbix-web-nginx-mysql -e DB_SERVER_HOST="some-mysql-server" -e MYSQL_USER="some-user" -e MYSQL_PASSWORD="some-password" -e ZBX_SERVER_HOST="some-zabbix-server" -e PHP_TZ="some-timezone" -d zabbix/zabbix-web-nginx-mysql:tag - -Where `some-zabbix-web-nginx-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, `some-zabbix-server` is IP or DNS name of Zabbix server or proxy, `some-timezone` is PHP like timezone name and `tag` is the tag specifying the version you want. See the list above for relevant tags, or look at the [full list of tags](https://hub.docker.com/r/zabbix/zabbix-web-nginx-mysql/tags/). - -## Linking the container to Zabbix server - - docker run --name some-zabbix-web-nginx-mysql --link some-zabbix-server:zabbix-server -e DB_SERVER_HOST="some-mysql-server" -e MYSQL_USER="some-user" -e MYSQL_PASSWORD="some-password" -e ZBX_SERVER_HOST="some-zabbix-server" -e PHP_TZ="some-timezone" -d zabbix/zabbix-web-nginx-mysql:tag - -## Linking the container to MySQL database - - docker run --name some-zabbix-web-nginx-mysql --link some-mysql-server:mysql -e DB_SERVER_HOST="some-mysql-server" -e MYSQL_USER="some-user" -e MYSQL_PASSWORD="some-password" -e ZBX_SERVER_HOST="some-zabbix-server" -e PHP_TZ="some-timezone" -d zabbix/zabbix-web-nginx-mysql:tag - -## Container shell access and viewing Zabbix web interface logs - -The `docker exec` command allows you to run commands inside a Docker container. The following command line will give you a bash shell inside your `zabbix-web-nginx-mysql` container: - -```console -$ docker exec -ti some-zabbix-web-nginx-mysql /bin/bash -``` - -The Zabbix web interface log is available through Docker's container log: - -```console -$ docker logs some-zabbix-web-nginx-mysql -``` - -## Environment Variables - -When you start the `zabbix-web-nginx-mysql` image, you can adjust the configuration of the Zabbix web interface by passing one or more environment variables on the `docker run` command line. - -### `ZBX_SERVER_HOST` - -This variable is IP or DNS name of Zabbix server. By default, value is `zabbix-server`. - -### `ZBX_SERVER_PORT` - -This variable is port Zabbix server listening on. By default, value is `10051`. - -### `DB_SERVER_HOST` - -This variable is IP or DNS name of MySQL server. By default, value is 'mysql-server' - -### `DB_SERVER_PORT` - -This variable is port of MySQL server. By default, value is '3306'. - -### `MYSQL_USER`, `MYSQL_PASSWORD`, `MYSQL_USER_FILE`, `MYSQL_PASSWORD_FILE` - -These variables are used by Zabbix web-interface to connect to Zabbix database. With the `_FILE` variables you can instead provide the path to a file which contains the user / the password instead. Without Docker Swarm or Kubernetes you also have to map the files. Those are exclusive so you can just provide one type - either `MYSQL_USER` or `MYSQL_USER_FILE`! - -```console -docker run --name some-zabbix-web-nginx-mysql -e DB_SERVER_HOST="some-mysql-server" -v ./.MYSQL_USER:/run/secrets/MYSQL_USER -e MYSQL_USER_FILE=/run/secrets/MYSQL_USER -v ./.MYSQL_PASSWORD:/run/secrets/MYSQL_PASSWORD -e MYSQL_PASSWORD_FILE=/var/run/secrets/MYSQL_PASSWORD -e PHP_TZ="some-timezone" -d zabbix/zabbix-web-nginx-mysql:tag -``` - -With Docker Swarm or Kubernetes this works with secrets. That way it is replicated in your cluster! - -```console -printf "zabbix" | docker secret create MYSQL_USER - -printf "zabbix" | docker secret create MYSQL_PASSWORD - -docker run --name some-zabbix-web-nginx-mysql -e DB_SERVER_HOST="some-mysql-server" -e MYSQL_USER_FILE=/run/secrets/MYSQL_USER -e MYSQL_PASSWORD_FILE=/run/secrets/MYSQL_PASSWORD -e ZBX_SERVER_HOST="some-zabbix-server" -e PHP_TZ="some-timezone" -d zabbix/zabbix-web-nginx-mysql:tag -``` - -By default, values for `MYSQL_USER` and `MYSQL_PASSWORD` are `zabbix`, `zabbix`. - -### `MYSQL_DATABASE` - -The variable is Zabbix database name. By default, value is `zabbix`. - -### `ZBX_HISTORYSTORAGEURL` - -History storage HTTP[S] URL. This parameter is used for Elasticsearch setup. Available since 3.4.5. - -### `ZBX_HISTORYSTORAGETYPES` - -Array of value types to be sent to the history storage. An example: ['uint', 'dbl']. This parameter is used for Elasticsearch setup. Available since 3.4.5. - -### `PHP_TZ` - -The variable is timezone in PHP format. Full list of supported timezones are available on [`php.net`](http://php.net/manual/en/timezones.php). By default, value is 'Europe/Riga' and system timezone since Zabbix 5.2.0. - -### `ZBX_SERVER_NAME` - -The variable is visible Zabbix installation name in right or left top corner of the web interface. - - -### `DB_DOUBLE_IEEE754` - -Use IEEE754 compatible value range for 64-bit Numeric (float) history values. Available since 5.0.0. Enabled by default. - -### `ENABLE_WEB_ACCESS_LOG` - -The variable sets the Access Log directive for Web server. By default, value corresponds to standard output. - -### `HTTP_INDEX_FILE` - -The variable controls default index page. By default, `index.php`. - -### `EXPOSE_WEB_SERVER_INFO` - -The variable allows to hide Web server and PHP versions. By default, `on`. - -### `ZBX_MAXEXECUTIONTIME` - -The variable is PHP ``max_execution_time`` option. By default, value is `300`. - -### `ZBX_MEMORYLIMIT` - -The variable is PHP ``memory_limit`` option. By default, value is `128M`. - -### `ZBX_POSTMAXSIZE` - -The variable is PHP ``post_max_size`` option. By default, value is `16M`. - -### `ZBX_UPLOADMAXFILESIZE` - -The variable is PHP ``upload_max_filesize`` option. By default, value is `2M`. - -### `ZBX_MAXINPUTTIME` - -The variable is PHP ``max_input_time`` option. By default, value is `300`. - -### `ZBX_SESSION_NAME` - -The variable is Zabbix frontend [definition](https://www.zabbix.com/documentation/current/manual/web_interface/definitions). String used as the name of the Zabbix frontend session cookie. By default, value is `zbx_sessionid`. - -### `ZBX_DENY_GUI_ACCESS` - -Enable (``true``) maintenance mode for Zabbix web-interface. - -### `ZBX_GUI_ACCESS_IP_RANGE` - -Array of IP addresses which are allowed for accessing to Zabbix web-interface during maintenance period. - -### `ZBX_GUI_WARNING_MSG` - -Information message about maintenance period for Zabbix web-interface. - -### `ZBX_DB_ENCRYPTION` - -The variable allows to activate encryption for connections to Zabbix database. Even if no other environment variables are specified, connections will be TLS-encrypted if `ZBX_DB_ENCRYPTION=true` specified. Available since 5.0.0. Disabled by default. - -### `ZBX_DB_KEY_FILE` - -The variable allows to specify the full path to a valid TLS key file. Available since 5.0.0. - -### `ZBX_DB_CERT_FILE` - -The variable allows to specify the full path to a valid TLS certificate file. Available since 5.0.0. - -### `ZBX_DB_CA_FILE` - -The variable allows to specify the full path to a valid TLS certificate authority file. Available since 5.0.0. - -### `ZBX_DB_VERIFY_HOST` - -The variable allows to activate host verification. Available since 5.0.0. - -### `ZBX_DB_CIPHER_LIST` - -The variable allows to specify a custom list of valid ciphers. The format of the cipher list must conform to the OpenSSL standard. Available since 5.0.0. - -### `ZBX_SSO_SP_KEY` - -The variable allows to specify a custom file path to the Service Provider (SP) private key file. - -### `ZBX_SSO_SP_CERT` - -The variable allows to specify a custom file path to the Service Provider (SP) cert file. - -### `ZBX_SSO_IDP_CERT` - -The variable allows to specify a custom file path to the SAML Certificate provided by the Identity Provider (ID) file. - -## `ZBX_SSO_SETTINGS` - -The variable allows to specify custom SSO settings in JSON format. Available since 5.0.0. - -Example of YAML Mapping to Sequences - -``` -.... - environment: - ZBX_SSO_SETTINGS: "{'baseurl': 'https://zabbix-docker.mydomain.com', 'use_proxy_headers': true, 'strict': false}" - .... -.... -``` - -## `ZBX_ALLOW_HTTP_AUTH` - -The variable allows to disable user HTTP authentication. - -### Other variables - -Additionally the image allows to specify many other environment variables listed below: - -``` -ZBX_VAULT=HashiCorp # Allowed values: HashiCorp, CyberArk. Required when Vault is used. Available since 6.2.0 -ZBX_VAULTDBPATH= # Available since 5.2.0 -ZBX_VAULTURL=https://127.0.0.1:8200 # Available since 5.2.0 -VAULT_TOKEN= # Available since 5.2.0 -ZBX_VAULTPREFIX= # Available since 7.0.0 -ZBX_VAULTCERTFILE= # Available since 6.2.0 -ZBX_VAULTKEYFILE= # Available since 6.2.0 -ZBX_VAULTCACHE=false # Available since 6.2.0 - -ZBX_SERVER_TLS_ACTIVE=false # Available since 7.4.0 -ZBX_SERVER_TLS_CAFILE= # Available since 7.4.0 -ZBX_SERVER_TLS_CA= # Available since 7.4.0 -ZBX_SERVER_TLS_KEYFILE= # Available since 7.4.0 -ZBX_SERVER_TLS_KEY= # Available since 7.4.0 -ZBX_SERVER_TLS_CERTFILE= # Available since 7.4.0 -ZBX_SERVER_TLS_CERT= # Available since 7.4.0 -ZBX_SERVER_TLS_CERT_ISSUER= # Available since 7.4.0 -ZBX_SERVER_TLS_CERT_SUBJECT= # Available since 7.4.0 - -Allowed PHP-FPM configuration options: -PHP_FPM_PM=dynamic -PHP_FPM_PM_MAX_CHILDREN=50 -PHP_FPM_PM_START_SERVERS=5 -PHP_FPM_PM_MIN_SPARE_SERVERS=5 -PHP_FPM_PM_MAX_SPARE_SERVERS=35 -PHP_FPM_PM_MAX_REQUESTS=0 - -Allowed Nginx configuration options: -WEB_REAL_IP_FROM= -WEB_REAL_IP_HEADER= -``` - -## Allowed volumes for the Zabbix web interface container - -### ``/etc/ssl/nginx`` - -The volume allows to enable HTTPS for the Zabbix web interface. The volume must contain three files ``ssl.crt``, ``ssl.key`` and ``dhparam.pem`` prepared for Nginx SSL connections. - -Please follow official Nginx [documentation](http://nginx.org/en/docs/http/configuring_https_servers.html) to get more details about how to create certificate files. - -### ``/etc/zabbix/web/certs`` - -The volume allows to use custom certificates for SAML authentication. The volume must contain three files ``sp.key``, ``sp.crt`` and ``idp.crt``. Available since 5.0.0. - -### ``/var/lib/zabbix/enc`` - -The volume is used to store TLS related files. These file names are specified using ``ZBX_SERVER_TLS_CAFILE``, ``ZBX_SERVER_TLS_KEYFILE`` and ``ZBX_SERVER_TLS_CERTFILE`` variables. Additionally it is possible to use environment variables ``ZBX_SERVER_TLS_CA``, ``ZBX_SERVER_TLS_KEY`` and ``ZBX_SERVER_TLS_CERT`` with plaintext values. Available since 7.4.0. - -# The image variants - -The `zabbix-web-nginx-mysql` images come in many flavors, each designed for a specific use case. - -## `zabbix-web-nginx-mysql:alpine-` - -This image is based on the popular [Alpine Linux project](http://alpinelinux.org), available in [the `alpine` official image](https://hub.docker.com/_/alpine). Alpine Linux is much smaller than most distribution base images (~5MB), and thus leads to much slimmer images in general. - -This variant is highly recommended when final image size being as small as possible is desired. The main caveat to note is that it does use [musl libc](http://www.musl-libc.org) instead of [glibc and friends](http://www.etalabs.net/compare_libcs.html), so certain software might run into issues depending on the depth of their libc requirements. However, most software doesn't have an issue with this, so this variant is usually a very safe choice. See [this Hacker News comment thread](https://news.ycombinator.com/item?id=10782897) for more discussion of the issues that might arise and some pro/con comparisons of using Alpine-based images. - -To minimize image size, it's uncommon for additional related tools (such as `git` or `bash`) to be included in Alpine-based images. Using this image as a base, add the things you need in your own Dockerfile (see the [`alpine` image description](https://hub.docker.com/_/alpine/) for examples of how to install packages if you are unfamiliar). - -## `zabbix-web-nginx-mysql:ubuntu-` - -This is the defacto image. If you are unsure about what your needs are, you probably want to use this one. It is designed to be used both as a throw away container (mount your source code and start the container to start your app), as well as the base to build other images off of. - -## `zabbix-web-nginx-mysql:ol-` - -Oracle Linux is an open-source operating system available under the GNU General Public License (GPLv2). Suitable for general purpose or Oracle workloads, it benefits from rigorous testing of more than 128,000 hours per day with real-world workloads and includes unique innovations such as Ksplice for zero-downtime kernel patching, DTrace for real-time diagnostics, the powerful Btrfs file system, and more. - -# User Feedback - -## Documentation - -Documentation for this image is stored in the [`web-nginx-mysql/` directory](https://github.com/zabbix/zabbix-docker/tree/7.4/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.4/README.md) before attempting a pull request. - -## Issues - -If you have any problems with or questions about this image, please contact us through a [GitHub issue](https://github.com/zabbix/zabbix-docker/issues). - -### Known issues - -## Contributing - -You are invited to contribute new features, fixes, or updates, large or small; we are always thrilled to receive pull requests, and do our best to process them as fast as we can. - -Before you start to code, we recommend discussing your plans through a [GitHub issue](https://github.com/zabbix/zabbix-docker/issues), especially for more ambitious contributions. This gives other contributors a chance to point you in the right direction, give you feedback on your design, and help you find out if someone else is working on the same thing. - -## License - -Starting from Zabbix version 7.0, all subsequent Zabbix versions will be released under the GNU Affero General Public License version 3 (AGPLv3). -You can modify the relevant version and propagate such modified version under the terms of the AGPLv3 as published by the Free Software Foundation. -For additional details, including answers to common questions about the AGPLv3, see the generic FAQ from the [Free Software Foundation](http://www.fsf.org/licenses/gpl-faq.html). - -Zabbix is Open Source Software, however, if you use Zabbix in a commercial context we kindly ask you to support the development of Zabbix by purchasing some level of technical support. -All previous Zabbix software versions up to 6.4 are released under the GNU General Public License version 2 (GPLv2). The formal terms of the GPLv2 and AGPLv3 can be found at http://www.fsf.org/licenses/. diff --git a/Dockerfiles/web-nginx-mysql/alpine/.dockerignore b/Dockerfiles/web-nginx-mysql/alpine/.dockerignore deleted file mode 100644 index 88a84e55..00000000 --- a/Dockerfiles/web-nginx-mysql/alpine/.dockerignore +++ /dev/null @@ -1 +0,0 @@ -build.sh diff --git a/Dockerfiles/web-nginx-mysql/alpine/Dockerfile b/Dockerfiles/web-nginx-mysql/alpine/Dockerfile deleted file mode 100644 index dd25ef05..00000000 --- a/Dockerfiles/web-nginx-mysql/alpine/Dockerfile +++ /dev/null @@ -1,139 +0,0 @@ -# syntax=docker/dockerfile:1.6 -ARG OS_BASE_IMAGE=alpine:3.24 -ARG MAJOR_VERSION=7.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.12 -ARG BUILD_BASE_IMAGE=zabbix-build-mysql:alpine-${ZBX_VERSION} - -FROM ${BUILD_BASE_IMAGE} AS builder -FROM builder AS clean_builder - -ARG ZBX_VERSION - -RUN set -eux && \ - rm -rf \ - "/tmp/zabbix-${ZBX_VERSION}/ui/tests" \ - "/tmp/zabbix-${ZBX_VERSION}/ui/conf/zabbix.conf.php" \ - "/tmp/zabbix-${ZBX_VERSION}/ui/conf/zabbix.conf.php.example" \ - "/tmp/zabbix-${ZBX_VERSION}/ui/conf/maintenance.inc.php" && \ - find "/tmp/zabbix-${ZBX_VERSION}/ui/locale" -name '*.po' -delete && \ - find "/tmp/zabbix-${ZBX_VERSION}/ui/locale" -name '*.sh' -delete - -FROM ${OS_BASE_IMAGE} - -ARG MAJOR_VERSION -ARG ZBX_VERSION -ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git - -ENV TERM=xterm \ - ZBX_VERSION=${ZBX_VERSION} \ - ZBX_SOURCES=${ZBX_SOURCES} \ - ZABBIX_CONF_DIR=/etc/zabbix \ - ZABBIX_USER_HOME_DIR=/var/lib/zabbix \ - ZABBIX_WWW_ROOT=/usr/share/zabbix - -ENV DB_ENGINE=mariadb \ - NGINX_BIN=/usr/sbin/nginx \ - PHP_FPM_BIN=/usr/sbin/php-fpm85 \ - NGINX_CONFD_DIR=/etc/nginx/http.d \ - PHP_FPM_CONFIG=/etc/php85/php-fpm.conf \ - PHP_ZBX_CONFIG_FILE=/etc/php85/php-fpm.d/zabbix.conf - -LABEL org.opencontainers.image.authors="Alexey Pustovalov " \ - org.opencontainers.image.description="Zabbix web-interface based on Nginx web server with MySQL database support" \ - org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ - org.opencontainers.image.licenses="AGPL v3.0" \ - org.opencontainers.image.source="${ZBX_SOURCES}" \ - org.opencontainers.image.title="Zabbix web-interface (Nginx, MySQL)" \ - org.opencontainers.image.url="https://zabbix.com/" \ - org.opencontainers.image.vendor="Zabbix SIA" \ - org.opencontainers.image.version="${ZBX_VERSION}" - -STOPSIGNAL SIGTERM - -COPY --from=clean_builder /tmp/zabbix-${ZBX_VERSION}/ui ${ZABBIX_WWW_ROOT}/ -COPY --from=clean_builder /tmp/zabbix-${ZBX_VERSION}-output/web/conf ${ZABBIX_CONF_DIR}/web/ -COPY conf/etc/ /etc/ - -RUN set -eux && \ - INSTALL_PKGS="bash \ - curl \ - jq \ - tzdata \ - mariadb-connector-c \ - nginx \ - php85-fpm \ - php85-bcmath \ - php85-ctype \ - php85-curl \ - php85-fileinfo \ - php85-gd \ - php85-gettext \ - php85-json \ - php85-ldap \ - php85-mbstring \ - php85-mysqli \ - php85-openssl \ - php85-session \ - php85-simplexml \ - php85-sockets \ - php85-xmlreader \ - php85-xmlwriter \ - mariadb-client" && \ - apk add \ - --no-cache \ - --clean-protected \ - ${INSTALL_PKGS} && \ - addgroup \ - --system \ - --gid 1995 \ - zabbix && \ - adduser \ - --system \ - --gecos "Zabbix monitoring system" \ - --disabled-password \ - --uid 1997 \ - --ingroup zabbix \ - --shell /sbin/nologin \ - --home ${ZABBIX_USER_HOME_DIR} \ - zabbix && \ - mkdir -p ${ZABBIX_CONF_DIR} \ - ${ZABBIX_CONF_DIR}/web \ - ${ZABBIX_CONF_DIR}/web/certs \ - ${ZABBIX_USER_HOME_DIR}/enc \ - ${ZABBIX_USER_HOME_DIR}/enc_internal \ - /var/lib/php/session && \ - rm -rf /etc/php85/php-fpm.d/www.conf \ - /etc/nginx/http.d/*.conf && \ - ln -sf /dev/stdout /var/log/nginx/access.log && \ - ln -sf /dev/stderr /var/log/nginx/error.log && \ - ln -sf "${ZABBIX_CONF_DIR}/web/zabbix.conf.php" "${ZABBIX_WWW_ROOT}/conf/zabbix.conf.php" && \ - ln -sf "${ZABBIX_CONF_DIR}/web/maintenance.inc.php" "${ZABBIX_WWW_ROOT}/conf/maintenance.inc.php" && \ - FIX_PERM_LIST="\ - ${ZABBIX_CONF_DIR}/ \ - ${ZABBIX_WWW_ROOT}/include/defines.inc.php \ - ${ZABBIX_WWW_ROOT}/modules/ \ - /etc/nginx/ \ - /etc/php85/php-fpm.d/ \ - /etc/php85/php-fpm.conf \ - ${ZABBIX_USER_HOME_DIR}/ \ - /var/lib/php/session/ \ - /var/lib/nginx/" && \ - chown --quiet -R zabbix:0 ${FIX_PERM_LIST} && \ - chmod -R g=u ${FIX_PERM_LIST} - -RUN --mount=from=entrypoints,target=/tmp/entrypoints,ro \ - set -eux && \ - install -d /usr/lib/docker-entrypoint && \ - install -m 0755 /tmp/entrypoints/web-nginx-mysql.sh /usr/bin/docker-entrypoint.sh && \ - install -m 0644 /tmp/entrypoints/lib/*.sh /usr/lib/docker-entrypoint/ - -HEALTHCHECK --interval=1m30s --timeout=3s --retries=3 --start-period=40s --start-interval=5s \ - CMD curl -f http://localhost:8080/ping || exit 1 - -EXPOSE 8080/tcp 8443/tcp - -WORKDIR ${ZABBIX_WWW_ROOT} - -USER 1997 - -ENTRYPOINT ["docker-entrypoint.sh"] diff --git a/Dockerfiles/web-nginx-mysql/alpine/README.md b/Dockerfiles/web-nginx-mysql/alpine/README.md deleted file mode 120000 index 32d46ee8..00000000 --- a/Dockerfiles/web-nginx-mysql/alpine/README.md +++ /dev/null @@ -1 +0,0 @@ -../README.md \ No newline at end of file diff --git a/Dockerfiles/web-nginx-mysql/alpine/build.sh b/Dockerfiles/web-nginx-mysql/alpine/build.sh deleted file mode 120000 index 46b20313..00000000 --- a/Dockerfiles/web-nginx-mysql/alpine/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../../build.sh \ No newline at end of file diff --git a/Dockerfiles/web-nginx-mysql/alpine/conf/etc/nginx/includes/server-common.conf b/Dockerfiles/web-nginx-mysql/alpine/conf/etc/nginx/includes/server-common.conf deleted file mode 100644 index b77386b5..00000000 --- a/Dockerfiles/web-nginx-mysql/alpine/conf/etc/nginx/includes/server-common.conf +++ /dev/null @@ -1,105 +0,0 @@ -server_name zabbix; -index {HTTP_INDEX_FILE}; - -include /etc/nginx/includes/access-log.conf; -error_log stderr notice; - -set $webroot '/usr/share/zabbix'; - -root $webroot; - -large_client_header_buffers 8 8k; -client_max_body_size 10M; - -location = /favicon.ico { - log_not_found off; -} - -location = /robots.txt { - allow all; - log_not_found off; - access_log off; -} - -# Deny all attempts to access hidden files such as .htaccess, .htpasswd, .DS_Store (Mac). -location ~ /\. { - deny all; - access_log off; - log_not_found off; -} - -# caching of files -location ~* \.ico$ { - access_log off; - expires 1y; -} - -location ~* \.(js|css|png|jpg|jpeg|gif|xml|txt|svg)$ { - expires 14d; -} - -location ~* \.(woff|woff2|ttf|otf)$ { - access_log off; - expires 30d; -} - -location ~ /(app\/|conf[^\.]|include\/|local\/|locale\/|vendor\/) { - deny all; - return 404; -} - -location = /data/top_passwords.txt { - deny all; - return 404; -} - -location = /nginx-status { - access_log off; - allow 127.0.0.1; - allow ::1; - deny all; - stub_status; -} - -location ~ ^/(status|ping)$ { - access_log off; - - fastcgi_pass unix:/tmp/php-fpm.sock; - - fastcgi_param SCRIPT_FILENAME $webroot$fastcgi_script_name; - include fastcgi_params; -} - -location / { - try_files $uri $uri/ =404; -} - -location ~ [^/]\.php(/|$) { - fastcgi_split_path_info ^(.+\.php)(/.+)$; - set $path_info $fastcgi_path_info; - try_files $fastcgi_script_name =404; - - fastcgi_pass unix:/tmp/php-fpm.sock; - fastcgi_index {HTTP_INDEX_FILE}; - - fastcgi_param DOCUMENT_ROOT $webroot; - fastcgi_param SCRIPT_FILENAME $webroot$fastcgi_script_name; - fastcgi_param PATH_TRANSLATED $webroot$fastcgi_script_name; - fastcgi_param PATH_INFO $path_info; - - include fastcgi_params; - fastcgi_param QUERY_STRING $query_string; - fastcgi_param REQUEST_METHOD $request_method; - fastcgi_param CONTENT_TYPE $content_type; - fastcgi_param CONTENT_LENGTH $content_length; - - fastcgi_intercept_errors on; - fastcgi_ignore_client_abort off; - fastcgi_connect_timeout 60; - fastcgi_send_timeout 180; - fastcgi_read_timeout {FCGI_READ_TIMEOUT}; - fastcgi_buffer_size 128k; - fastcgi_buffers 4 256k; - fastcgi_busy_buffers_size 256k; - fastcgi_temp_file_write_size 256k; -} diff --git a/Dockerfiles/web-nginx-mysql/alpine/conf/etc/nginx/includes/server-ssl.conf b/Dockerfiles/web-nginx-mysql/alpine/conf/etc/nginx/includes/server-ssl.conf deleted file mode 100644 index 61c62354..00000000 --- a/Dockerfiles/web-nginx-mysql/alpine/conf/etc/nginx/includes/server-ssl.conf +++ /dev/null @@ -1,17 +0,0 @@ -ssl_certificate /etc/ssl/nginx/ssl.crt; -ssl_certificate_key /etc/ssl/nginx/ssl.key; -ssl_dhparam /etc/ssl/nginx/dhparam.pem; - -ssl_session_timeout 1d; -ssl_session_cache shared:MozSSL:10m; -ssl_session_tickets off; - -# intermediate configuration -ssl_protocols TLSv1.2 TLSv1.3; -ssl_ciphers ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:DHE-RSA-CHACHA20-POLY1305; -ssl_prefer_server_ciphers off; - -# HSTS (ngx_http_headers_module is required) (63072000 seconds) -add_header Strict-Transport-Security "max-age=63072000" always; - -add_header Content-Security-Policy-Report-Only "default-src https:; script-src https: 'unsafe-eval' 'unsafe-inline'; style-src https: 'unsafe-inline'; img-src https: data:; font-src https: data:; report-uri /csp-report"; diff --git a/Dockerfiles/web-nginx-mysql/alpine/conf/etc/nginx/nginx.conf b/Dockerfiles/web-nginx-mysql/alpine/conf/etc/nginx/nginx.conf deleted file mode 100644 index 5c8b1d31..00000000 --- a/Dockerfiles/web-nginx-mysql/alpine/conf/etc/nginx/nginx.conf +++ /dev/null @@ -1,71 +0,0 @@ -include /etc/nginx/includes/user.conf; - -worker_processes 5; -worker_rlimit_nofile 256000; - -error_log stderr error; - -pid /tmp/nginx.pid; - -events { - worker_connections 5120; - use epoll; -} - -http { - include /etc/nginx/mime.types; - default_type application/octet-stream; - - log_format main '$remote_addr - $remote_user [$time_local] "$request" ' - '$status $body_bytes_sent "$http_referer" ' - '"$http_user_agent" "$http_x_forwarded_for"'; - - include /etc/nginx/includes/access-log.conf; - error_log stderr error; - - client_body_temp_path /tmp/client_body 1 2; - proxy_temp_path /tmp/proxy 1 2; - fastcgi_temp_path /tmp/fastcgi 1 2; - uwsgi_temp_path /tmp/uwsgi 1 2; - scgi_temp_path /tmp/scgi 1 2; - - client_body_timeout 5m; - send_timeout 5m; - - connection_pool_size 4096; - client_header_buffer_size 4k; - large_client_header_buffers 4 4k; - request_pool_size 4k; - reset_timedout_connection on; - - - gzip on; - gzip_min_length 100; - gzip_buffers 4 8k; - gzip_comp_level 5; - gzip_types text/plain; - gzip_types application/x-javascript; - gzip_types text/css; - - output_buffers 128 512k; - postpone_output 1460; - aio on; - directio 512; - - sendfile on; - client_max_body_size 8m; - client_body_buffer_size 256k; - fastcgi_intercept_errors on; - - tcp_nopush on; - tcp_nodelay on; - - keepalive_timeout 75 20; - - ignore_invalid_headers on; - - index index.php; - server_tokens {EXPOSE_WEB_SERVER_INFO}; - - include /etc/nginx/http.d/*.conf; -} diff --git a/Dockerfiles/web-nginx-mysql/alpine/conf/etc/php85/php-fpm.conf b/Dockerfiles/web-nginx-mysql/alpine/conf/etc/php85/php-fpm.conf deleted file mode 100644 index 3f077424..00000000 --- a/Dockerfiles/web-nginx-mysql/alpine/conf/etc/php85/php-fpm.conf +++ /dev/null @@ -1,10 +0,0 @@ -include=/etc/php85/php-fpm.d/*.conf - -[global] - -pid = /tmp/php-fpm.pid - -error_log = /dev/fd/2 -log_level = notice - -daemonize = no diff --git a/Dockerfiles/web-nginx-mysql/alpine/conf/etc/php85/php-fpm.d/zabbix.conf b/Dockerfiles/web-nginx-mysql/alpine/conf/etc/php85/php-fpm.d/zabbix.conf deleted file mode 100644 index 4ee70ccd..00000000 --- a/Dockerfiles/web-nginx-mysql/alpine/conf/etc/php85/php-fpm.d/zabbix.conf +++ /dev/null @@ -1,39 +0,0 @@ -[zabbix] - -; https://www.php.net/manual/en/security.hiding.php -php_value[expose_php] = ${EXPOSE_WEB_SERVER_INFO} - -listen = /tmp/php-fpm.sock - -clear_env = no - -pm = ${PHP_FPM_PM} -pm.max_children = ${PHP_FPM_PM_MAX_CHILDREN} -pm.start_servers = ${PHP_FPM_PM_START_SERVERS} -pm.min_spare_servers = ${PHP_FPM_PM_MIN_SPARE_SERVERS} -pm.max_spare_servers = ${PHP_FPM_PM_MAX_SPARE_SERVERS} -pm.max_requests = ${PHP_FPM_PM_MAX_REQUESTS} - -slowlog = /dev/fd/1 - -php_admin_value[error_log] = /dev/fd/2 -php_admin_flag[log_errors] = on -catch_workers_output = yes - -php_value[session.save_handler] = files -php_value[session.save_path] = /var/lib/php/session - -php_value[max_execution_time] = ${ZBX_MAXEXECUTIONTIME} -php_value[memory_limit] = ${ZBX_MEMORYLIMIT} -php_value[post_max_size] = ${ZBX_POSTMAXSIZE} -php_value[upload_max_filesize] = ${ZBX_UPLOADMAXFILESIZE} -php_value[max_input_time] = ${ZBX_MAXINPUTTIME} -php_value[max_input_vars] = 10000 -php_value[date.timezone] = ${PHP_TZ} - -; PHP-FPM monitoring -pm.status_path = /status -ping.path = /ping - -; Set the socket equal to DB_SERVER_SOCKET set by user -php_value[mysqli.default_socket] = ${DB_SERVER_SOCKET} diff --git a/Dockerfiles/web-nginx-mysql/alpine/conf/etc/zabbix/nginx.conf b/Dockerfiles/web-nginx-mysql/alpine/conf/etc/zabbix/nginx.conf deleted file mode 100644 index 42d5aa2b..00000000 --- a/Dockerfiles/web-nginx-mysql/alpine/conf/etc/zabbix/nginx.conf +++ /dev/null @@ -1,7 +0,0 @@ -server { - listen 8080; - include /etc/nginx/includes/listen-ipv6.conf; - - include /etc/nginx/includes/real-ip.conf; - include /etc/nginx/includes/server-common.conf; -} diff --git a/Dockerfiles/web-nginx-mysql/alpine/conf/etc/zabbix/nginx_ssl.conf b/Dockerfiles/web-nginx-mysql/alpine/conf/etc/zabbix/nginx_ssl.conf deleted file mode 100644 index 01fbf7b4..00000000 --- a/Dockerfiles/web-nginx-mysql/alpine/conf/etc/zabbix/nginx_ssl.conf +++ /dev/null @@ -1,10 +0,0 @@ -server { - listen 8443 ssl; - include /etc/nginx/includes/listen-ipv6-ssl.conf; - - http2 on; - - include /etc/nginx/includes/real-ip.conf; - include /etc/nginx/includes/server-ssl.conf; - include /etc/nginx/includes/server-common.conf; -} diff --git a/Dockerfiles/web-nginx-mysql/centos/.dockerignore b/Dockerfiles/web-nginx-mysql/centos/.dockerignore deleted file mode 100644 index 88a84e55..00000000 --- a/Dockerfiles/web-nginx-mysql/centos/.dockerignore +++ /dev/null @@ -1 +0,0 @@ -build.sh diff --git a/Dockerfiles/web-nginx-mysql/centos/Dockerfile b/Dockerfiles/web-nginx-mysql/centos/Dockerfile deleted file mode 100644 index 57288fc2..00000000 --- a/Dockerfiles/web-nginx-mysql/centos/Dockerfile +++ /dev/null @@ -1,146 +0,0 @@ -# syntax=docker/dockerfile:1.6 -ARG OS_BASE_IMAGE=quay.io/centos/centos:stream10-minimal -ARG MAJOR_VERSION=7.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.12 -ARG BUILD_BASE_IMAGE=zabbix-build-mysql:centos-${ZBX_VERSION} - -FROM ${BUILD_BASE_IMAGE} AS builder -FROM builder AS clean_builder - -ARG ZBX_VERSION - -RUN set -eux && \ - rm -rf \ - "/tmp/zabbix-${ZBX_VERSION}/ui/tests" \ - "/tmp/zabbix-${ZBX_VERSION}/ui/conf/zabbix.conf.php" \ - "/tmp/zabbix-${ZBX_VERSION}/ui/conf/zabbix.conf.php.example" \ - "/tmp/zabbix-${ZBX_VERSION}/ui/conf/maintenance.inc.php" && \ - find "/tmp/zabbix-${ZBX_VERSION}/ui/locale" -name '*.po' -delete && \ - find "/tmp/zabbix-${ZBX_VERSION}/ui/locale" -name '*.sh' -delete - -FROM ${OS_BASE_IMAGE} - -ARG MAJOR_VERSION -ARG ZBX_VERSION -ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git - -ENV TERM=xterm \ - ZBX_VERSION=${ZBX_VERSION} \ - ZBX_SOURCES=${ZBX_SOURCES} \ - ZABBIX_CONF_DIR=/etc/zabbix \ - ZABBIX_USER_HOME_DIR=/var/lib/zabbix \ - ZABBIX_WWW_ROOT=/usr/share/zabbix - -ENV DB_ENGINE=mysql \ - NGINX_BIN=/usr/sbin/nginx \ - PHP_FPM_BIN=/usr/sbin/php-fpm \ - NGINX_CONFD_DIR=/etc/nginx/conf.d \ - PHP_FPM_CONFIG=/etc/php-fpm.conf \ - PHP_ZBX_CONFIG_FILE=/etc/php-fpm.d/zabbix.conf - -LABEL org.opencontainers.image.authors="Alexey Pustovalov " \ - org.opencontainers.image.description="Zabbix web-interface based on Nginx web server with MySQL database support" \ - org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ - org.opencontainers.image.licenses="AGPL v3.0" \ - org.opencontainers.image.source="${ZBX_SOURCES}" \ - org.opencontainers.image.title="Zabbix web-interface (Nginx, MySQL)" \ - org.opencontainers.image.url="https://zabbix.com/" \ - org.opencontainers.image.vendor="Zabbix SIA" \ - org.opencontainers.image.version="${ZBX_VERSION}" - -STOPSIGNAL SIGTERM - -COPY --from=clean_builder /tmp/zabbix-${ZBX_VERSION}/ui ${ZABBIX_WWW_ROOT}/ -COPY --from=clean_builder /tmp/zabbix-${ZBX_VERSION}-output/web/conf ${ZABBIX_CONF_DIR}/web/ -COPY conf/etc/ /etc/ - -RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ - --mount=type=tmpfs,target=/var/cache/yum/ \ - set -eux && \ - INSTALL_PKGS="bash \ - curl-minimal \ - findutils \ - glibc-locale-source \ - gzip \ - jq \ - shadow-utils \ - nginx \ - php-fpm \ - php-bcmath \ - php-curl \ - php-gd \ - php-json \ - php-ldap \ - php-mbstring \ - php-mysqlnd \ - php-xml \ - mysql8.4" && \ - microdnf -y install \ - --disablerepo="*" \ - --enablerepo="baseos" \ - --enablerepo="appstream" \ - --setopt=install_weak_deps=0 \ - --setopt=keepcache=0 \ - --best \ - --nodocs \ - ${INSTALL_PKGS} && \ - groupadd \ - --system \ - --gid 1995 \ - zabbix && \ - useradd \ - --system \ - --comment "Zabbix monitoring system" \ - -g zabbix \ - --uid 1997 \ - --shell /sbin/nologin \ - --home-dir ${ZABBIX_USER_HOME_DIR} \ - zabbix && \ - mkdir -p ${ZABBIX_CONF_DIR} \ - ${ZABBIX_CONF_DIR}/web \ - ${ZABBIX_CONF_DIR}/web/certs \ - ${ZABBIX_USER_HOME_DIR}/enc \ - ${ZABBIX_USER_HOME_DIR}/enc_internal \ - /var/lib/php/session && \ - rm -rf /etc/nginx/conf.d/*.conf \ - /etc/php-fpm.d/www.conf && \ - ln -sf /dev/stdout /var/log/nginx/access.log && \ - ln -sf /dev/stderr /var/log/nginx/error.log && \ - ln -sf "${ZABBIX_CONF_DIR}/web/zabbix.conf.php" "${ZABBIX_WWW_ROOT}/conf/zabbix.conf.php" && \ - ln -sf "${ZABBIX_CONF_DIR}/web/maintenance.inc.php" "${ZABBIX_WWW_ROOT}/conf/maintenance.inc.php" && \ - awk "/display/ && /true/ {gsub(/^[ \t]+|[ \t]+$/, \"\", \$0); print \$0}" "${ZABBIX_WWW_ROOT}/include/locales.inc.php" | \ - cut -d"'" -f 2 | sort -u | \ - xargs -r -I '{}' bash -c 'echo "{}" && localedef -c -i {} -f UTF-8 {}.UTF-8 2>/dev/null' && \ - FIX_PERM_LIST="\ - ${ZABBIX_CONF_DIR}/ \ - ${ZABBIX_WWW_ROOT}/include/defines.inc.php \ - ${ZABBIX_WWW_ROOT}/modules/ \ - ${ZABBIX_USER_HOME_DIR}/ \ - /etc/nginx/ \ - /etc/php-fpm.d/ \ - /etc/php-fpm.conf \ - /var/log/nginx/ \ - /var/lib/php/session/" && \ - chown --quiet -R zabbix:0 ${FIX_PERM_LIST} && \ - chmod -R g=u ${FIX_PERM_LIST} && \ - microdnf -y remove \ - findutils \ - glibc-locale-source \ - gzip - -RUN --mount=from=entrypoints,target=/tmp/entrypoints,ro \ - set -eux && \ - install -d /usr/lib/docker-entrypoint && \ - install -m 0755 /tmp/entrypoints/web-nginx-mysql.sh /usr/bin/docker-entrypoint.sh && \ - install -m 0644 /tmp/entrypoints/lib/*.sh /usr/lib/docker-entrypoint/ - -HEALTHCHECK --interval=1m30s --timeout=3s --retries=3 --start-period=40s --start-interval=5s \ - CMD curl -f http://localhost:8080/ping || exit 1 - -EXPOSE 8080/tcp 8443/tcp - -WORKDIR ${ZABBIX_WWW_ROOT} - -USER 1997 - -ENTRYPOINT ["docker-entrypoint.sh"] diff --git a/Dockerfiles/web-nginx-mysql/centos/README.md b/Dockerfiles/web-nginx-mysql/centos/README.md deleted file mode 120000 index 32d46ee8..00000000 --- a/Dockerfiles/web-nginx-mysql/centos/README.md +++ /dev/null @@ -1 +0,0 @@ -../README.md \ No newline at end of file diff --git a/Dockerfiles/web-nginx-mysql/centos/build.sh b/Dockerfiles/web-nginx-mysql/centos/build.sh deleted file mode 120000 index 46b20313..00000000 --- a/Dockerfiles/web-nginx-mysql/centos/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../../build.sh \ No newline at end of file diff --git a/Dockerfiles/web-nginx-mysql/centos/conf/etc/nginx/includes/server-common.conf b/Dockerfiles/web-nginx-mysql/centos/conf/etc/nginx/includes/server-common.conf deleted file mode 100644 index b77386b5..00000000 --- a/Dockerfiles/web-nginx-mysql/centos/conf/etc/nginx/includes/server-common.conf +++ /dev/null @@ -1,105 +0,0 @@ -server_name zabbix; -index {HTTP_INDEX_FILE}; - -include /etc/nginx/includes/access-log.conf; -error_log stderr notice; - -set $webroot '/usr/share/zabbix'; - -root $webroot; - -large_client_header_buffers 8 8k; -client_max_body_size 10M; - -location = /favicon.ico { - log_not_found off; -} - -location = /robots.txt { - allow all; - log_not_found off; - access_log off; -} - -# Deny all attempts to access hidden files such as .htaccess, .htpasswd, .DS_Store (Mac). -location ~ /\. { - deny all; - access_log off; - log_not_found off; -} - -# caching of files -location ~* \.ico$ { - access_log off; - expires 1y; -} - -location ~* \.(js|css|png|jpg|jpeg|gif|xml|txt|svg)$ { - expires 14d; -} - -location ~* \.(woff|woff2|ttf|otf)$ { - access_log off; - expires 30d; -} - -location ~ /(app\/|conf[^\.]|include\/|local\/|locale\/|vendor\/) { - deny all; - return 404; -} - -location = /data/top_passwords.txt { - deny all; - return 404; -} - -location = /nginx-status { - access_log off; - allow 127.0.0.1; - allow ::1; - deny all; - stub_status; -} - -location ~ ^/(status|ping)$ { - access_log off; - - fastcgi_pass unix:/tmp/php-fpm.sock; - - fastcgi_param SCRIPT_FILENAME $webroot$fastcgi_script_name; - include fastcgi_params; -} - -location / { - try_files $uri $uri/ =404; -} - -location ~ [^/]\.php(/|$) { - fastcgi_split_path_info ^(.+\.php)(/.+)$; - set $path_info $fastcgi_path_info; - try_files $fastcgi_script_name =404; - - fastcgi_pass unix:/tmp/php-fpm.sock; - fastcgi_index {HTTP_INDEX_FILE}; - - fastcgi_param DOCUMENT_ROOT $webroot; - fastcgi_param SCRIPT_FILENAME $webroot$fastcgi_script_name; - fastcgi_param PATH_TRANSLATED $webroot$fastcgi_script_name; - fastcgi_param PATH_INFO $path_info; - - include fastcgi_params; - fastcgi_param QUERY_STRING $query_string; - fastcgi_param REQUEST_METHOD $request_method; - fastcgi_param CONTENT_TYPE $content_type; - fastcgi_param CONTENT_LENGTH $content_length; - - fastcgi_intercept_errors on; - fastcgi_ignore_client_abort off; - fastcgi_connect_timeout 60; - fastcgi_send_timeout 180; - fastcgi_read_timeout {FCGI_READ_TIMEOUT}; - fastcgi_buffer_size 128k; - fastcgi_buffers 4 256k; - fastcgi_busy_buffers_size 256k; - fastcgi_temp_file_write_size 256k; -} diff --git a/Dockerfiles/web-nginx-mysql/centos/conf/etc/nginx/includes/server-ssl.conf b/Dockerfiles/web-nginx-mysql/centos/conf/etc/nginx/includes/server-ssl.conf deleted file mode 100644 index 61c62354..00000000 --- a/Dockerfiles/web-nginx-mysql/centos/conf/etc/nginx/includes/server-ssl.conf +++ /dev/null @@ -1,17 +0,0 @@ -ssl_certificate /etc/ssl/nginx/ssl.crt; -ssl_certificate_key /etc/ssl/nginx/ssl.key; -ssl_dhparam /etc/ssl/nginx/dhparam.pem; - -ssl_session_timeout 1d; -ssl_session_cache shared:MozSSL:10m; -ssl_session_tickets off; - -# intermediate configuration -ssl_protocols TLSv1.2 TLSv1.3; -ssl_ciphers ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:DHE-RSA-CHACHA20-POLY1305; -ssl_prefer_server_ciphers off; - -# HSTS (ngx_http_headers_module is required) (63072000 seconds) -add_header Strict-Transport-Security "max-age=63072000" always; - -add_header Content-Security-Policy-Report-Only "default-src https:; script-src https: 'unsafe-eval' 'unsafe-inline'; style-src https: 'unsafe-inline'; img-src https: data:; font-src https: data:; report-uri /csp-report"; diff --git a/Dockerfiles/web-nginx-mysql/centos/conf/etc/nginx/nginx.conf b/Dockerfiles/web-nginx-mysql/centos/conf/etc/nginx/nginx.conf deleted file mode 100644 index 76021534..00000000 --- a/Dockerfiles/web-nginx-mysql/centos/conf/etc/nginx/nginx.conf +++ /dev/null @@ -1,71 +0,0 @@ -include /etc/nginx/includes/user.conf; - -worker_processes 5; -worker_rlimit_nofile 256000; - -error_log stderr error; - -pid /tmp/nginx.pid; - -events { - worker_connections 5120; - use epoll; -} - -http { - include /etc/nginx/mime.types; - default_type application/octet-stream; - - log_format main '$remote_addr - $remote_user [$time_local] "$request" ' - '$status $body_bytes_sent "$http_referer" ' - '"$http_user_agent" "$http_x_forwarded_for"'; - - include /etc/nginx/includes/access-log.conf; - error_log stderr error; - - client_body_temp_path /tmp/client_body 1 2; - proxy_temp_path /tmp/proxy 1 2; - fastcgi_temp_path /tmp/fastcgi 1 2; - uwsgi_temp_path /tmp/uwsgi 1 2; - scgi_temp_path /tmp/scgi 1 2; - - client_body_timeout 5m; - send_timeout 5m; - - connection_pool_size 4096; - client_header_buffer_size 4k; - large_client_header_buffers 4 4k; - request_pool_size 4k; - reset_timedout_connection on; - - - gzip on; - gzip_min_length 100; - gzip_buffers 4 8k; - gzip_comp_level 5; - gzip_types text/plain; - gzip_types application/x-javascript; - gzip_types text/css; - - output_buffers 128 512k; - postpone_output 1460; - aio on; - directio 512; - - sendfile on; - client_max_body_size 8m; - client_body_buffer_size 256k; - fastcgi_intercept_errors on; - - tcp_nopush on; - tcp_nodelay on; - - keepalive_timeout 75 20; - - ignore_invalid_headers on; - - index index.php; - server_tokens {EXPOSE_WEB_SERVER_INFO}; - - include /etc/nginx/conf.d/*.conf; -} diff --git a/Dockerfiles/web-nginx-mysql/centos/conf/etc/php-fpm.conf b/Dockerfiles/web-nginx-mysql/centos/conf/etc/php-fpm.conf deleted file mode 100644 index c3accf48..00000000 --- a/Dockerfiles/web-nginx-mysql/centos/conf/etc/php-fpm.conf +++ /dev/null @@ -1,10 +0,0 @@ -include=/etc/php-fpm.d/*.conf - -[global] - -pid = /tmp/php-fpm.pid - -error_log = /dev/fd/2 -log_level = notice - -daemonize = no diff --git a/Dockerfiles/web-nginx-mysql/centos/conf/etc/php-fpm.d/zabbix.conf b/Dockerfiles/web-nginx-mysql/centos/conf/etc/php-fpm.d/zabbix.conf deleted file mode 100644 index 4ee70ccd..00000000 --- a/Dockerfiles/web-nginx-mysql/centos/conf/etc/php-fpm.d/zabbix.conf +++ /dev/null @@ -1,39 +0,0 @@ -[zabbix] - -; https://www.php.net/manual/en/security.hiding.php -php_value[expose_php] = ${EXPOSE_WEB_SERVER_INFO} - -listen = /tmp/php-fpm.sock - -clear_env = no - -pm = ${PHP_FPM_PM} -pm.max_children = ${PHP_FPM_PM_MAX_CHILDREN} -pm.start_servers = ${PHP_FPM_PM_START_SERVERS} -pm.min_spare_servers = ${PHP_FPM_PM_MIN_SPARE_SERVERS} -pm.max_spare_servers = ${PHP_FPM_PM_MAX_SPARE_SERVERS} -pm.max_requests = ${PHP_FPM_PM_MAX_REQUESTS} - -slowlog = /dev/fd/1 - -php_admin_value[error_log] = /dev/fd/2 -php_admin_flag[log_errors] = on -catch_workers_output = yes - -php_value[session.save_handler] = files -php_value[session.save_path] = /var/lib/php/session - -php_value[max_execution_time] = ${ZBX_MAXEXECUTIONTIME} -php_value[memory_limit] = ${ZBX_MEMORYLIMIT} -php_value[post_max_size] = ${ZBX_POSTMAXSIZE} -php_value[upload_max_filesize] = ${ZBX_UPLOADMAXFILESIZE} -php_value[max_input_time] = ${ZBX_MAXINPUTTIME} -php_value[max_input_vars] = 10000 -php_value[date.timezone] = ${PHP_TZ} - -; PHP-FPM monitoring -pm.status_path = /status -ping.path = /ping - -; Set the socket equal to DB_SERVER_SOCKET set by user -php_value[mysqli.default_socket] = ${DB_SERVER_SOCKET} diff --git a/Dockerfiles/web-nginx-mysql/centos/conf/etc/zabbix/nginx.conf b/Dockerfiles/web-nginx-mysql/centos/conf/etc/zabbix/nginx.conf deleted file mode 100644 index 42d5aa2b..00000000 --- a/Dockerfiles/web-nginx-mysql/centos/conf/etc/zabbix/nginx.conf +++ /dev/null @@ -1,7 +0,0 @@ -server { - listen 8080; - include /etc/nginx/includes/listen-ipv6.conf; - - include /etc/nginx/includes/real-ip.conf; - include /etc/nginx/includes/server-common.conf; -} diff --git a/Dockerfiles/web-nginx-mysql/centos/conf/etc/zabbix/nginx_ssl.conf b/Dockerfiles/web-nginx-mysql/centos/conf/etc/zabbix/nginx_ssl.conf deleted file mode 100644 index 01fbf7b4..00000000 --- a/Dockerfiles/web-nginx-mysql/centos/conf/etc/zabbix/nginx_ssl.conf +++ /dev/null @@ -1,10 +0,0 @@ -server { - listen 8443 ssl; - include /etc/nginx/includes/listen-ipv6-ssl.conf; - - http2 on; - - include /etc/nginx/includes/real-ip.conf; - include /etc/nginx/includes/server-ssl.conf; - include /etc/nginx/includes/server-common.conf; -} diff --git a/Dockerfiles/web-nginx-mysql/ol/.dockerignore b/Dockerfiles/web-nginx-mysql/ol/.dockerignore deleted file mode 100644 index 88a84e55..00000000 --- a/Dockerfiles/web-nginx-mysql/ol/.dockerignore +++ /dev/null @@ -1 +0,0 @@ -build.sh diff --git a/Dockerfiles/web-nginx-mysql/ol/Dockerfile b/Dockerfiles/web-nginx-mysql/ol/Dockerfile deleted file mode 100644 index dfc2cdd9..00000000 --- a/Dockerfiles/web-nginx-mysql/ol/Dockerfile +++ /dev/null @@ -1,145 +0,0 @@ -# syntax=docker/dockerfile:1.6 -ARG OS_BASE_IMAGE=container-registry.oracle.com/os/oraclelinux:10-slim -ARG MAJOR_VERSION=7.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.12 -ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ol-${ZBX_VERSION} - -FROM ${BUILD_BASE_IMAGE} AS builder -FROM builder AS clean_builder - -ARG ZBX_VERSION - -RUN set -eux && \ - rm -rf \ - "/tmp/zabbix-${ZBX_VERSION}/ui/tests" \ - "/tmp/zabbix-${ZBX_VERSION}/ui/conf/zabbix.conf.php" \ - "/tmp/zabbix-${ZBX_VERSION}/ui/conf/zabbix.conf.php.example" \ - "/tmp/zabbix-${ZBX_VERSION}/ui/conf/maintenance.inc.php" && \ - find "/tmp/zabbix-${ZBX_VERSION}/ui/locale" -name '*.po' -delete && \ - find "/tmp/zabbix-${ZBX_VERSION}/ui/locale" -name '*.sh' -delete - -FROM ${OS_BASE_IMAGE} - -ARG MAJOR_VERSION -ARG ZBX_VERSION -ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git - -ENV TERM=xterm \ - ZBX_VERSION=${ZBX_VERSION} \ - ZBX_SOURCES=${ZBX_SOURCES} \ - ZABBIX_CONF_DIR=/etc/zabbix \ - ZABBIX_USER_HOME_DIR=/var/lib/zabbix \ - ZABBIX_WWW_ROOT=/usr/share/zabbix - -ENV DB_ENGINE=mysql \ - NGINX_BIN=/usr/sbin/nginx \ - PHP_FPM_BIN=/usr/sbin/php-fpm \ - NGINX_CONFD_DIR=/etc/nginx/conf.d \ - PHP_FPM_CONFIG=/etc/php-fpm.conf \ - PHP_ZBX_CONFIG_FILE=/etc/php-fpm.d/zabbix.conf - -LABEL org.opencontainers.image.authors="Alexey Pustovalov " \ - org.opencontainers.image.description="Zabbix web-interface based on Nginx web server with MySQL database support" \ - org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ - org.opencontainers.image.licenses="AGPL v3.0" \ - org.opencontainers.image.source="${ZBX_SOURCES}" \ - org.opencontainers.image.title="Zabbix web-interface (Nginx, MySQL)" \ - org.opencontainers.image.url="https://zabbix.com/" \ - org.opencontainers.image.vendor="Zabbix SIA" \ - org.opencontainers.image.version="${ZBX_VERSION}" - -STOPSIGNAL SIGTERM - -COPY --from=clean_builder /tmp/zabbix-${ZBX_VERSION}/ui ${ZABBIX_WWW_ROOT}/ -COPY --from=clean_builder /tmp/zabbix-${ZBX_VERSION}-output/web/conf ${ZABBIX_CONF_DIR}/web/ -COPY conf/etc/ /etc/ - -RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ - --mount=type=tmpfs,target=/var/cache/yum/ \ - set -eux && \ - INSTALL_PKGS="bash \ - curl \ - findutils \ - glibc-locale-source \ - gzip \ - jq \ - nginx \ - php-fpm \ - php-bcmath \ - php-curl \ - php-gd \ - php-json \ - php-ldap \ - php-mbstring \ - php-mysqlnd \ - php-xml \ - mysql8.4" && \ - microdnf -y install \ - --disablerepo="*" \ - --enablerepo="ol10_baseos_latest" \ - --enablerepo="ol10_appstream" \ - --setopt=install_weak_deps=0 \ - --setopt=keepcache=0 \ - --best \ - --nodocs \ - ${INSTALL_PKGS} && \ - groupadd \ - --system \ - --gid 1995 \ - zabbix && \ - useradd \ - --system \ - --comment "Zabbix monitoring system" \ - -g zabbix \ - --uid 1997 \ - --shell /sbin/nologin \ - --home-dir ${ZABBIX_USER_HOME_DIR} \ - zabbix && \ - mkdir -p ${ZABBIX_CONF_DIR} \ - ${ZABBIX_CONF_DIR}/web \ - ${ZABBIX_CONF_DIR}/web/certs \ - ${ZABBIX_USER_HOME_DIR}/enc \ - ${ZABBIX_USER_HOME_DIR}/enc_internal \ - /var/lib/php/session && \ - rm -rf /etc/nginx/conf.d/*.conf \ - /etc/php-fpm.d/www.conf && \ - ln -sf /dev/stdout /var/log/nginx/access.log && \ - ln -sf /dev/stderr /var/log/nginx/error.log && \ - ln -sf "${ZABBIX_CONF_DIR}/web/zabbix.conf.php" "${ZABBIX_WWW_ROOT}/conf/zabbix.conf.php" && \ - ln -sf "${ZABBIX_CONF_DIR}/web/maintenance.inc.php" "${ZABBIX_WWW_ROOT}/conf/maintenance.inc.php" && \ - awk "/display/ && /true/ {gsub(/^[ \t]+|[ \t]+$/, \"\", \$0); print \$0}" "${ZABBIX_WWW_ROOT}/include/locales.inc.php" | \ - cut -d"'" -f 2 | sort -u | \ - xargs -r -I '{}' bash -c 'echo "{}" && localedef -c -i {} -f UTF-8 {}.UTF-8 2>/dev/null' && \ - FIX_PERM_LIST="\ - ${ZABBIX_CONF_DIR}/ \ - ${ZABBIX_WWW_ROOT}/include/defines.inc.php \ - ${ZABBIX_WWW_ROOT}/modules/ \ - ${ZABBIX_USER_HOME_DIR}/ \ - /etc/nginx/ \ - /etc/php-fpm.d/ \ - /etc/php-fpm.conf \ - /var/log/nginx/ \ - /var/lib/php/session/" && \ - chown --quiet -R zabbix:0 ${FIX_PERM_LIST} && \ - chmod -R g=u ${FIX_PERM_LIST} && \ - microdnf -y remove \ - findutils \ - glibc-locale-source \ - gzip - -RUN --mount=from=entrypoints,target=/tmp/entrypoints,ro \ - set -eux && \ - install -d /usr/lib/docker-entrypoint && \ - install -m 0755 /tmp/entrypoints/web-nginx-mysql.sh /usr/bin/docker-entrypoint.sh && \ - install -m 0644 /tmp/entrypoints/lib/*.sh /usr/lib/docker-entrypoint/ - -HEALTHCHECK --interval=1m30s --timeout=3s --retries=3 --start-period=40s --start-interval=5s \ - CMD curl -f http://localhost:8080/ping || exit 1 - -EXPOSE 8080/tcp 8443/tcp - -WORKDIR ${ZABBIX_WWW_ROOT} - -USER 1997 - -ENTRYPOINT ["docker-entrypoint.sh"] diff --git a/Dockerfiles/web-nginx-mysql/ol/README.md b/Dockerfiles/web-nginx-mysql/ol/README.md deleted file mode 120000 index 32d46ee8..00000000 --- a/Dockerfiles/web-nginx-mysql/ol/README.md +++ /dev/null @@ -1 +0,0 @@ -../README.md \ No newline at end of file diff --git a/Dockerfiles/web-nginx-mysql/ol/build.sh b/Dockerfiles/web-nginx-mysql/ol/build.sh deleted file mode 120000 index 46b20313..00000000 --- a/Dockerfiles/web-nginx-mysql/ol/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../../build.sh \ No newline at end of file diff --git a/Dockerfiles/web-nginx-mysql/ol/conf/etc/nginx/includes/server-common.conf b/Dockerfiles/web-nginx-mysql/ol/conf/etc/nginx/includes/server-common.conf deleted file mode 100644 index b77386b5..00000000 --- a/Dockerfiles/web-nginx-mysql/ol/conf/etc/nginx/includes/server-common.conf +++ /dev/null @@ -1,105 +0,0 @@ -server_name zabbix; -index {HTTP_INDEX_FILE}; - -include /etc/nginx/includes/access-log.conf; -error_log stderr notice; - -set $webroot '/usr/share/zabbix'; - -root $webroot; - -large_client_header_buffers 8 8k; -client_max_body_size 10M; - -location = /favicon.ico { - log_not_found off; -} - -location = /robots.txt { - allow all; - log_not_found off; - access_log off; -} - -# Deny all attempts to access hidden files such as .htaccess, .htpasswd, .DS_Store (Mac). -location ~ /\. { - deny all; - access_log off; - log_not_found off; -} - -# caching of files -location ~* \.ico$ { - access_log off; - expires 1y; -} - -location ~* \.(js|css|png|jpg|jpeg|gif|xml|txt|svg)$ { - expires 14d; -} - -location ~* \.(woff|woff2|ttf|otf)$ { - access_log off; - expires 30d; -} - -location ~ /(app\/|conf[^\.]|include\/|local\/|locale\/|vendor\/) { - deny all; - return 404; -} - -location = /data/top_passwords.txt { - deny all; - return 404; -} - -location = /nginx-status { - access_log off; - allow 127.0.0.1; - allow ::1; - deny all; - stub_status; -} - -location ~ ^/(status|ping)$ { - access_log off; - - fastcgi_pass unix:/tmp/php-fpm.sock; - - fastcgi_param SCRIPT_FILENAME $webroot$fastcgi_script_name; - include fastcgi_params; -} - -location / { - try_files $uri $uri/ =404; -} - -location ~ [^/]\.php(/|$) { - fastcgi_split_path_info ^(.+\.php)(/.+)$; - set $path_info $fastcgi_path_info; - try_files $fastcgi_script_name =404; - - fastcgi_pass unix:/tmp/php-fpm.sock; - fastcgi_index {HTTP_INDEX_FILE}; - - fastcgi_param DOCUMENT_ROOT $webroot; - fastcgi_param SCRIPT_FILENAME $webroot$fastcgi_script_name; - fastcgi_param PATH_TRANSLATED $webroot$fastcgi_script_name; - fastcgi_param PATH_INFO $path_info; - - include fastcgi_params; - fastcgi_param QUERY_STRING $query_string; - fastcgi_param REQUEST_METHOD $request_method; - fastcgi_param CONTENT_TYPE $content_type; - fastcgi_param CONTENT_LENGTH $content_length; - - fastcgi_intercept_errors on; - fastcgi_ignore_client_abort off; - fastcgi_connect_timeout 60; - fastcgi_send_timeout 180; - fastcgi_read_timeout {FCGI_READ_TIMEOUT}; - fastcgi_buffer_size 128k; - fastcgi_buffers 4 256k; - fastcgi_busy_buffers_size 256k; - fastcgi_temp_file_write_size 256k; -} diff --git a/Dockerfiles/web-nginx-mysql/ol/conf/etc/nginx/includes/server-ssl.conf b/Dockerfiles/web-nginx-mysql/ol/conf/etc/nginx/includes/server-ssl.conf deleted file mode 100644 index 61c62354..00000000 --- a/Dockerfiles/web-nginx-mysql/ol/conf/etc/nginx/includes/server-ssl.conf +++ /dev/null @@ -1,17 +0,0 @@ -ssl_certificate /etc/ssl/nginx/ssl.crt; -ssl_certificate_key /etc/ssl/nginx/ssl.key; -ssl_dhparam /etc/ssl/nginx/dhparam.pem; - -ssl_session_timeout 1d; -ssl_session_cache shared:MozSSL:10m; -ssl_session_tickets off; - -# intermediate configuration -ssl_protocols TLSv1.2 TLSv1.3; -ssl_ciphers ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:DHE-RSA-CHACHA20-POLY1305; -ssl_prefer_server_ciphers off; - -# HSTS (ngx_http_headers_module is required) (63072000 seconds) -add_header Strict-Transport-Security "max-age=63072000" always; - -add_header Content-Security-Policy-Report-Only "default-src https:; script-src https: 'unsafe-eval' 'unsafe-inline'; style-src https: 'unsafe-inline'; img-src https: data:; font-src https: data:; report-uri /csp-report"; diff --git a/Dockerfiles/web-nginx-mysql/ol/conf/etc/nginx/nginx.conf b/Dockerfiles/web-nginx-mysql/ol/conf/etc/nginx/nginx.conf deleted file mode 100644 index 76021534..00000000 --- a/Dockerfiles/web-nginx-mysql/ol/conf/etc/nginx/nginx.conf +++ /dev/null @@ -1,71 +0,0 @@ -include /etc/nginx/includes/user.conf; - -worker_processes 5; -worker_rlimit_nofile 256000; - -error_log stderr error; - -pid /tmp/nginx.pid; - -events { - worker_connections 5120; - use epoll; -} - -http { - include /etc/nginx/mime.types; - default_type application/octet-stream; - - log_format main '$remote_addr - $remote_user [$time_local] "$request" ' - '$status $body_bytes_sent "$http_referer" ' - '"$http_user_agent" "$http_x_forwarded_for"'; - - include /etc/nginx/includes/access-log.conf; - error_log stderr error; - - client_body_temp_path /tmp/client_body 1 2; - proxy_temp_path /tmp/proxy 1 2; - fastcgi_temp_path /tmp/fastcgi 1 2; - uwsgi_temp_path /tmp/uwsgi 1 2; - scgi_temp_path /tmp/scgi 1 2; - - client_body_timeout 5m; - send_timeout 5m; - - connection_pool_size 4096; - client_header_buffer_size 4k; - large_client_header_buffers 4 4k; - request_pool_size 4k; - reset_timedout_connection on; - - - gzip on; - gzip_min_length 100; - gzip_buffers 4 8k; - gzip_comp_level 5; - gzip_types text/plain; - gzip_types application/x-javascript; - gzip_types text/css; - - output_buffers 128 512k; - postpone_output 1460; - aio on; - directio 512; - - sendfile on; - client_max_body_size 8m; - client_body_buffer_size 256k; - fastcgi_intercept_errors on; - - tcp_nopush on; - tcp_nodelay on; - - keepalive_timeout 75 20; - - ignore_invalid_headers on; - - index index.php; - server_tokens {EXPOSE_WEB_SERVER_INFO}; - - include /etc/nginx/conf.d/*.conf; -} diff --git a/Dockerfiles/web-nginx-mysql/ol/conf/etc/php-fpm.conf b/Dockerfiles/web-nginx-mysql/ol/conf/etc/php-fpm.conf deleted file mode 100644 index c3accf48..00000000 --- a/Dockerfiles/web-nginx-mysql/ol/conf/etc/php-fpm.conf +++ /dev/null @@ -1,10 +0,0 @@ -include=/etc/php-fpm.d/*.conf - -[global] - -pid = /tmp/php-fpm.pid - -error_log = /dev/fd/2 -log_level = notice - -daemonize = no diff --git a/Dockerfiles/web-nginx-mysql/ol/conf/etc/php-fpm.d/zabbix.conf b/Dockerfiles/web-nginx-mysql/ol/conf/etc/php-fpm.d/zabbix.conf deleted file mode 100644 index 4ee70ccd..00000000 --- a/Dockerfiles/web-nginx-mysql/ol/conf/etc/php-fpm.d/zabbix.conf +++ /dev/null @@ -1,39 +0,0 @@ -[zabbix] - -; https://www.php.net/manual/en/security.hiding.php -php_value[expose_php] = ${EXPOSE_WEB_SERVER_INFO} - -listen = /tmp/php-fpm.sock - -clear_env = no - -pm = ${PHP_FPM_PM} -pm.max_children = ${PHP_FPM_PM_MAX_CHILDREN} -pm.start_servers = ${PHP_FPM_PM_START_SERVERS} -pm.min_spare_servers = ${PHP_FPM_PM_MIN_SPARE_SERVERS} -pm.max_spare_servers = ${PHP_FPM_PM_MAX_SPARE_SERVERS} -pm.max_requests = ${PHP_FPM_PM_MAX_REQUESTS} - -slowlog = /dev/fd/1 - -php_admin_value[error_log] = /dev/fd/2 -php_admin_flag[log_errors] = on -catch_workers_output = yes - -php_value[session.save_handler] = files -php_value[session.save_path] = /var/lib/php/session - -php_value[max_execution_time] = ${ZBX_MAXEXECUTIONTIME} -php_value[memory_limit] = ${ZBX_MEMORYLIMIT} -php_value[post_max_size] = ${ZBX_POSTMAXSIZE} -php_value[upload_max_filesize] = ${ZBX_UPLOADMAXFILESIZE} -php_value[max_input_time] = ${ZBX_MAXINPUTTIME} -php_value[max_input_vars] = 10000 -php_value[date.timezone] = ${PHP_TZ} - -; PHP-FPM monitoring -pm.status_path = /status -ping.path = /ping - -; Set the socket equal to DB_SERVER_SOCKET set by user -php_value[mysqli.default_socket] = ${DB_SERVER_SOCKET} diff --git a/Dockerfiles/web-nginx-mysql/ol/conf/etc/zabbix/nginx.conf b/Dockerfiles/web-nginx-mysql/ol/conf/etc/zabbix/nginx.conf deleted file mode 100644 index 42d5aa2b..00000000 --- a/Dockerfiles/web-nginx-mysql/ol/conf/etc/zabbix/nginx.conf +++ /dev/null @@ -1,7 +0,0 @@ -server { - listen 8080; - include /etc/nginx/includes/listen-ipv6.conf; - - include /etc/nginx/includes/real-ip.conf; - include /etc/nginx/includes/server-common.conf; -} diff --git a/Dockerfiles/web-nginx-mysql/ol/conf/etc/zabbix/nginx_ssl.conf b/Dockerfiles/web-nginx-mysql/ol/conf/etc/zabbix/nginx_ssl.conf deleted file mode 100644 index 01fbf7b4..00000000 --- a/Dockerfiles/web-nginx-mysql/ol/conf/etc/zabbix/nginx_ssl.conf +++ /dev/null @@ -1,10 +0,0 @@ -server { - listen 8443 ssl; - include /etc/nginx/includes/listen-ipv6-ssl.conf; - - http2 on; - - include /etc/nginx/includes/real-ip.conf; - include /etc/nginx/includes/server-ssl.conf; - include /etc/nginx/includes/server-common.conf; -} diff --git a/Dockerfiles/web-nginx-mysql/rhel/.dockerignore b/Dockerfiles/web-nginx-mysql/rhel/.dockerignore deleted file mode 100644 index 88a84e55..00000000 --- a/Dockerfiles/web-nginx-mysql/rhel/.dockerignore +++ /dev/null @@ -1 +0,0 @@ -build.sh diff --git a/Dockerfiles/web-nginx-mysql/rhel/Dockerfile b/Dockerfiles/web-nginx-mysql/rhel/Dockerfile deleted file mode 100644 index 6b37ad5e..00000000 --- a/Dockerfiles/web-nginx-mysql/rhel/Dockerfile +++ /dev/null @@ -1,169 +0,0 @@ -# syntax=docker/dockerfile:1.6 -ARG OS_BASE_IMAGE=registry.access.redhat.com/ubi10/ubi-minimal:10.2 -ARG MAJOR_VERSION=7.4 -ARG RELEASE=12 -ARG ZBX_VERSION=${MAJOR_VERSION}.12 -ARG BUILD_BASE_IMAGE=zabbix-build-mysql:rhel-${ZBX_VERSION} - -FROM ${BUILD_BASE_IMAGE} AS builder -FROM builder AS clean_builder - -ARG ZBX_VERSION - -RUN set -eux && \ - rm -rf \ - "/tmp/zabbix-${ZBX_VERSION}/ui/tests" \ - "/tmp/zabbix-${ZBX_VERSION}/ui/conf/zabbix.conf.php" \ - "/tmp/zabbix-${ZBX_VERSION}/ui/conf/zabbix.conf.php.example" \ - "/tmp/zabbix-${ZBX_VERSION}/ui/conf/maintenance.inc.php" && \ - find "/tmp/zabbix-${ZBX_VERSION}/ui/locale" -name '*.po' -delete && \ - find "/tmp/zabbix-${ZBX_VERSION}/ui/locale" -name '*.sh' -delete - -FROM ${OS_BASE_IMAGE} - -ARG MAJOR_VERSION -ARG RELEASE -ARG ZBX_VERSION -ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git - -ENV TERM=xterm \ - ZBX_VERSION=${ZBX_VERSION} \ - ZBX_SOURCES=${ZBX_SOURCES} \ - ZABBIX_CONF_DIR=/etc/zabbix \ - ZABBIX_USER_HOME_DIR=/var/lib/zabbix \ - ZABBIX_WWW_ROOT=/usr/share/zabbix - -ENV DB_ENGINE=mysql \ - NGINX_BIN=/usr/sbin/nginx \ - PHP_FPM_BIN=/usr/sbin/php-fpm \ - NGINX_CONFD_DIR=/etc/nginx/conf.d \ - PHP_FPM_CONFIG=/etc/php-fpm.conf \ - PHP_ZBX_CONFIG_FILE=/etc/php-fpm.d/zabbix.conf - -LABEL description="Zabbix web-interface based on Nginx web server with MySQL database support" \ - maintainer="alexey.pustovalov@zabbix.com" \ - name="zabbix/zabbix-web-mysql-74" \ - 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-74:${ZBX_VERSION}" \ - summary="Zabbix web-interface based on Nginx web server with MySQL database support" \ - url="https://www.zabbix.com/" \ - vendor="Zabbix SIA" \ - version="${MAJOR_VERSION}" \ - io.k8s.description="Zabbix web-interface based on Nginx web server with MySQL database support" \ - io.k8s.display-name="Zabbix Frontend (Nginx)" \ - io.openshift.expose-services="8080:http,8443:https" \ - 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-74:${ZBX_VERSION}" \ - org.label-schema.license="AGPL v3.0" \ - org.label-schema.name="zabbix-web-mysql-rhel" \ - org.label-schema.schema-version="1.0" \ - org.label-schema.url="https://zabbix.com/" \ - org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ - org.label-schema.vcs-ref="${VCS_REF}" \ - org.label-schema.vcs-url="${ZBX_SOURCES}" \ - org.label-schema.vendor="Zabbix SIA" \ - org.label-schema.version="${ZBX_VERSION}" - -STOPSIGNAL SIGTERM - -COPY licenses /licenses/ -COPY --from=clean_builder /tmp/zabbix-${ZBX_VERSION}/ui ${ZABBIX_WWW_ROOT}/ -COPY --from=clean_builder /tmp/zabbix-${ZBX_VERSION}-output/web/conf ${ZABBIX_CONF_DIR}/web/ -COPY conf/etc/ /etc/ - -RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ - --mount=type=tmpfs,target=/var/cache/yum/ \ - set -eux && \ - INSTALL_PKGS="bash \ - curl-minimal \ - findutils \ - glibc-locale-source \ - gzip \ - jq \ - shadow-utils \ - tzdata \ - nginx \ - php-fpm \ - php-bcmath \ - php-curl \ - php-gd \ - php-json \ - php-ldap \ - php-mbstring \ - php-mysqlnd \ - php-xml \ - mysql8.4" && \ - ARCH_SUFFIX="$(arch)"; \ - microdnf -y install \ - --disablerepo="*" \ - --enablerepo="ubi-10-baseos-rpms" \ - --enablerepo="ubi-10-appstream-rpms" \ - --enablerepo="rhel-10-for-$ARCH_SUFFIX-baseos-rpms" \ - --enablerepo="rhel-10-for-$ARCH_SUFFIX-appstream-rpms" \ - --setopt=install_weak_deps=0 \ - --setopt=keepcache=0 \ - --best \ - --setopt=tsflags=nodocs \ - ${INSTALL_PKGS} && \ - groupadd \ - --system \ - --gid 1995 \ - zabbix && \ - useradd \ - --system \ - --comment "Zabbix monitoring system" \ - -g zabbix \ - --uid 1997 \ - --shell /sbin/nologin \ - --home-dir ${ZABBIX_USER_HOME_DIR} \ - zabbix && \ - mkdir -p ${ZABBIX_CONF_DIR} \ - ${ZABBIX_CONF_DIR}/web \ - ${ZABBIX_CONF_DIR}/web/certs \ - ${ZABBIX_USER_HOME_DIR}/enc \ - ${ZABBIX_USER_HOME_DIR}/enc_internal \ - /var/lib/php/session && \ - rm -rf /etc/nginx/conf.d/*.conf \ - /etc/php-fpm.d/www.conf && \ - ln -sf /dev/stdout /var/log/nginx/access.log && \ - ln -sf /dev/stderr /var/log/nginx/error.log && \ - ln -sf "${ZABBIX_CONF_DIR}/web/zabbix.conf.php" "${ZABBIX_WWW_ROOT}/conf/zabbix.conf.php" && \ - ln -sf "${ZABBIX_CONF_DIR}/web/maintenance.inc.php" "${ZABBIX_WWW_ROOT}/conf/maintenance.inc.php" && \ - awk "/display/ && /true/ {gsub(/^[ \t]+|[ \t]+$/, \"\", \$0); print \$0}" "${ZABBIX_WWW_ROOT}/include/locales.inc.php" | \ - cut -d"'" -f 2 | sort -u | \ - xargs -r -I '{}' bash -c 'echo "{}" && localedef -c -i {} -f UTF-8 {}.UTF-8 2>/dev/null' && \ - FIX_PERM_LIST="\ - ${ZABBIX_CONF_DIR}/ \ - ${ZABBIX_WWW_ROOT}/include/defines.inc.php \ - ${ZABBIX_WWW_ROOT}/modules/ \ - ${ZABBIX_USER_HOME_DIR}/ \ - /etc/nginx/ \ - /etc/php-fpm.d/ \ - /etc/php-fpm.conf \ - /var/log/nginx/ \ - /var/lib/php/session/" && \ - chown --quiet -R zabbix:0 ${FIX_PERM_LIST} && \ - chmod -R g=u ${FIX_PERM_LIST} && \ - microdnf -y remove \ - findutils \ - glibc-locale-source \ - gzip - -RUN --mount=from=entrypoints,target=/tmp/entrypoints,ro \ - set -eux && \ - install -d /usr/lib/docker-entrypoint && \ - install -m 0755 /tmp/entrypoints/web-nginx-mysql.sh /usr/bin/docker-entrypoint.sh && \ - install -m 0644 /tmp/entrypoints/lib/*.sh /usr/lib/docker-entrypoint/ - -HEALTHCHECK --interval=1m30s --timeout=3s --retries=3 --start-period=40s --start-interval=5s \ - CMD curl -f http://localhost:8080/ping || exit 1 - -EXPOSE 8080/tcp 8443/tcp - -WORKDIR ${ZABBIX_WWW_ROOT} - -USER 1997 - -ENTRYPOINT ["docker-entrypoint.sh"] diff --git a/Dockerfiles/web-nginx-mysql/rhel/README.html b/Dockerfiles/web-nginx-mysql/rhel/README.html deleted file mode 100644 index 5d5c501e..00000000 --- a/Dockerfiles/web-nginx-mysql/rhel/README.html +++ /dev/null @@ -1,199 +0,0 @@ -

What is Zabbix?

-

Zabbix is an enterprise-class open source distributed monitoring solution.

-

Zabbix is software that monitors numerous parameters of a network and the health and integrity of servers. Zabbix uses a flexible notification mechanism that allows users to configure e-mail based alerts for virtually any event. This allows a fast reaction to server problems. Zabbix offers excellent reporting and data visualisation features based on the stored data. This makes Zabbix ideal for capacity planning.

-

For more information and related downloads for Zabbix components, please visit zabbix.com

-

What is Zabbix web interface?

-

Zabbix web interface is a part of Zabbix software. It is used to manage resources under monitoring and view monitoring statistics.

-

Zabbix web interface images

-

Images are updated when new releases are published.

-

Zabbix web interface available in four editions:

-
    -
  • Zabbix web-interface based on Apache2 web server with MySQL database support
    • -
  • Zabbix web-interface based on Apache2 web server with PostgreSQL database support
    • -
  • Zabbix web-interface based on Nginx web server with MySQL database support
    • -
  • Zabbix web-interface based on Nginx web server with PostgreSQL database support
    • -
-

The image based on Nginx web server with MySQL database support.

-

How to use this image

-

Start zabbix-web-nginx-mysql

-

Start a Zabbix web-interface container as follows:

-
podman run \
-    --name some-zabbix-web-nginx-mysql \
-    -e DB_SERVER_HOST="some-mysql-server" \
-    -e MYSQL_USER="some-user" \
-    -e MYSQL_PASSWORD="some-password" \
-    -e ZBX_SERVER_HOST="some-zabbix-server" \
-    -e PHP_TZ="some-timezone" \
-    -d registry.connect.redhat.com/zabbix/zabbix-web-mysql-74:tag
-
-

Where some-zabbix-web-nginx-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, some-zabbix-server is IP or DNS name of Zabbix server or proxy, some-timezone is PHP like timezone name and tag is the tag specifying the version you want.

-

Linking the container to Zabbix server

-
podman run \
-    --name some-zabbix-web-nginx-mysql \
-    --link some-zabbix-server:zabbix-server \
-    -e DB_SERVER_HOST="some-mysql-server" \
-    -e MYSQL_USER="some-user" \
-    -e MYSQL_PASSWORD="some-password" \
-    -e ZBX_SERVER_HOST="some-zabbix-server" \
-    -e PHP_TZ="some-timezone" \
-    -d registry.connect.redhat.com/zabbix/zabbix-web-mysql-74:tag
-
-

Linking the container to MySQL database

-
podman run \
-    --name some-zabbix-web-nginx-mysql \
-    --link some-mysql-server:mysql \
-    -e DB_SERVER_HOST="some-mysql-server" \
-    -e MYSQL_USER="some-user" \
-    -e MYSQL_PASSWORD="some-password" \
-    -e ZBX_SERVER_HOST="some-zabbix-server" \
-    -e PHP_TZ="some-timezone" \
-    -d registry.connect.redhat.com/zabbix/zabbix-web-mysql-74:tag
-
-

Container shell access and viewing Zabbix web interface logs

-

The podman exec command allows you to run commands inside a Podman container. The following command line will give you a bash shell inside your zabbix-web-nginx-mysql container:

-
$ podman exec -ti some-zabbix-web-nginx-mysql /bin/bash
-
-

The Zabbix web interface log is available through Podman's container log:

-
$ podman logs  some-zabbix-web-nginx-mysql
-
-

Environment Variables

-

When you start the zabbix-web-nginx-mysql image, you can adjust the configuration of the Zabbix web interface by passing one or more environment variables on the podman run command line.

-

ZBX_SERVER_HOST

-

This variable is IP or DNS name of Zabbix server. By default, value is zabbix-server.

-

ZBX_SERVER_PORT

-

This variable is port Zabbix server listening on. By default, value is 10051.

-

DB_SERVER_HOST

-

This variable is IP or DNS name of MySQL server. By default, value is 'mysql-server'

-

DB_SERVER_PORT

-

This variable is port of MySQL server. By default, value is '3306'.

-

MYSQL_USER, MYSQL_PASSWORD, MYSQL_USER_FILE, MYSQL_PASSWORD_FILE

-

These variables are used by Zabbix web-interface to connect to Zabbix database. With the _FILE variables you can instead provide the path to a file which contains the user / the password instead. When secrets are not managed by an orchestrator, you also have to mount the files. Those are exclusive so you can just provide one type - either MYSQL_USER or MYSQL_USER_FILE!

-
podman run \
-    --name some-zabbix-web-nginx-mysql \
-    -e DB_SERVER_HOST="some-mysql-server" \
-    -v ./.MYSQL_USER:/run/secrets/MYSQL_USER \
-    -e MYSQL_USER_FILE=/run/secrets/MYSQL_USER \
-    -v ./.MYSQL_PASSWORD:/run/secrets/MYSQL_PASSWORD \
-    -e MYSQL_PASSWORD_FILE=/var/run/secrets/MYSQL_PASSWORD \
-    -e PHP_TZ="some-timezone" \
-    -d registry.connect.redhat.com/zabbix/zabbix-web-mysql-74:tag
-
-

Podman secrets can be used to avoid exposing credentials in the command line:

-
printf "zabbix" | podman secret create MYSQL_USER -
-printf "zabbix" | podman secret create MYSQL_PASSWORD -
-podman run \
-    --name some-zabbix-web-nginx-mysql \
-    -e DB_SERVER_HOST="some-mysql-server" \
-    -e MYSQL_USER_FILE=/run/secrets/MYSQL_USER \
-    -e MYSQL_PASSWORD_FILE=/run/secrets/MYSQL_PASSWORD \
-    -e ZBX_SERVER_HOST="some-zabbix-server" \
-    -e PHP_TZ="some-timezone" \
-    -d registry.connect.redhat.com/zabbix/zabbix-web-mysql-74:tag
-
-

By default, values for MYSQL_USER and MYSQL_PASSWORD are zabbix, zabbix.

-

MYSQL_DATABASE

-

The variable is Zabbix database name. By default, value is zabbix.

-

ZBX_HISTORYSTORAGEURL

-

History storage HTTP[S] URL. This parameter is used for Elasticsearch setup. Available since 3.4.5.

-

ZBX_HISTORYSTORAGETYPES

-

Array of value types to be sent to the history storage. An example: ['uint', 'dbl']. This parameter is used for Elasticsearch setup. Available since 3.4.5.

-

PHP_TZ

-

The variable is timezone in PHP format. Full list of supported timezones are available on php.net. By default, value is 'Europe/Riga' and system timezone since Zabbix 5.2.0.

-

ZBX_SERVER_NAME

-

The variable is visible Zabbix installation name in right or left top corner of the web interface.

-

DB_DOUBLE_IEEE754

-

Use IEEE754 compatible value range for 64-bit Numeric (float) history values. Available since 5.0.0. Enabled by default.

-

ENABLE_WEB_ACCESS_LOG

-

The variable sets the Access Log directive for Web server. By default, value corresponds to standard output.

-

HTTP_INDEX_FILE

-

The variable controls default index page. By default, index.php.

-

EXPOSE_WEB_SERVER_INFO

-

The variable allows to hide Web server and PHP versions. By default, on.

-

ZBX_MAXEXECUTIONTIME

-

The variable is PHP max_execution_time option. By default, value is 300.

-

ZBX_MEMORYLIMIT

-

The variable is PHP memory_limit option. By default, value is 128M.

-

ZBX_POSTMAXSIZE

-

The variable is PHP post_max_size option. By default, value is 16M.

-

ZBX_UPLOADMAXFILESIZE

-

The variable is PHP upload_max_filesize option. By default, value is 2M.

-

ZBX_MAXINPUTTIME

-

The variable is PHP max_input_time option. By default, value is 300.

-

ZBX_SESSION_NAME

-

The variable is Zabbix frontend definition. String used as the name of the Zabbix frontend session cookie. By default, value is zbx_sessionid.

-

ZBX_DENY_GUI_ACCESS

-

Enable (true) maintenance mode for Zabbix web-interface.

-

ZBX_GUI_ACCESS_IP_RANGE

-

Array of IP addresses which are allowed for accessing to Zabbix web-interface during maintenance period.

-

ZBX_GUI_WARNING_MSG

-

Information message about maintenance period for Zabbix web-interface.

-

ZBX_DB_ENCRYPTION

-

The variable allows to activate encryption for connections to Zabbix database. Even if no other environment variables are specified, connections will be TLS-encrypted if ZBX_DB_ENCRYPTION=true specified. Available since 5.0.0. Disabled by default.

-

ZBX_DB_KEY_FILE

-

The variable allows to specify the full path to a valid TLS key file. Available since 5.0.0.

-

ZBX_DB_CERT_FILE

-

The variable allows to specify the full path to a valid TLS certificate file. Available since 5.0.0.

-

ZBX_DB_CA_FILE

-

The variable allows to specify the full path to a valid TLS certificate authority file. Available since 5.0.0.

-

ZBX_DB_VERIFY_HOST

-

The variable allows to activate host verification. Available since 5.0.0.

-

ZBX_DB_CIPHER_LIST

-

The variable allows to specify a custom list of valid ciphers. The format of the cipher list must conform to the OpenSSL standard. Available since 5.0.0.

-

ZBX_SSO_SP_KEY

-

The variable allows to specify a custom file path to the Service Provider (SP) private key file.

-

ZBX_SSO_SP_CERT

-

The variable allows to specify a custom file path to the Service Provider (SP) cert file.

-

ZBX_SSO_IDP_CERT

-

The variable allows to specify a custom file path to the SAML Certificate provided by the Identity Provider (ID) file.

-

ZBX_SSO_SETTINGS

-

The variable allows to specify custom SSO settings in JSON format. Available since 5.0.0.

-

Example of YAML Mapping to Sequences

-
....
-  environment:
-    ZBX_SSO_SETTINGS: "{'baseurl': 'https://zabbix.example.com', 'use_proxy_headers': true, 'strict': false}"
-    ....
-....
-
-

ZBX_ALLOW_HTTP_AUTH

-

The variable allows to disable user HTTP authentication.

-

Other variables

-

Additionally the image allows to specify many other environment variables listed below:

-
ZBX_VAULT=HashiCorp # Allowed values: HashiCorp, CyberArk. Required when Vault is used. Available since 6.2.0
-ZBX_VAULTDBPATH= # Available since 5.2.0
-ZBX_VAULTURL=https://127.0.0.1:8200 # Available since 5.2.0
-VAULT_TOKEN= # Available since 5.2.0
-ZBX_VAULTPREFIX= # Available since 7.0.0
-ZBX_VAULTCERTFILE= # Available since 6.2.0
-ZBX_VAULTKEYFILE= # Available since 6.2.0
-ZBX_VAULTCACHE=false # Available since 6.2.0
-
-ZBX_SERVER_TLS_ACTIVE=false # Available since 7.4.0
-ZBX_SERVER_TLS_CAFILE= # Available since 7.4.0
-ZBX_SERVER_TLS_CA= # Available since 7.4.0
-ZBX_SERVER_TLS_KEYFILE= # Available since 7.4.0
-ZBX_SERVER_TLS_KEY= # Available since 7.4.0
-ZBX_SERVER_TLS_CERTFILE= # Available since 7.4.0
-ZBX_SERVER_TLS_CERT= # Available since 7.4.0
-ZBX_SERVER_TLS_CERT_ISSUER= # Available since 7.4.0
-ZBX_SERVER_TLS_CERT_SUBJECT= # Available since 7.4.0
-
-Allowed PHP-FPM configuration options:
-PHP_FPM_PM=dynamic
-PHP_FPM_PM_MAX_CHILDREN=50
-PHP_FPM_PM_START_SERVERS=5
-PHP_FPM_PM_MIN_SPARE_SERVERS=5
-PHP_FPM_PM_MAX_SPARE_SERVERS=35
-PHP_FPM_PM_MAX_REQUESTS=0
-
-Allowed Nginx configuration options:
-WEB_REAL_IP_FROM=
-WEB_REAL_IP_HEADER=
-
-

Allowed volumes for the Zabbix web interface container

-

/etc/ssl/nginx

-

The volume allows to enable HTTPS for the Zabbix web interface. The volume must contain three files ssl.crt, ssl.key and dhparam.pem prepared for Nginx SSL connections.

-

Please follow official Nginx documentation to get more details about how to create certificate files.

-

/etc/zabbix/web/certs

-

The volume allows to use custom certificates for SAML authentication. The volume must contain three files sp.key, sp.crt and idp.crt. Available since 5.0.0.

-

/var/lib/zabbix/enc

-

The volume is used to store TLS related files. These file names are specified using ZBX_SERVER_TLS_CAFILE, ZBX_SERVER_TLS_KEYFILE and ZBX_SERVER_TLS_CERTFILE variables. Additionally it is possible to use environment variables ZBX_SERVER_TLS_CA, ZBX_SERVER_TLS_KEY and ZBX_SERVER_TLS_CERT with plaintext values. Available since 7.4.0.

diff --git a/Dockerfiles/web-nginx-mysql/rhel/build.sh b/Dockerfiles/web-nginx-mysql/rhel/build.sh deleted file mode 120000 index 46b20313..00000000 --- a/Dockerfiles/web-nginx-mysql/rhel/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../../build.sh \ No newline at end of file diff --git a/Dockerfiles/web-nginx-mysql/rhel/conf/etc/nginx/includes/server-common.conf b/Dockerfiles/web-nginx-mysql/rhel/conf/etc/nginx/includes/server-common.conf deleted file mode 100644 index b77386b5..00000000 --- a/Dockerfiles/web-nginx-mysql/rhel/conf/etc/nginx/includes/server-common.conf +++ /dev/null @@ -1,105 +0,0 @@ -server_name zabbix; -index {HTTP_INDEX_FILE}; - -include /etc/nginx/includes/access-log.conf; -error_log stderr notice; - -set $webroot '/usr/share/zabbix'; - -root $webroot; - -large_client_header_buffers 8 8k; -client_max_body_size 10M; - -location = /favicon.ico { - log_not_found off; -} - -location = /robots.txt { - allow all; - log_not_found off; - access_log off; -} - -# Deny all attempts to access hidden files such as .htaccess, .htpasswd, .DS_Store (Mac). -location ~ /\. { - deny all; - access_log off; - log_not_found off; -} - -# caching of files -location ~* \.ico$ { - access_log off; - expires 1y; -} - -location ~* \.(js|css|png|jpg|jpeg|gif|xml|txt|svg)$ { - expires 14d; -} - -location ~* \.(woff|woff2|ttf|otf)$ { - access_log off; - expires 30d; -} - -location ~ /(app\/|conf[^\.]|include\/|local\/|locale\/|vendor\/) { - deny all; - return 404; -} - -location = /data/top_passwords.txt { - deny all; - return 404; -} - -location = /nginx-status { - access_log off; - allow 127.0.0.1; - allow ::1; - deny all; - stub_status; -} - -location ~ ^/(status|ping)$ { - access_log off; - - fastcgi_pass unix:/tmp/php-fpm.sock; - - fastcgi_param SCRIPT_FILENAME $webroot$fastcgi_script_name; - include fastcgi_params; -} - -location / { - try_files $uri $uri/ =404; -} - -location ~ [^/]\.php(/|$) { - fastcgi_split_path_info ^(.+\.php)(/.+)$; - set $path_info $fastcgi_path_info; - try_files $fastcgi_script_name =404; - - fastcgi_pass unix:/tmp/php-fpm.sock; - fastcgi_index {HTTP_INDEX_FILE}; - - fastcgi_param DOCUMENT_ROOT $webroot; - fastcgi_param SCRIPT_FILENAME $webroot$fastcgi_script_name; - fastcgi_param PATH_TRANSLATED $webroot$fastcgi_script_name; - fastcgi_param PATH_INFO $path_info; - - include fastcgi_params; - fastcgi_param QUERY_STRING $query_string; - fastcgi_param REQUEST_METHOD $request_method; - fastcgi_param CONTENT_TYPE $content_type; - fastcgi_param CONTENT_LENGTH $content_length; - - fastcgi_intercept_errors on; - fastcgi_ignore_client_abort off; - fastcgi_connect_timeout 60; - fastcgi_send_timeout 180; - fastcgi_read_timeout {FCGI_READ_TIMEOUT}; - fastcgi_buffer_size 128k; - fastcgi_buffers 4 256k; - fastcgi_busy_buffers_size 256k; - fastcgi_temp_file_write_size 256k; -} diff --git a/Dockerfiles/web-nginx-mysql/rhel/conf/etc/nginx/includes/server-ssl.conf b/Dockerfiles/web-nginx-mysql/rhel/conf/etc/nginx/includes/server-ssl.conf deleted file mode 100644 index 61c62354..00000000 --- a/Dockerfiles/web-nginx-mysql/rhel/conf/etc/nginx/includes/server-ssl.conf +++ /dev/null @@ -1,17 +0,0 @@ -ssl_certificate /etc/ssl/nginx/ssl.crt; -ssl_certificate_key /etc/ssl/nginx/ssl.key; -ssl_dhparam /etc/ssl/nginx/dhparam.pem; - -ssl_session_timeout 1d; -ssl_session_cache shared:MozSSL:10m; -ssl_session_tickets off; - -# intermediate configuration -ssl_protocols TLSv1.2 TLSv1.3; -ssl_ciphers ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:DHE-RSA-CHACHA20-POLY1305; -ssl_prefer_server_ciphers off; - -# HSTS (ngx_http_headers_module is required) (63072000 seconds) -add_header Strict-Transport-Security "max-age=63072000" always; - -add_header Content-Security-Policy-Report-Only "default-src https:; script-src https: 'unsafe-eval' 'unsafe-inline'; style-src https: 'unsafe-inline'; img-src https: data:; font-src https: data:; report-uri /csp-report"; diff --git a/Dockerfiles/web-nginx-mysql/rhel/conf/etc/nginx/nginx.conf b/Dockerfiles/web-nginx-mysql/rhel/conf/etc/nginx/nginx.conf deleted file mode 100644 index 76021534..00000000 --- a/Dockerfiles/web-nginx-mysql/rhel/conf/etc/nginx/nginx.conf +++ /dev/null @@ -1,71 +0,0 @@ -include /etc/nginx/includes/user.conf; - -worker_processes 5; -worker_rlimit_nofile 256000; - -error_log stderr error; - -pid /tmp/nginx.pid; - -events { - worker_connections 5120; - use epoll; -} - -http { - include /etc/nginx/mime.types; - default_type application/octet-stream; - - log_format main '$remote_addr - $remote_user [$time_local] "$request" ' - '$status $body_bytes_sent "$http_referer" ' - '"$http_user_agent" "$http_x_forwarded_for"'; - - include /etc/nginx/includes/access-log.conf; - error_log stderr error; - - client_body_temp_path /tmp/client_body 1 2; - proxy_temp_path /tmp/proxy 1 2; - fastcgi_temp_path /tmp/fastcgi 1 2; - uwsgi_temp_path /tmp/uwsgi 1 2; - scgi_temp_path /tmp/scgi 1 2; - - client_body_timeout 5m; - send_timeout 5m; - - connection_pool_size 4096; - client_header_buffer_size 4k; - large_client_header_buffers 4 4k; - request_pool_size 4k; - reset_timedout_connection on; - - - gzip on; - gzip_min_length 100; - gzip_buffers 4 8k; - gzip_comp_level 5; - gzip_types text/plain; - gzip_types application/x-javascript; - gzip_types text/css; - - output_buffers 128 512k; - postpone_output 1460; - aio on; - directio 512; - - sendfile on; - client_max_body_size 8m; - client_body_buffer_size 256k; - fastcgi_intercept_errors on; - - tcp_nopush on; - tcp_nodelay on; - - keepalive_timeout 75 20; - - ignore_invalid_headers on; - - index index.php; - server_tokens {EXPOSE_WEB_SERVER_INFO}; - - include /etc/nginx/conf.d/*.conf; -} diff --git a/Dockerfiles/web-nginx-mysql/rhel/conf/etc/php-fpm.conf b/Dockerfiles/web-nginx-mysql/rhel/conf/etc/php-fpm.conf deleted file mode 100644 index c3accf48..00000000 --- a/Dockerfiles/web-nginx-mysql/rhel/conf/etc/php-fpm.conf +++ /dev/null @@ -1,10 +0,0 @@ -include=/etc/php-fpm.d/*.conf - -[global] - -pid = /tmp/php-fpm.pid - -error_log = /dev/fd/2 -log_level = notice - -daemonize = no diff --git a/Dockerfiles/web-nginx-mysql/rhel/conf/etc/php-fpm.d/zabbix.conf b/Dockerfiles/web-nginx-mysql/rhel/conf/etc/php-fpm.d/zabbix.conf deleted file mode 100644 index 4ee70ccd..00000000 --- a/Dockerfiles/web-nginx-mysql/rhel/conf/etc/php-fpm.d/zabbix.conf +++ /dev/null @@ -1,39 +0,0 @@ -[zabbix] - -; https://www.php.net/manual/en/security.hiding.php -php_value[expose_php] = ${EXPOSE_WEB_SERVER_INFO} - -listen = /tmp/php-fpm.sock - -clear_env = no - -pm = ${PHP_FPM_PM} -pm.max_children = ${PHP_FPM_PM_MAX_CHILDREN} -pm.start_servers = ${PHP_FPM_PM_START_SERVERS} -pm.min_spare_servers = ${PHP_FPM_PM_MIN_SPARE_SERVERS} -pm.max_spare_servers = ${PHP_FPM_PM_MAX_SPARE_SERVERS} -pm.max_requests = ${PHP_FPM_PM_MAX_REQUESTS} - -slowlog = /dev/fd/1 - -php_admin_value[error_log] = /dev/fd/2 -php_admin_flag[log_errors] = on -catch_workers_output = yes - -php_value[session.save_handler] = files -php_value[session.save_path] = /var/lib/php/session - -php_value[max_execution_time] = ${ZBX_MAXEXECUTIONTIME} -php_value[memory_limit] = ${ZBX_MEMORYLIMIT} -php_value[post_max_size] = ${ZBX_POSTMAXSIZE} -php_value[upload_max_filesize] = ${ZBX_UPLOADMAXFILESIZE} -php_value[max_input_time] = ${ZBX_MAXINPUTTIME} -php_value[max_input_vars] = 10000 -php_value[date.timezone] = ${PHP_TZ} - -; PHP-FPM monitoring -pm.status_path = /status -ping.path = /ping - -; Set the socket equal to DB_SERVER_SOCKET set by user -php_value[mysqli.default_socket] = ${DB_SERVER_SOCKET} diff --git a/Dockerfiles/web-nginx-mysql/rhel/conf/etc/zabbix/nginx.conf b/Dockerfiles/web-nginx-mysql/rhel/conf/etc/zabbix/nginx.conf deleted file mode 100644 index 42d5aa2b..00000000 --- a/Dockerfiles/web-nginx-mysql/rhel/conf/etc/zabbix/nginx.conf +++ /dev/null @@ -1,7 +0,0 @@ -server { - listen 8080; - include /etc/nginx/includes/listen-ipv6.conf; - - include /etc/nginx/includes/real-ip.conf; - include /etc/nginx/includes/server-common.conf; -} diff --git a/Dockerfiles/web-nginx-mysql/rhel/conf/etc/zabbix/nginx_ssl.conf b/Dockerfiles/web-nginx-mysql/rhel/conf/etc/zabbix/nginx_ssl.conf deleted file mode 100644 index 01fbf7b4..00000000 --- a/Dockerfiles/web-nginx-mysql/rhel/conf/etc/zabbix/nginx_ssl.conf +++ /dev/null @@ -1,10 +0,0 @@ -server { - listen 8443 ssl; - include /etc/nginx/includes/listen-ipv6-ssl.conf; - - http2 on; - - include /etc/nginx/includes/real-ip.conf; - include /etc/nginx/includes/server-ssl.conf; - include /etc/nginx/includes/server-common.conf; -} diff --git a/Dockerfiles/web-nginx-mysql/rhel/licenses/AGPL-v3.0.txt b/Dockerfiles/web-nginx-mysql/rhel/licenses/AGPL-v3.0.txt deleted file mode 100644 index be3f7b28..00000000 --- a/Dockerfiles/web-nginx-mysql/rhel/licenses/AGPL-v3.0.txt +++ /dev/null @@ -1,661 +0,0 @@ - GNU AFFERO GENERAL PUBLIC LICENSE - Version 3, 19 November 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU Affero General Public License is a free, copyleft license for -software and other kinds of works, specifically designed to ensure -cooperation with the community in the case of network server software. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -our General Public Licenses are intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - Developers that use our General Public Licenses protect your rights -with two steps: (1) assert copyright on the software, and (2) offer -you this License which gives you legal permission to copy, distribute -and/or modify the software. - - A secondary benefit of defending all users' freedom is that -improvements made in alternate versions of the program, if they -receive widespread use, become available for other developers to -incorporate. Many developers of free software are heartened and -encouraged by the resulting cooperation. However, in the case of -software used on network servers, this result may fail to come about. -The GNU General Public License permits making a modified version and -letting the public access it on a server without ever releasing its -source code to the public. - - The GNU Affero General Public License is designed specifically to -ensure that, in such cases, the modified source code becomes available -to the community. It requires the operator of a network server to -provide the source code of the modified version running there to the -users of that server. Therefore, public use of a modified version, on -a publicly accessible server, gives the public access to the source -code of the modified version. - - An older license, called the Affero General Public License and -published by Affero, was designed to accomplish similar goals. This is -a different license, not a version of the Affero GPL, but Affero has -released a new version of the Affero GPL which permits relicensing under -this license. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU Affero General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Remote Network Interaction; Use with the GNU General Public License. - - Notwithstanding any other provision of this License, if you modify the -Program, your modified version must prominently offer all users -interacting with it remotely through a computer network (if your version -supports such interaction) an opportunity to receive the Corresponding -Source of your version by providing access to the Corresponding Source -from a network server at no charge, through some standard or customary -means of facilitating copying of software. This Corresponding Source -shall include the Corresponding Source for any work covered by version 3 -of the GNU General Public License that is incorporated pursuant to the -following paragraph. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the work with which it is combined will remain governed by version -3 of the GNU General Public License. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU Affero General Public License from time to time. Such new versions -will be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU Affero General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU Affero General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU Affero General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Affero General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Affero General Public License for more details. - - You should have received a copy of the GNU Affero General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If your software can interact with users remotely through a computer -network, you should also make sure that it provides a way for users to -get its source. For example, if your program is a web application, its -interface could display a "Source" link that leads users to an archive -of the code. There are many ways you could offer source, and different -solutions will be better for different programs; see section 13 for the -specific requirements. - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU AGPL, see -. diff --git a/Dockerfiles/web-nginx-mysql/ubuntu/.dockerignore b/Dockerfiles/web-nginx-mysql/ubuntu/.dockerignore deleted file mode 100644 index 88a84e55..00000000 --- a/Dockerfiles/web-nginx-mysql/ubuntu/.dockerignore +++ /dev/null @@ -1 +0,0 @@ -build.sh diff --git a/Dockerfiles/web-nginx-mysql/ubuntu/Dockerfile b/Dockerfiles/web-nginx-mysql/ubuntu/Dockerfile deleted file mode 100644 index 6b548ec0..00000000 --- a/Dockerfiles/web-nginx-mysql/ubuntu/Dockerfile +++ /dev/null @@ -1,148 +0,0 @@ -# syntax=docker/dockerfile:1.6 -ARG OS_BASE_IMAGE=ubuntu:resolute -ARG MAJOR_VERSION=7.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.12 -ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION} - -FROM ${BUILD_BASE_IMAGE} AS builder -FROM builder AS clean_builder - -ARG ZBX_VERSION - -RUN set -eux && \ - rm -rf \ - "/tmp/zabbix-${ZBX_VERSION}/ui/tests" \ - "/tmp/zabbix-${ZBX_VERSION}/ui/conf/zabbix.conf.php" \ - "/tmp/zabbix-${ZBX_VERSION}/ui/conf/zabbix.conf.php.example" \ - "/tmp/zabbix-${ZBX_VERSION}/ui/conf/maintenance.inc.php" && \ - find "/tmp/zabbix-${ZBX_VERSION}/ui/locale" -name '*.po' -delete && \ - find "/tmp/zabbix-${ZBX_VERSION}/ui/locale" -name '*.sh' -delete - -FROM ${OS_BASE_IMAGE} - -ARG MAJOR_VERSION -ARG ZBX_VERSION -ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git - -ENV TERM=xterm \ - ZBX_VERSION=${ZBX_VERSION} \ - ZBX_SOURCES=${ZBX_SOURCES} \ - ZABBIX_CONF_DIR=/etc/zabbix \ - ZABBIX_USER_HOME_DIR=/var/lib/zabbix \ - ZABBIX_WWW_ROOT=/usr/share/zabbix \ - PYTHONDONTWRITEBYTECODE=1 - -ENV DB_ENGINE=mysql \ - DAEMON_USER=www-data \ - DAEMON_GROUP=www-data \ - NGINX_BIN=/usr/sbin/nginx \ - PHP_FPM_BIN=/usr/sbin/php-fpm8.5 \ - NGINX_CONFD_DIR=/etc/nginx/conf.d \ - PHP_FPM_CONFIG=/etc/php/8.5/fpm/php-fpm.conf \ - PHP_ZBX_CONFIG_FILE=/etc/php/8.5/fpm/pool.d/zabbix.conf - -LABEL org.opencontainers.image.authors="Alexey Pustovalov " \ - org.opencontainers.image.description="Zabbix web-interface based on Nginx web server with MySQL database support" \ - org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ - org.opencontainers.image.licenses="AGPL v3.0" \ - org.opencontainers.image.source="${ZBX_SOURCES}" \ - org.opencontainers.image.title="Zabbix web-interface (Nginx, MySQL)" \ - org.opencontainers.image.url="https://zabbix.com/" \ - org.opencontainers.image.vendor="Zabbix SIA" \ - org.opencontainers.image.version="${ZBX_VERSION}" - -STOPSIGNAL SIGTERM - -COPY --from=clean_builder /tmp/zabbix-${ZBX_VERSION}/ui ${ZABBIX_WWW_ROOT}/ -COPY --from=clean_builder /tmp/zabbix-${ZBX_VERSION}-output/web/conf ${ZABBIX_CONF_DIR}/web/ -COPY conf/etc/ /etc/ - -RUN --mount=type=cache,target=/var/cache/apt/,sharing=locked \ - --mount=type=cache,target=/var/lib/apt/,sharing=locked \ - set -eux && \ - INSTALL_PKGS="bash \ - ca-certificates \ - curl \ - jq \ - locales \ - tzdata \ - libldap-common \ - nginx \ - php8.5-fpm \ - php8.5-bcmath \ - php8.5-curl \ - php8.5-gd \ - php8.5-ldap \ - php8.5-mbstring \ - php8.5-mysql \ - php8.5-xml \ - mysql-client" && \ - apt-get update && \ - DEBIAN_FRONTEND=noninteractive apt-get -y \ - -o Dpkg::Options::="--force-confdef" \ - -o Dpkg::Options::="--force-confold" \ - --no-install-recommends install \ - ${INSTALL_PKGS} && \ - groupadd \ - --system \ - --gid 1995 \ - zabbix && \ - useradd \ - --system \ - --comment "Zabbix monitoring system" \ - -g zabbix \ - --uid 1997 \ - --shell /sbin/nologin \ - --home-dir ${ZABBIX_USER_HOME_DIR} \ - zabbix && \ - mkdir -p \ - ${ZABBIX_CONF_DIR} \ - ${ZABBIX_CONF_DIR}/web \ - ${ZABBIX_CONF_DIR}/web/certs \ - ${ZABBIX_USER_HOME_DIR} \ - ${ZABBIX_USER_HOME_DIR}/enc \ - ${ZABBIX_USER_HOME_DIR}/enc_internal \ - /var/lib/php/session \ - /var/lib/locales/supported.d && \ - rm -rf \ - /etc/nginx/conf.d/*.conf \ - /var/cache/nginx/ \ - /etc/php/8.5/fpm/pool.d/www.conf \ - /etc/php/8.5/fpm/php-fpm.conf.dpkg-dist \ - /var/lib/locales/supported.d/local && \ - ln -sf /dev/stdout /var/log/nginx/access.log && \ - ln -sf /dev/stderr /var/log/nginx/error.log && \ - ln -sf "${ZABBIX_CONF_DIR}/web/zabbix.conf.php" "${ZABBIX_WWW_ROOT}/conf/zabbix.conf.php" && \ - ln -sf "${ZABBIX_CONF_DIR}/web/maintenance.inc.php" "${ZABBIX_WWW_ROOT}/conf/maintenance.inc.php" && \ - awk "/display/ && /true/ {gsub(/^[ \t]+|[ \t]+$/, \"\", \$0); print \$0}" "${ZABBIX_WWW_ROOT}/include/locales.inc.php" | \ - cut -d"'" -f 2 | sort -u | \ - xargs -r -I '{}' bash -c 'echo "{}.UTF-8 UTF-8" >> /var/lib/locales/supported.d/local' && \ - dpkg-reconfigure locales && \ - FIX_PERM_LIST="\ - ${ZABBIX_CONF_DIR}/ \ - ${ZABBIX_WWW_ROOT}/include/defines.inc.php \ - ${ZABBIX_WWW_ROOT}/modules/ \ - ${ZABBIX_USER_HOME_DIR}/ \ - /etc/nginx/ \ - /etc/php/8.5/fpm/php-fpm.conf \ - /etc/php/8.5/fpm/pool.d/ \ - /var/lib/php/session/" && \ - chown --quiet -R zabbix:0 ${FIX_PERM_LIST} && \ - chmod -R g=u ${FIX_PERM_LIST} - -RUN --mount=from=entrypoints,target=/tmp/entrypoints,ro \ - set -eux && \ - install -d /usr/lib/docker-entrypoint && \ - install -m 0755 /tmp/entrypoints/web-nginx-mysql.sh /usr/bin/docker-entrypoint.sh && \ - install -m 0644 /tmp/entrypoints/lib/*.sh /usr/lib/docker-entrypoint/ - -HEALTHCHECK --interval=1m30s --timeout=3s --retries=3 --start-period=40s --start-interval=5s \ - CMD curl -f http://localhost:8080/ping || exit 1 - -EXPOSE 8080/tcp 8443/tcp - -WORKDIR ${ZABBIX_WWW_ROOT} - -USER 1997 - -ENTRYPOINT ["docker-entrypoint.sh"] diff --git a/Dockerfiles/web-nginx-mysql/ubuntu/README.md b/Dockerfiles/web-nginx-mysql/ubuntu/README.md deleted file mode 120000 index 32d46ee8..00000000 --- a/Dockerfiles/web-nginx-mysql/ubuntu/README.md +++ /dev/null @@ -1 +0,0 @@ -../README.md \ No newline at end of file diff --git a/Dockerfiles/web-nginx-mysql/ubuntu/build.sh b/Dockerfiles/web-nginx-mysql/ubuntu/build.sh deleted file mode 120000 index 46b20313..00000000 --- a/Dockerfiles/web-nginx-mysql/ubuntu/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../../build.sh \ No newline at end of file diff --git a/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/nginx/includes/server-common.conf b/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/nginx/includes/server-common.conf deleted file mode 100644 index b77386b5..00000000 --- a/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/nginx/includes/server-common.conf +++ /dev/null @@ -1,105 +0,0 @@ -server_name zabbix; -index {HTTP_INDEX_FILE}; - -include /etc/nginx/includes/access-log.conf; -error_log stderr notice; - -set $webroot '/usr/share/zabbix'; - -root $webroot; - -large_client_header_buffers 8 8k; -client_max_body_size 10M; - -location = /favicon.ico { - log_not_found off; -} - -location = /robots.txt { - allow all; - log_not_found off; - access_log off; -} - -# Deny all attempts to access hidden files such as .htaccess, .htpasswd, .DS_Store (Mac). -location ~ /\. { - deny all; - access_log off; - log_not_found off; -} - -# caching of files -location ~* \.ico$ { - access_log off; - expires 1y; -} - -location ~* \.(js|css|png|jpg|jpeg|gif|xml|txt|svg)$ { - expires 14d; -} - -location ~* \.(woff|woff2|ttf|otf)$ { - access_log off; - expires 30d; -} - -location ~ /(app\/|conf[^\.]|include\/|local\/|locale\/|vendor\/) { - deny all; - return 404; -} - -location = /data/top_passwords.txt { - deny all; - return 404; -} - -location = /nginx-status { - access_log off; - allow 127.0.0.1; - allow ::1; - deny all; - stub_status; -} - -location ~ ^/(status|ping)$ { - access_log off; - - fastcgi_pass unix:/tmp/php-fpm.sock; - - fastcgi_param SCRIPT_FILENAME $webroot$fastcgi_script_name; - include fastcgi_params; -} - -location / { - try_files $uri $uri/ =404; -} - -location ~ [^/]\.php(/|$) { - fastcgi_split_path_info ^(.+\.php)(/.+)$; - set $path_info $fastcgi_path_info; - try_files $fastcgi_script_name =404; - - fastcgi_pass unix:/tmp/php-fpm.sock; - fastcgi_index {HTTP_INDEX_FILE}; - - fastcgi_param DOCUMENT_ROOT $webroot; - fastcgi_param SCRIPT_FILENAME $webroot$fastcgi_script_name; - fastcgi_param PATH_TRANSLATED $webroot$fastcgi_script_name; - fastcgi_param PATH_INFO $path_info; - - include fastcgi_params; - fastcgi_param QUERY_STRING $query_string; - fastcgi_param REQUEST_METHOD $request_method; - fastcgi_param CONTENT_TYPE $content_type; - fastcgi_param CONTENT_LENGTH $content_length; - - fastcgi_intercept_errors on; - fastcgi_ignore_client_abort off; - fastcgi_connect_timeout 60; - fastcgi_send_timeout 180; - fastcgi_read_timeout {FCGI_READ_TIMEOUT}; - fastcgi_buffer_size 128k; - fastcgi_buffers 4 256k; - fastcgi_busy_buffers_size 256k; - fastcgi_temp_file_write_size 256k; -} diff --git a/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/nginx/includes/server-ssl.conf b/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/nginx/includes/server-ssl.conf deleted file mode 100644 index 61c62354..00000000 --- a/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/nginx/includes/server-ssl.conf +++ /dev/null @@ -1,17 +0,0 @@ -ssl_certificate /etc/ssl/nginx/ssl.crt; -ssl_certificate_key /etc/ssl/nginx/ssl.key; -ssl_dhparam /etc/ssl/nginx/dhparam.pem; - -ssl_session_timeout 1d; -ssl_session_cache shared:MozSSL:10m; -ssl_session_tickets off; - -# intermediate configuration -ssl_protocols TLSv1.2 TLSv1.3; -ssl_ciphers ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:DHE-RSA-CHACHA20-POLY1305; -ssl_prefer_server_ciphers off; - -# HSTS (ngx_http_headers_module is required) (63072000 seconds) -add_header Strict-Transport-Security "max-age=63072000" always; - -add_header Content-Security-Policy-Report-Only "default-src https:; script-src https: 'unsafe-eval' 'unsafe-inline'; style-src https: 'unsafe-inline'; img-src https: data:; font-src https: data:; report-uri /csp-report"; diff --git a/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/nginx/nginx.conf b/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/nginx/nginx.conf deleted file mode 100644 index 46db6396..00000000 --- a/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/nginx/nginx.conf +++ /dev/null @@ -1,71 +0,0 @@ -include /etc/nginx/includes/user.conf; - -worker_processes 5; -worker_rlimit_nofile 256000; - -error_log stderr error; - -pid /tmp/nginx.pid; - -events { - worker_connections 5120; - use epoll; -} - -http { - include /etc/nginx/mime.types; - default_type application/octet-stream; - - log_format main '$remote_addr - $remote_user [$time_local] "$request" ' - '$status $body_bytes_sent "$http_referer" ' - '"$http_user_agent" "$http_x_forwarded_for"'; - - include /etc/nginx/includes/access-log.conf; - error_log stderr error; - - client_body_temp_path /tmp/client_body 1 2; - proxy_temp_path /tmp/proxy 1 2; - fastcgi_temp_path /tmp/fastcgi 1 2; - uwsgi_temp_path /tmp/uwsgi 1 2; - scgi_temp_path /tmp/scgi 1 2; - - client_body_timeout 5m; - send_timeout 5m; - - connection_pool_size 4096; - client_header_buffer_size 4k; - large_client_header_buffers 4 4k; - request_pool_size 4k; - reset_timedout_connection on; - - - gzip on; - gzip_min_length 100; - gzip_buffers 4 8k; - gzip_comp_level 5; - gzip_types text/plain; - gzip_types application/x-javascript; - gzip_types text/css; - - output_buffers 128 512k; - postpone_output 1460; -# aio on; - directio 512; - - sendfile on; - client_max_body_size 8m; - client_body_buffer_size 256k; - fastcgi_intercept_errors on; - - tcp_nopush on; - tcp_nodelay on; - - keepalive_timeout 75 20; - - ignore_invalid_headers on; - - index index.php; - server_tokens {EXPOSE_WEB_SERVER_INFO}; - - include /etc/nginx/conf.d/*.conf; -} diff --git a/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/php/8.5/fpm/php-fpm.conf b/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/php/8.5/fpm/php-fpm.conf deleted file mode 100644 index a2ae51f4..00000000 --- a/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/php/8.5/fpm/php-fpm.conf +++ /dev/null @@ -1,10 +0,0 @@ -include=/etc/php/8.5/fpm/pool.d/*.conf - -[global] - -pid = /tmp/php-fpm.pid - -error_log = /dev/fd/2 -log_level = notice - -daemonize = no diff --git a/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/php/8.5/fpm/pool.d/zabbix.conf b/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/php/8.5/fpm/pool.d/zabbix.conf deleted file mode 100644 index 4ee70ccd..00000000 --- a/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/php/8.5/fpm/pool.d/zabbix.conf +++ /dev/null @@ -1,39 +0,0 @@ -[zabbix] - -; https://www.php.net/manual/en/security.hiding.php -php_value[expose_php] = ${EXPOSE_WEB_SERVER_INFO} - -listen = /tmp/php-fpm.sock - -clear_env = no - -pm = ${PHP_FPM_PM} -pm.max_children = ${PHP_FPM_PM_MAX_CHILDREN} -pm.start_servers = ${PHP_FPM_PM_START_SERVERS} -pm.min_spare_servers = ${PHP_FPM_PM_MIN_SPARE_SERVERS} -pm.max_spare_servers = ${PHP_FPM_PM_MAX_SPARE_SERVERS} -pm.max_requests = ${PHP_FPM_PM_MAX_REQUESTS} - -slowlog = /dev/fd/1 - -php_admin_value[error_log] = /dev/fd/2 -php_admin_flag[log_errors] = on -catch_workers_output = yes - -php_value[session.save_handler] = files -php_value[session.save_path] = /var/lib/php/session - -php_value[max_execution_time] = ${ZBX_MAXEXECUTIONTIME} -php_value[memory_limit] = ${ZBX_MEMORYLIMIT} -php_value[post_max_size] = ${ZBX_POSTMAXSIZE} -php_value[upload_max_filesize] = ${ZBX_UPLOADMAXFILESIZE} -php_value[max_input_time] = ${ZBX_MAXINPUTTIME} -php_value[max_input_vars] = 10000 -php_value[date.timezone] = ${PHP_TZ} - -; PHP-FPM monitoring -pm.status_path = /status -ping.path = /ping - -; Set the socket equal to DB_SERVER_SOCKET set by user -php_value[mysqli.default_socket] = ${DB_SERVER_SOCKET} diff --git a/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/zabbix/nginx.conf b/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/zabbix/nginx.conf deleted file mode 100644 index 42d5aa2b..00000000 --- a/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/zabbix/nginx.conf +++ /dev/null @@ -1,7 +0,0 @@ -server { - listen 8080; - include /etc/nginx/includes/listen-ipv6.conf; - - include /etc/nginx/includes/real-ip.conf; - include /etc/nginx/includes/server-common.conf; -} diff --git a/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/zabbix/nginx_ssl.conf b/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/zabbix/nginx_ssl.conf deleted file mode 100644 index 01fbf7b4..00000000 --- a/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/zabbix/nginx_ssl.conf +++ /dev/null @@ -1,10 +0,0 @@ -server { - listen 8443 ssl; - include /etc/nginx/includes/listen-ipv6-ssl.conf; - - http2 on; - - include /etc/nginx/includes/real-ip.conf; - include /etc/nginx/includes/server-ssl.conf; - include /etc/nginx/includes/server-common.conf; -} diff --git a/Dockerfiles/web-nginx-pgsql/README.md b/Dockerfiles/web-nginx-pgsql/README.md deleted file mode 100644 index c28c8950..00000000 --- a/Dockerfiles/web-nginx-pgsql/README.md +++ /dev/null @@ -1,333 +0,0 @@ -![logo](https://assets.zabbix.com/img/logo/zabbix_logo_500x131.png) - -# What is Zabbix? - -Zabbix is an enterprise-class open source distributed monitoring solution. - -Zabbix is software that monitors numerous parameters of a network and the health and integrity of servers. Zabbix uses a flexible notification mechanism that allows users to configure e-mail based alerts for virtually any event. This allows a fast reaction to server problems. Zabbix offers excellent reporting and data visualisation features based on the stored data. This makes Zabbix ideal for capacity planning. - -For more information and related downloads for Zabbix components, please visit https://hub.docker.com/u/zabbix/ and https://zabbix.com - -# What is Zabbix web interface? - -Zabbix web interface is a part of Zabbix software. It is used to manage resources under monitoring and view monitoring statistics. - -# Zabbix web interface images - -These are the only official Zabbix web interface Docker images. They are based on Alpine Linux v3.24, Ubuntu 26.04 (resolute), CentOS Stream 10 and Oracle Linux 10 images. The available versions of Zabbix web interface are: - - Zabbix web interface 6.0 (tags: alpine-6.0-latest, ubuntu-6.0-latest, ol-6.0-latest) - Zabbix web interface 6.0.* (tags: alpine-6.0.*, ubuntu-6.0.*, ol-6.0.*) - Zabbix web interface 7.0 (tags: alpine-7.0-latest, ubuntu-7.0-latest, ol-7.0-latest) - Zabbix web interface 7.0.* (tags: alpine-7.0.*, ubuntu-7.0.*, ol-7.0.*) - Zabbix web interface 7.2 (tags: alpine-7.2-latest, ubuntu-7.2-latest, ol-7.2-latest) - Zabbix web interface 7.2.* (tags: alpine-7.2.*, ubuntu-7.2.*, ol-7.2.*) - Zabbix web interface 7.4 (tags: alpine-7.4-latest, ubuntu-7.4-latest, ol-7.4-latest, alpine-latest, ubuntu-latest, ol-latest, latest) - Zabbix web interface 7.4.* (tags: alpine-7.4.*, ubuntu-7.4.*, ol-7.4.*) - Zabbix web interface 8.0 (tags: alpine-trunk, ubuntu-trunk, ol-trunk) - -Images are updated when new releases are published. The image with ``latest`` tag is based on Alpine Linux. - -Zabbix web interface available in four editions: -- Zabbix web-interface based on Apache2 web server with MySQL database support -- Zabbix web-interface based on Apache2 web server with PostgreSQL database support -- Zabbix web-interface based on Nginx web server with MySQL database support -- Zabbix web-interface based on Nginx web server with PostgreSQL database support - -The image based on Nginx web server with PostgreSQL database support. - -# How to use this image - -## Start `zabbix-web-nginx-pgsql` - -Start a Zabbix web-interface container as follows: - - docker run --name some-zabbix-web-nginx-pgsql -e DB_SERVER_HOST="some-postgres-server" -e POSTGRES_USER="some-user" -e POSTGRES_PASSWORD="some-password" -e ZBX_SERVER_HOST="some-zabbix-server" -e PHP_TZ="some-timezone" -d zabbix/zabbix-web-nginx-pgsql:tag - -Where `some-zabbix-web-nginx-pgsql` is the name you want to assign to your container, `some-postgres-server` is IP or DNS name of PostgreSQL server, `some-user` is user to connect to Zabbix database on PostgreSQL server, `some-password` is the password to connect to PostgreSQL server, `some-zabbix-server` is IP or DNS name of Zabbix server or proxy, `some-timezone` is PHP like timezone name and `tag` is the tag specifying the version you want. See the list above for relevant tags, or look at the [full list of tags](https://hub.docker.com/r/zabbix/zabbix-web-nginx-pgsql/tags/). - -## Linking the container to Zabbix server - - docker run --name some-zabbix-web-nginx-pgsql --link some-zabbix-server:zabbix-server -e DB_SERVER_HOST="some-postgres-server" -e POSTGRES_USER="some-user" -e POSTGRES_PASSWORD="some-password" -e ZBX_SERVER_HOST="some-zabbix-server" -e PHP_TZ="some-timezone" -d zabbix/zabbix-web-nginx-pgsql:tag - -## Linking the container to PostgreSQL database - - docker run --name some-zabbix-web-nginx-pgsql --link some-postgres-server:postgres -e DB_SERVER_HOST="some-postgres-server" -e POSTGRES_USER="some-user" -e POSTGRES_PASSWORD="some-password" -e ZBX_SERVER_HOST="some-zabbix-server" -e PHP_TZ="some-timezone" -d zabbix/zabbix-web-nginx-pgsql:tag - -## Container shell access and viewing Zabbix web interface logs - -The `docker exec` command allows you to run commands inside a Docker container. The following command line will give you a bash shell inside your `zabbix-web-nginx-pgsql` container: - -```console -$ docker exec -ti some-zabbix-web-nginx-pgsql /bin/bash -``` - -The Zabbix web interface log is available through Docker's container log: - -```console -$ docker logs some-zabbix-web-nginx-pgsql -``` - -## Environment Variables - -When you start the `zabbix-web-nginx-pgsql` image, you can adjust the configuration of the Zabbix web interface by passing one or more environment variables on the `docker run` command line. - -### `ZBX_SERVER_HOST` - -This variable is IP or DNS name of Zabbix server. By default, value is `zabbix-server`. - -### `ZBX_SERVER_PORT` - -This variable is port Zabbix server listening on. By default, value is `10051`. - -### `DB_SERVER_HOST` - -This variable is IP or DNS name of PostgreSQL server. By default, value is 'postgres-server' - -### `DB_SERVER_PORT` - -This variable is port of PostgreSQL server. By default, value is '5432'. - -### `POSTGRES_USER`, `POSTGRES_PASSWORD`, `POSTGRES_USER_FILE`, `POSTGRES_PASSWORD_FILE` - -These variables are used by Zabbix web interface to connect to Zabbix database. With the `_FILE` variables you can instead provide the path to a file which contains the user / the password instead. Without Docker Swarm or Kubernetes you also have to map the files. Those are exclusive so you can just provide one type - either `POSTGRES_USER` or `POSTGRES_USER_FILE`! - -```console -docker run --name some-zabbix-web-nginx-pgsql -e DB_SERVER_HOST="some-postgres-server" -v ./.POSTGRES_USER:/run/secrets/POSTGRES_USER -e POSTGRES_USER_FILE=/run/secrets/POSTGRES_USER -v ./.POSTGRES_PASSWORD:/run/secrets/POSTGRES_PASSWORD -e POSTGRES_PASSWORD_FILE=/var/run/secrets/POSTGRES_PASSWORD -e ZBX_SERVER_HOST="some-zabbix-server" -e PHP_TZ="some-timezone" -d zabbix/zabbix-web-nginx-pgsql:tag -``` - -With Docker Swarm or Kubernetes this works with secrets. That way it is replicated in your cluster! - -```console -printf "zabbix" | docker secret create POSTGRES_USER - -printf "zabbix" | docker secret create POSTGRES_PASSWORD - -docker run --name some-zabbix-web-nginx-pgsql -e DB_SERVER_HOST="some-postgres-server" -e POSTGRES_USER_FILE=/run/secrets/POSTGRES_USER -e POSTGRES_PASSWORD_FILE=/run/secrets/POSTGRES_PASSWORD -e ZBX_SERVER_HOST="some-zabbix-server" -e PHP_TZ="some-timezone" -d zabbix/zabbix-web-nginx-pgsql:tag -``` - -By default, values for `POSTGRES_USER` and `POSTGRES_PASSWORD` are `zabbix`, `zabbix`. - -### `POSTGRES_DB` - -The variable is Zabbix database name. By default, value is `zabbix`. - -### `POSTGRES_USE_IMPLICIT_SEARCH_PATH` - -In some setups, for example including [PgBouncer](https://www.pgbouncer.org), setting the `search_path` via connection parameters fails. If this variable is set to `"true"`, the image skips setting the `search_path` and trusts that the `search_path` of the Zabbix user is setup correctly in PostgreSQL database. - -### `ZBX_HISTORYSTORAGEURL` - -History storage HTTP[S] URL. This parameter is used for Elasticsearch setup. Available since 3.4.5. - -### `ZBX_HISTORYSTORAGETYPES` - -Array of value types to be sent to the history storage. An example: ['uint', 'dbl']. This parameter is used for Elasticsearch setup. Available since 3.4.5. - -### `PHP_TZ` - -The variable is timezone in PHP format. Full list of supported timezones are available on [`php.net`](http://php.net/manual/en/timezones.php). By default, value is 'Europe/Riga' and system timezone since Zabbix 5.2.0. - -### `ZBX_SERVER_NAME` - -The variable is visible Zabbix installation name in right or left top corner of the web interface. - -### `DB_DOUBLE_IEEE754` - -Use IEEE754 compatible value range for 64-bit Numeric (float) history values. Available since 5.0.0. Enabled by default. - -### `ENABLE_WEB_ACCESS_LOG` - -The variable sets the Access Log directive for Web server. By default, value corresponds to standard output. - -### `HTTP_INDEX_FILE` - -The variable controls default index page. By default, `index.php`. - -### `EXPOSE_WEB_SERVER_INFO` - -The variable allows to hide Web server and PHP versions. By default, `on`. - -### `ZBX_MAXEXECUTIONTIME` - -The variable is PHP ``max_execution_time`` option. By default, value is `300`. - -### `ZBX_MEMORYLIMIT` - -The variable is PHP ``memory_limit`` option. By default, value is `128M`. - -### `ZBX_POSTMAXSIZE` - -The variable is PHP ``post_max_size`` option. By default, value is `16M`. - -### `ZBX_UPLOADMAXFILESIZE` - -The variable is PHP ``upload_max_filesize`` option. By default, value is `2M`. - -### `ZBX_MAXINPUTTIME` - -The variable is PHP ``max_input_time`` option. By default, value is `300`. - -### `ZBX_SESSION_NAME` - -The variable is Zabbix frontend [definition](https://www.zabbix.com/documentation/current/manual/web_interface/definitions). String used as the name of the Zabbix frontend session cookie. By default, value is `zbx_sessionid`. - -### `ZBX_DENY_GUI_ACCESS` - -Enable (``true``) maintenance mode for Zabbix web-interface. - -### `ZBX_GUI_ACCESS_IP_RANGE` - -Array of IP addresses which are allowed for accessing to Zabbix web-interface during maintenance period. - -### `ZBX_GUI_WARNING_MSG` - -Information message about maintenance period for Zabbix web-interface. - -### `ZBX_DB_ENCRYPTION` - -The variable allows to activate encryption for connections to Zabbix database. Even if no other environment variables are specified, connections will be TLS-encrypted if `ZBX_DB_ENCRYPTION=true` specified. Available since 5.0.0. Disabled by default. - -### `ZBX_DB_KEY_FILE` - -The variable allows to specify the full path to a valid TLS key file. Available since 5.0.0. - -### `ZBX_DB_CERT_FILE` - -The variable allows to specify the full path to a valid TLS certificate file. Available since 5.0.0. - -### `ZBX_DB_CA_FILE` - -The variable allows to specify the full path to a valid TLS certificate authority file. Available since 5.0.0. - -### `ZBX_DB_VERIFY_HOST` - -The variable allows to activate host verification. Available since 5.0.0. - -### `ZBX_SSO_SP_KEY` - -The variable allows to specify a custom file path to the Service Provider (SP) private key file. - -### `ZBX_SSO_SP_CERT` - -The variable allows to specify a custom file path to the Service Provider (SP) cert file. - -### `ZBX_SSO_IDP_CERT` - -The variable allows to specify a custom file path to the SAML Certificate provided by the Identity Provider (ID) file. - -## `ZBX_SSO_SETTINGS` - -The variable allows to specify custom SSO settings in JSON format. Available since 5.0.0. - -Example of YAML Mapping to Sequences - -``` -.... - environment: - ZBX_SSO_SETTINGS: "{'baseurl': 'https://zabbix-docker.mydomain.com', 'use_proxy_headers': true, 'strict': false}" - .... -.... -``` - -## `ZBX_ALLOW_HTTP_AUTH` - -The variable allows to disable user HTTP authentication. - -### Other variables - -Additionally the image allows to specify many other environment variables listed below: - -``` -ZBX_VAULT=HashiCorp # Allowed values: HashiCorp, CyberArk. Required when Vault is used. Available since 6.2.0 -ZBX_VAULTDBPATH= # Available since 5.2.0 -ZBX_VAULTURL=https://127.0.0.1:8200 # Available since 5.2.0 -VAULT_TOKEN= # Available since 5.2.0 -ZBX_VAULTPREFIX= # Available since 7.0.0 -ZBX_VAULTCERTFILE= # Available since 6.2.0 -ZBX_VAULTKEYFILE= # Available since 6.2.0 -ZBX_VAULTCACHE=false # Available since 6.2.0 - -ZBX_SERVER_TLS_ACTIVE=false # Available since 7.4.0 -ZBX_SERVER_TLS_CAFILE= # Available since 7.4.0 -ZBX_SERVER_TLS_CA= # Available since 7.4.0 -ZBX_SERVER_TLS_KEYFILE= # Available since 7.4.0 -ZBX_SERVER_TLS_KEY= # Available since 7.4.0 -ZBX_SERVER_TLS_CERTFILE= # Available since 7.4.0 -ZBX_SERVER_TLS_CERT= # Available since 7.4.0 -ZBX_SERVER_TLS_CERT_ISSUER= # Available since 7.4.0 -ZBX_SERVER_TLS_CERT_SUBJECT= # Available since 7.4.0 - -Allowed PHP-FPM configuration options: -PHP_FPM_PM=dynamic -PHP_FPM_PM_MAX_CHILDREN=50 -PHP_FPM_PM_START_SERVERS=5 -PHP_FPM_PM_MIN_SPARE_SERVERS=5 -PHP_FPM_PM_MAX_SPARE_SERVERS=35 -PHP_FPM_PM_MAX_REQUESTS=0 - -Allowed Nginx configuration options: -WEB_REAL_IP_FROM= -WEB_REAL_IP_HEADER= -``` - -## Allowed volumes for the Zabbix web interface container - -### ``/etc/ssl/nginx`` - -The volume allows to enable HTTPS for the Zabbix web interface. The volume must contain three files ``ssl.crt``, ``ssl.key`` and ``dhparam.pem`` prepared for Nginx SSL connections. - -Please follow official Nginx [documentation](http://nginx.org/en/docs/http/configuring_https_servers.html) to get more details about how to create certificate files. - -### ``/etc/zabbix/web/certs`` - -The volume allows to use custom certificates for SAML authentication. The volume must contain three files ``sp.key``, ``sp.crt`` and ``idp.crt``. Available since 5.0.0. - -### ``/var/lib/zabbix/enc`` - -The volume is used to store TLS related files. These file names are specified using ``ZBX_SERVER_TLS_CAFILE``, ``ZBX_SERVER_TLS_KEYFILE`` and ``ZBX_SERVER_TLS_CERTFILE`` variables. Additionally it is possible to use environment variables ``ZBX_SERVER_TLS_CA``, ``ZBX_SERVER_TLS_KEY`` and ``ZBX_SERVER_TLS_CERT`` with plaintext values. Available since 7.4.0. - -# The image variants - -The `zabbix-web-nginx-pgsql` images come in many flavors, each designed for a specific use case. - -## `zabbix-web-nginx-pgsql:alpine-` - -This image is based on the popular [Alpine Linux project](http://alpinelinux.org), available in [the `alpine` official image](https://hub.docker.com/_/alpine). Alpine Linux is much smaller than most distribution base images (~5MB), and thus leads to much slimmer images in general. - -This variant is highly recommended when final image size being as small as possible is desired. The main caveat to note is that it does use [musl libc](http://www.musl-libc.org) instead of [glibc and friends](http://www.etalabs.net/compare_libcs.html), so certain software might run into issues depending on the depth of their libc requirements. However, most software doesn't have an issue with this, so this variant is usually a very safe choice. See [this Hacker News comment thread](https://news.ycombinator.com/item?id=10782897) for more discussion of the issues that might arise and some pro/con comparisons of using Alpine-based images. - -To minimize image size, it's uncommon for additional related tools (such as `git` or `bash`) to be included in Alpine-based images. Using this image as a base, add the things you need in your own Dockerfile (see the [`alpine` image description](https://hub.docker.com/_/alpine/) for examples of how to install packages if you are unfamiliar). - -## `zabbix-web-nginx-pgsql:ubuntu-` - -This is the defacto image. If you are unsure about what your needs are, you probably want to use this one. It is designed to be used both as a throw away container (mount your source code and start the container to start your app), as well as the base to build other images off of. - -## `zabbix-web-nginx-pgsql:ol-` - -Oracle Linux is an open-source operating system available under the GNU General Public License (GPLv2). Suitable for general purpose or Oracle workloads, it benefits from rigorous testing of more than 128,000 hours per day with real-world workloads and includes unique innovations such as Ksplice for zero-downtime kernel patching, DTrace for real-time diagnostics, the powerful Btrfs file system, and more. - -# User Feedback - -## Documentation - -Documentation for this image is stored in the [`web-nginx-pgsql/` directory](https://github.com/zabbix/zabbix-docker/tree/7.4/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.4/README.md) before attempting a pull request. - -## Issues - -If you have any problems with or questions about this image, please contact us through a [GitHub issue](https://github.com/zabbix/zabbix-docker/issues). - -### Known issues - -## Contributing - -You are invited to contribute new features, fixes, or updates, large or small; we are always thrilled to receive pull requests, and do our best to process them as fast as we can. - -Before you start to code, we recommend discussing your plans through a [GitHub issue](https://github.com/zabbix/zabbix-docker/issues), especially for more ambitious contributions. This gives other contributors a chance to point you in the right direction, give you feedback on your design, and help you find out if someone else is working on the same thing. - -## License - -Starting from Zabbix version 7.0, all subsequent Zabbix versions will be released under the GNU Affero General Public License version 3 (AGPLv3). -You can modify the relevant version and propagate such modified version under the terms of the AGPLv3 as published by the Free Software Foundation. -For additional details, including answers to common questions about the AGPLv3, see the generic FAQ from the [Free Software Foundation](http://www.fsf.org/licenses/gpl-faq.html). - -Zabbix is Open Source Software, however, if you use Zabbix in a commercial context we kindly ask you to support the development of Zabbix by purchasing some level of technical support. -All previous Zabbix software versions up to 6.4 are released under the GNU General Public License version 2 (GPLv2). The formal terms of the GPLv2 and AGPLv3 can be found at http://www.fsf.org/licenses/. diff --git a/Dockerfiles/web-nginx-pgsql/alpine/.dockerignore b/Dockerfiles/web-nginx-pgsql/alpine/.dockerignore deleted file mode 100644 index 88a84e55..00000000 --- a/Dockerfiles/web-nginx-pgsql/alpine/.dockerignore +++ /dev/null @@ -1 +0,0 @@ -build.sh diff --git a/Dockerfiles/web-nginx-pgsql/alpine/Dockerfile b/Dockerfiles/web-nginx-pgsql/alpine/Dockerfile deleted file mode 100644 index 7a85035b..00000000 --- a/Dockerfiles/web-nginx-pgsql/alpine/Dockerfile +++ /dev/null @@ -1,137 +0,0 @@ -# syntax=docker/dockerfile:1.6 -ARG OS_BASE_IMAGE=alpine:3.24 -ARG MAJOR_VERSION=7.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.12 -ARG BUILD_BASE_IMAGE=zabbix-build-pgsql:alpine-${ZBX_VERSION} - -FROM ${BUILD_BASE_IMAGE} AS builder -FROM builder AS clean_builder - -ARG ZBX_VERSION - -RUN set -eux && \ - rm -rf \ - "/tmp/zabbix-${ZBX_VERSION}/ui/tests" \ - "/tmp/zabbix-${ZBX_VERSION}/ui/conf/zabbix.conf.php" \ - "/tmp/zabbix-${ZBX_VERSION}/ui/conf/zabbix.conf.php.example" \ - "/tmp/zabbix-${ZBX_VERSION}/ui/conf/maintenance.inc.php" && \ - find "/tmp/zabbix-${ZBX_VERSION}/ui/locale" -name '*.po' -delete && \ - find "/tmp/zabbix-${ZBX_VERSION}/ui/locale" -name '*.sh' -delete - -FROM ${OS_BASE_IMAGE} - -ARG MAJOR_VERSION -ARG ZBX_VERSION -ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git - -ENV TERM=xterm \ - ZBX_VERSION=${ZBX_VERSION} \ - ZBX_SOURCES=${ZBX_SOURCES} \ - ZABBIX_CONF_DIR=/etc/zabbix \ - ZABBIX_USER_HOME_DIR=/var/lib/zabbix \ - ZABBIX_WWW_ROOT=/usr/share/zabbix - -ENV NGINX_BIN=/usr/sbin/nginx \ - PHP_FPM_BIN=/usr/sbin/php-fpm85 \ - NGINX_CONFD_DIR=/etc/nginx/http.d \ - PHP_FPM_CONFIG=/etc/php85/php-fpm.conf \ - PHP_ZBX_CONFIG_FILE=/etc/php85/php-fpm.d/zabbix.conf - -LABEL org.opencontainers.image.authors="Alexey Pustovalov " \ - org.opencontainers.image.description="Zabbix web-interface based on Nginx web server with PostgreSQL database support" \ - org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ - org.opencontainers.image.licenses="AGPL v3.0" \ - org.opencontainers.image.source="${ZBX_SOURCES}" \ - org.opencontainers.image.title="Zabbix web-interface (Nginx, PostgreSQL)" \ - org.opencontainers.image.url="https://zabbix.com/" \ - org.opencontainers.image.vendor="Zabbix SIA" \ - org.opencontainers.image.version="${ZBX_VERSION}" - -STOPSIGNAL SIGTERM - -COPY --from=clean_builder /tmp/zabbix-${ZBX_VERSION}/ui ${ZABBIX_WWW_ROOT}/ -COPY --from=clean_builder /tmp/zabbix-${ZBX_VERSION}-output/web/conf ${ZABBIX_CONF_DIR}/web/ -COPY conf/etc/ /etc/ - -RUN set -eux && \ - INSTALL_PKGS="bash \ - curl \ - jq \ - tzdata \ - nginx \ - php85-fpm \ - php85-bcmath \ - php85-ctype \ - php85-curl \ - php85-fileinfo \ - php85-gd \ - php85-gettext \ - php85-json \ - php85-ldap \ - php85-mbstring \ - php85-openssl \ - php85-pgsql \ - php85-session \ - php85-simplexml \ - php85-sockets \ - php85-xmlreader \ - php85-xmlwriter \ - postgresql18-client" && \ - apk add \ - --no-cache \ - --clean-protected \ - ${INSTALL_PKGS} && \ - addgroup \ - --system \ - --gid 1995 \ - zabbix && \ - adduser \ - --system \ - --gecos "Zabbix monitoring system" \ - --disabled-password \ - --uid 1997 \ - --ingroup zabbix \ - --shell /sbin/nologin \ - --home ${ZABBIX_USER_HOME_DIR} \ - zabbix && \ - mkdir -p ${ZABBIX_CONF_DIR} \ - ${ZABBIX_CONF_DIR}/web \ - ${ZABBIX_CONF_DIR}/web/certs \ - ${ZABBIX_USER_HOME_DIR}/enc \ - ${ZABBIX_USER_HOME_DIR}/enc_internal \ - /var/lib/php/session && \ - rm -rf /etc/php85/php-fpm.d/www.conf \ - /etc/nginx/http.d/*.conf && \ - ln -sf /dev/stdout /var/log/nginx/access.log && \ - ln -sf /dev/stderr /var/log/nginx/error.log && \ - ln -sf "${ZABBIX_CONF_DIR}/web/zabbix.conf.php" "${ZABBIX_WWW_ROOT}/conf/zabbix.conf.php" && \ - ln -sf "${ZABBIX_CONF_DIR}/web/maintenance.inc.php" "${ZABBIX_WWW_ROOT}/conf/maintenance.inc.php" && \ - FIX_PERM_LIST="\ - ${ZABBIX_CONF_DIR}/ \ - ${ZABBIX_WWW_ROOT}/include/defines.inc.php \ - ${ZABBIX_WWW_ROOT}/modules/ \ - /etc/nginx/ \ - /etc/php85/php-fpm.d/ \ - /etc/php85/php-fpm.conf \ - ${ZABBIX_USER_HOME_DIR}/ \ - /var/lib/php/session/ \ - /var/lib/nginx/" && \ - chown --quiet -R zabbix:0 ${FIX_PERM_LIST} && \ - chmod -R g=u ${FIX_PERM_LIST} - -RUN --mount=from=entrypoints,target=/tmp/entrypoints,ro \ - set -eux && \ - install -d /usr/lib/docker-entrypoint && \ - install -m 0755 /tmp/entrypoints/web-nginx-pgsql.sh /usr/bin/docker-entrypoint.sh && \ - install -m 0644 /tmp/entrypoints/lib/*.sh /usr/lib/docker-entrypoint/ - -HEALTHCHECK --interval=1m30s --timeout=3s --retries=3 --start-period=40s --start-interval=5s \ - CMD curl -f http://localhost:8080/ping || exit 1 - -EXPOSE 8080/tcp 8443/tcp - -WORKDIR ${ZABBIX_WWW_ROOT} - -USER 1997 - -ENTRYPOINT ["docker-entrypoint.sh"] diff --git a/Dockerfiles/web-nginx-pgsql/alpine/README.md b/Dockerfiles/web-nginx-pgsql/alpine/README.md deleted file mode 120000 index 32d46ee8..00000000 --- a/Dockerfiles/web-nginx-pgsql/alpine/README.md +++ /dev/null @@ -1 +0,0 @@ -../README.md \ No newline at end of file diff --git a/Dockerfiles/web-nginx-pgsql/alpine/build.sh b/Dockerfiles/web-nginx-pgsql/alpine/build.sh deleted file mode 120000 index 46b20313..00000000 --- a/Dockerfiles/web-nginx-pgsql/alpine/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../../build.sh \ No newline at end of file diff --git a/Dockerfiles/web-nginx-pgsql/alpine/conf/etc/nginx/includes/server-common.conf b/Dockerfiles/web-nginx-pgsql/alpine/conf/etc/nginx/includes/server-common.conf deleted file mode 100644 index b77386b5..00000000 --- a/Dockerfiles/web-nginx-pgsql/alpine/conf/etc/nginx/includes/server-common.conf +++ /dev/null @@ -1,105 +0,0 @@ -server_name zabbix; -index {HTTP_INDEX_FILE}; - -include /etc/nginx/includes/access-log.conf; -error_log stderr notice; - -set $webroot '/usr/share/zabbix'; - -root $webroot; - -large_client_header_buffers 8 8k; -client_max_body_size 10M; - -location = /favicon.ico { - log_not_found off; -} - -location = /robots.txt { - allow all; - log_not_found off; - access_log off; -} - -# Deny all attempts to access hidden files such as .htaccess, .htpasswd, .DS_Store (Mac). -location ~ /\. { - deny all; - access_log off; - log_not_found off; -} - -# caching of files -location ~* \.ico$ { - access_log off; - expires 1y; -} - -location ~* \.(js|css|png|jpg|jpeg|gif|xml|txt|svg)$ { - expires 14d; -} - -location ~* \.(woff|woff2|ttf|otf)$ { - access_log off; - expires 30d; -} - -location ~ /(app\/|conf[^\.]|include\/|local\/|locale\/|vendor\/) { - deny all; - return 404; -} - -location = /data/top_passwords.txt { - deny all; - return 404; -} - -location = /nginx-status { - access_log off; - allow 127.0.0.1; - allow ::1; - deny all; - stub_status; -} - -location ~ ^/(status|ping)$ { - access_log off; - - fastcgi_pass unix:/tmp/php-fpm.sock; - - fastcgi_param SCRIPT_FILENAME $webroot$fastcgi_script_name; - include fastcgi_params; -} - -location / { - try_files $uri $uri/ =404; -} - -location ~ [^/]\.php(/|$) { - fastcgi_split_path_info ^(.+\.php)(/.+)$; - set $path_info $fastcgi_path_info; - try_files $fastcgi_script_name =404; - - fastcgi_pass unix:/tmp/php-fpm.sock; - fastcgi_index {HTTP_INDEX_FILE}; - - fastcgi_param DOCUMENT_ROOT $webroot; - fastcgi_param SCRIPT_FILENAME $webroot$fastcgi_script_name; - fastcgi_param PATH_TRANSLATED $webroot$fastcgi_script_name; - fastcgi_param PATH_INFO $path_info; - - include fastcgi_params; - fastcgi_param QUERY_STRING $query_string; - fastcgi_param REQUEST_METHOD $request_method; - fastcgi_param CONTENT_TYPE $content_type; - fastcgi_param CONTENT_LENGTH $content_length; - - fastcgi_intercept_errors on; - fastcgi_ignore_client_abort off; - fastcgi_connect_timeout 60; - fastcgi_send_timeout 180; - fastcgi_read_timeout {FCGI_READ_TIMEOUT}; - fastcgi_buffer_size 128k; - fastcgi_buffers 4 256k; - fastcgi_busy_buffers_size 256k; - fastcgi_temp_file_write_size 256k; -} diff --git a/Dockerfiles/web-nginx-pgsql/alpine/conf/etc/nginx/includes/server-ssl.conf b/Dockerfiles/web-nginx-pgsql/alpine/conf/etc/nginx/includes/server-ssl.conf deleted file mode 100644 index 61c62354..00000000 --- a/Dockerfiles/web-nginx-pgsql/alpine/conf/etc/nginx/includes/server-ssl.conf +++ /dev/null @@ -1,17 +0,0 @@ -ssl_certificate /etc/ssl/nginx/ssl.crt; -ssl_certificate_key /etc/ssl/nginx/ssl.key; -ssl_dhparam /etc/ssl/nginx/dhparam.pem; - -ssl_session_timeout 1d; -ssl_session_cache shared:MozSSL:10m; -ssl_session_tickets off; - -# intermediate configuration -ssl_protocols TLSv1.2 TLSv1.3; -ssl_ciphers ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:DHE-RSA-CHACHA20-POLY1305; -ssl_prefer_server_ciphers off; - -# HSTS (ngx_http_headers_module is required) (63072000 seconds) -add_header Strict-Transport-Security "max-age=63072000" always; - -add_header Content-Security-Policy-Report-Only "default-src https:; script-src https: 'unsafe-eval' 'unsafe-inline'; style-src https: 'unsafe-inline'; img-src https: data:; font-src https: data:; report-uri /csp-report"; diff --git a/Dockerfiles/web-nginx-pgsql/alpine/conf/etc/nginx/nginx.conf b/Dockerfiles/web-nginx-pgsql/alpine/conf/etc/nginx/nginx.conf deleted file mode 100644 index 5c8b1d31..00000000 --- a/Dockerfiles/web-nginx-pgsql/alpine/conf/etc/nginx/nginx.conf +++ /dev/null @@ -1,71 +0,0 @@ -include /etc/nginx/includes/user.conf; - -worker_processes 5; -worker_rlimit_nofile 256000; - -error_log stderr error; - -pid /tmp/nginx.pid; - -events { - worker_connections 5120; - use epoll; -} - -http { - include /etc/nginx/mime.types; - default_type application/octet-stream; - - log_format main '$remote_addr - $remote_user [$time_local] "$request" ' - '$status $body_bytes_sent "$http_referer" ' - '"$http_user_agent" "$http_x_forwarded_for"'; - - include /etc/nginx/includes/access-log.conf; - error_log stderr error; - - client_body_temp_path /tmp/client_body 1 2; - proxy_temp_path /tmp/proxy 1 2; - fastcgi_temp_path /tmp/fastcgi 1 2; - uwsgi_temp_path /tmp/uwsgi 1 2; - scgi_temp_path /tmp/scgi 1 2; - - client_body_timeout 5m; - send_timeout 5m; - - connection_pool_size 4096; - client_header_buffer_size 4k; - large_client_header_buffers 4 4k; - request_pool_size 4k; - reset_timedout_connection on; - - - gzip on; - gzip_min_length 100; - gzip_buffers 4 8k; - gzip_comp_level 5; - gzip_types text/plain; - gzip_types application/x-javascript; - gzip_types text/css; - - output_buffers 128 512k; - postpone_output 1460; - aio on; - directio 512; - - sendfile on; - client_max_body_size 8m; - client_body_buffer_size 256k; - fastcgi_intercept_errors on; - - tcp_nopush on; - tcp_nodelay on; - - keepalive_timeout 75 20; - - ignore_invalid_headers on; - - index index.php; - server_tokens {EXPOSE_WEB_SERVER_INFO}; - - include /etc/nginx/http.d/*.conf; -} diff --git a/Dockerfiles/web-nginx-pgsql/alpine/conf/etc/php85/php-fpm.conf b/Dockerfiles/web-nginx-pgsql/alpine/conf/etc/php85/php-fpm.conf deleted file mode 100644 index 3f077424..00000000 --- a/Dockerfiles/web-nginx-pgsql/alpine/conf/etc/php85/php-fpm.conf +++ /dev/null @@ -1,10 +0,0 @@ -include=/etc/php85/php-fpm.d/*.conf - -[global] - -pid = /tmp/php-fpm.pid - -error_log = /dev/fd/2 -log_level = notice - -daemonize = no diff --git a/Dockerfiles/web-nginx-pgsql/alpine/conf/etc/php85/php-fpm.d/zabbix.conf b/Dockerfiles/web-nginx-pgsql/alpine/conf/etc/php85/php-fpm.d/zabbix.conf deleted file mode 100644 index 66c3c125..00000000 --- a/Dockerfiles/web-nginx-pgsql/alpine/conf/etc/php85/php-fpm.d/zabbix.conf +++ /dev/null @@ -1,36 +0,0 @@ -[zabbix] - -; https://www.php.net/manual/en/security.hiding.php -php_value[expose_php] = ${EXPOSE_WEB_SERVER_INFO} - -listen = /tmp/php-fpm.sock - -clear_env = no - -pm = ${PHP_FPM_PM} -pm.max_children = ${PHP_FPM_PM_MAX_CHILDREN} -pm.start_servers = ${PHP_FPM_PM_START_SERVERS} -pm.min_spare_servers = ${PHP_FPM_PM_MIN_SPARE_SERVERS} -pm.max_spare_servers = ${PHP_FPM_PM_MAX_SPARE_SERVERS} -pm.max_requests = ${PHP_FPM_PM_MAX_REQUESTS} - -slowlog = /dev/fd/1 - -php_admin_value[error_log] = /dev/fd/2 -php_admin_flag[log_errors] = on -catch_workers_output = yes - -php_value[session.save_handler] = files -php_value[session.save_path] = /var/lib/php/session - -php_value[max_execution_time] = ${ZBX_MAXEXECUTIONTIME} -php_value[memory_limit] = ${ZBX_MEMORYLIMIT} -php_value[post_max_size] = ${ZBX_POSTMAXSIZE} -php_value[upload_max_filesize] = ${ZBX_UPLOADMAXFILESIZE} -php_value[max_input_time] = ${ZBX_MAXINPUTTIME} -php_value[max_input_vars] = 10000 -php_value[date.timezone] = ${PHP_TZ} - -; PHP-FPM monitoring -pm.status_path = /status -ping.path = /ping diff --git a/Dockerfiles/web-nginx-pgsql/alpine/conf/etc/zabbix/nginx.conf b/Dockerfiles/web-nginx-pgsql/alpine/conf/etc/zabbix/nginx.conf deleted file mode 100644 index 42d5aa2b..00000000 --- a/Dockerfiles/web-nginx-pgsql/alpine/conf/etc/zabbix/nginx.conf +++ /dev/null @@ -1,7 +0,0 @@ -server { - listen 8080; - include /etc/nginx/includes/listen-ipv6.conf; - - include /etc/nginx/includes/real-ip.conf; - include /etc/nginx/includes/server-common.conf; -} diff --git a/Dockerfiles/web-nginx-pgsql/alpine/conf/etc/zabbix/nginx_ssl.conf b/Dockerfiles/web-nginx-pgsql/alpine/conf/etc/zabbix/nginx_ssl.conf deleted file mode 100644 index 01fbf7b4..00000000 --- a/Dockerfiles/web-nginx-pgsql/alpine/conf/etc/zabbix/nginx_ssl.conf +++ /dev/null @@ -1,10 +0,0 @@ -server { - listen 8443 ssl; - include /etc/nginx/includes/listen-ipv6-ssl.conf; - - http2 on; - - include /etc/nginx/includes/real-ip.conf; - include /etc/nginx/includes/server-ssl.conf; - include /etc/nginx/includes/server-common.conf; -} diff --git a/Dockerfiles/web-nginx-pgsql/centos/.dockerignore b/Dockerfiles/web-nginx-pgsql/centos/.dockerignore deleted file mode 100644 index 88a84e55..00000000 --- a/Dockerfiles/web-nginx-pgsql/centos/.dockerignore +++ /dev/null @@ -1 +0,0 @@ -build.sh diff --git a/Dockerfiles/web-nginx-pgsql/centos/Dockerfile b/Dockerfiles/web-nginx-pgsql/centos/Dockerfile deleted file mode 100644 index c0283776..00000000 --- a/Dockerfiles/web-nginx-pgsql/centos/Dockerfile +++ /dev/null @@ -1,145 +0,0 @@ -# syntax=docker/dockerfile:1.6 -ARG OS_BASE_IMAGE=quay.io/centos/centos:stream10-minimal -ARG MAJOR_VERSION=7.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.12 -ARG BUILD_BASE_IMAGE=zabbix-build-pgsql:centos-${ZBX_VERSION} - -FROM ${BUILD_BASE_IMAGE} AS builder -FROM builder AS clean_builder - -ARG ZBX_VERSION - -RUN set -eux && \ - rm -rf \ - "/tmp/zabbix-${ZBX_VERSION}/ui/tests" \ - "/tmp/zabbix-${ZBX_VERSION}/ui/conf/zabbix.conf.php" \ - "/tmp/zabbix-${ZBX_VERSION}/ui/conf/zabbix.conf.php.example" \ - "/tmp/zabbix-${ZBX_VERSION}/ui/conf/maintenance.inc.php" && \ - find "/tmp/zabbix-${ZBX_VERSION}/ui/locale" -name '*.po' -delete && \ - find "/tmp/zabbix-${ZBX_VERSION}/ui/locale" -name '*.sh' -delete - -FROM ${OS_BASE_IMAGE} - -ARG MAJOR_VERSION -ARG ZBX_VERSION -ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git - -ENV TERM=xterm \ - ZBX_VERSION=${ZBX_VERSION} \ - ZBX_SOURCES=${ZBX_SOURCES} \ - ZABBIX_CONF_DIR=/etc/zabbix \ - ZABBIX_USER_HOME_DIR=/var/lib/zabbix \ - ZABBIX_WWW_ROOT=/usr/share/zabbix - -ENV NGINX_BIN=/usr/sbin/nginx \ - PHP_FPM_BIN=/usr/sbin/php-fpm \ - NGINX_CONFD_DIR=/etc/nginx/conf.d \ - PHP_FPM_CONFIG=/etc/php-fpm.conf \ - PHP_ZBX_CONFIG_FILE=/etc/php-fpm.d/zabbix.conf - -LABEL org.opencontainers.image.authors="Alexey Pustovalov " \ - org.opencontainers.image.description="Zabbix web-interface based on Nginx web server with PostgreSQL database support" \ - org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ - org.opencontainers.image.licenses="AGPL v3.0" \ - org.opencontainers.image.source="${ZBX_SOURCES}" \ - org.opencontainers.image.title="Zabbix web-interface (Nginx, PostgreSQL)" \ - org.opencontainers.image.url="https://zabbix.com/" \ - org.opencontainers.image.vendor="Zabbix SIA" \ - org.opencontainers.image.version="${ZBX_VERSION}" - -STOPSIGNAL SIGTERM - -COPY --from=clean_builder /tmp/zabbix-${ZBX_VERSION}/ui ${ZABBIX_WWW_ROOT}/ -COPY --from=clean_builder /tmp/zabbix-${ZBX_VERSION}-output/web/conf ${ZABBIX_CONF_DIR}/web/ -COPY conf/etc/ /etc/ - -RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ - --mount=type=tmpfs,target=/var/cache/yum/ \ - set -eux && \ - INSTALL_PKGS="bash \ - curl-minimal \ - findutils \ - glibc-locale-source \ - gzip \ - jq \ - shadow-utils \ - nginx \ - php-fpm \ - php-bcmath \ - php-curl \ - php-gd \ - php-json \ - php-ldap \ - php-mbstring \ - php-pgsql \ - php-xml \ - postgresql18" && \ - microdnf -y install \ - --disablerepo="*" \ - --enablerepo="baseos" \ - --enablerepo="appstream" \ - --setopt=install_weak_deps=0 \ - --setopt=keepcache=0 \ - --best \ - --nodocs \ - ${INSTALL_PKGS} && \ - groupadd \ - --system \ - --gid 1995 \ - zabbix && \ - useradd \ - --system \ - --comment "Zabbix monitoring system" \ - -g zabbix \ - --uid 1997 \ - --shell /sbin/nologin \ - --home-dir ${ZABBIX_USER_HOME_DIR} \ - zabbix && \ - mkdir -p ${ZABBIX_CONF_DIR} \ - ${ZABBIX_CONF_DIR}/web \ - ${ZABBIX_CONF_DIR}/web/certs \ - ${ZABBIX_USER_HOME_DIR}/enc \ - ${ZABBIX_USER_HOME_DIR}/enc_internal \ - /var/lib/php/session && \ - rm -rf /etc/nginx/conf.d/*.conf \ - /etc/php-fpm.d/www.conf && \ - ln -sf /dev/stdout /var/log/nginx/access.log && \ - ln -sf /dev/stderr /var/log/nginx/error.log && \ - ln -sf "${ZABBIX_CONF_DIR}/web/zabbix.conf.php" "${ZABBIX_WWW_ROOT}/conf/zabbix.conf.php" && \ - ln -sf "${ZABBIX_CONF_DIR}/web/maintenance.inc.php" "${ZABBIX_WWW_ROOT}/conf/maintenance.inc.php" && \ - awk "/display/ && /true/ {gsub(/^[ \t]+|[ \t]+$/, \"\", \$0); print \$0}" "${ZABBIX_WWW_ROOT}/include/locales.inc.php" | \ - cut -d"'" -f 2 | sort -u | \ - xargs -r -I '{}' bash -c 'echo "{}" && localedef -c -i {} -f UTF-8 {}.UTF-8 2>/dev/null' && \ - FIX_PERM_LIST="\ - ${ZABBIX_CONF_DIR}/ \ - ${ZABBIX_WWW_ROOT}/include/defines.inc.php \ - ${ZABBIX_WWW_ROOT}/modules/ \ - ${ZABBIX_USER_HOME_DIR}/ \ - /etc/nginx/ \ - /etc/php-fpm.d/ \ - /etc/php-fpm.conf \ - /var/log/nginx/ \ - /var/lib/php/session/" && \ - chown --quiet -R zabbix:0 ${FIX_PERM_LIST} && \ - chmod -R g=u ${FIX_PERM_LIST} && \ - microdnf -y remove \ - findutils \ - glibc-locale-source \ - gzip - -RUN --mount=from=entrypoints,target=/tmp/entrypoints,ro \ - set -eux && \ - install -d /usr/lib/docker-entrypoint && \ - install -m 0755 /tmp/entrypoints/web-nginx-pgsql.sh /usr/bin/docker-entrypoint.sh && \ - install -m 0644 /tmp/entrypoints/lib/*.sh /usr/lib/docker-entrypoint/ - -HEALTHCHECK --interval=1m30s --timeout=3s --retries=3 --start-period=40s --start-interval=5s \ - CMD curl -f http://localhost:8080/ping || exit 1 - -EXPOSE 8080/tcp 8443/tcp - -WORKDIR ${ZABBIX_WWW_ROOT} - -USER 1997 - -ENTRYPOINT ["docker-entrypoint.sh"] diff --git a/Dockerfiles/web-nginx-pgsql/centos/README.md b/Dockerfiles/web-nginx-pgsql/centos/README.md deleted file mode 120000 index 32d46ee8..00000000 --- a/Dockerfiles/web-nginx-pgsql/centos/README.md +++ /dev/null @@ -1 +0,0 @@ -../README.md \ No newline at end of file diff --git a/Dockerfiles/web-nginx-pgsql/centos/build.sh b/Dockerfiles/web-nginx-pgsql/centos/build.sh deleted file mode 120000 index 46b20313..00000000 --- a/Dockerfiles/web-nginx-pgsql/centos/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../../build.sh \ No newline at end of file diff --git a/Dockerfiles/web-nginx-pgsql/centos/conf/etc/nginx/includes/server-common.conf b/Dockerfiles/web-nginx-pgsql/centos/conf/etc/nginx/includes/server-common.conf deleted file mode 100644 index b77386b5..00000000 --- a/Dockerfiles/web-nginx-pgsql/centos/conf/etc/nginx/includes/server-common.conf +++ /dev/null @@ -1,105 +0,0 @@ -server_name zabbix; -index {HTTP_INDEX_FILE}; - -include /etc/nginx/includes/access-log.conf; -error_log stderr notice; - -set $webroot '/usr/share/zabbix'; - -root $webroot; - -large_client_header_buffers 8 8k; -client_max_body_size 10M; - -location = /favicon.ico { - log_not_found off; -} - -location = /robots.txt { - allow all; - log_not_found off; - access_log off; -} - -# Deny all attempts to access hidden files such as .htaccess, .htpasswd, .DS_Store (Mac). -location ~ /\. { - deny all; - access_log off; - log_not_found off; -} - -# caching of files -location ~* \.ico$ { - access_log off; - expires 1y; -} - -location ~* \.(js|css|png|jpg|jpeg|gif|xml|txt|svg)$ { - expires 14d; -} - -location ~* \.(woff|woff2|ttf|otf)$ { - access_log off; - expires 30d; -} - -location ~ /(app\/|conf[^\.]|include\/|local\/|locale\/|vendor\/) { - deny all; - return 404; -} - -location = /data/top_passwords.txt { - deny all; - return 404; -} - -location = /nginx-status { - access_log off; - allow 127.0.0.1; - allow ::1; - deny all; - stub_status; -} - -location ~ ^/(status|ping)$ { - access_log off; - - fastcgi_pass unix:/tmp/php-fpm.sock; - - fastcgi_param SCRIPT_FILENAME $webroot$fastcgi_script_name; - include fastcgi_params; -} - -location / { - try_files $uri $uri/ =404; -} - -location ~ [^/]\.php(/|$) { - fastcgi_split_path_info ^(.+\.php)(/.+)$; - set $path_info $fastcgi_path_info; - try_files $fastcgi_script_name =404; - - fastcgi_pass unix:/tmp/php-fpm.sock; - fastcgi_index {HTTP_INDEX_FILE}; - - fastcgi_param DOCUMENT_ROOT $webroot; - fastcgi_param SCRIPT_FILENAME $webroot$fastcgi_script_name; - fastcgi_param PATH_TRANSLATED $webroot$fastcgi_script_name; - fastcgi_param PATH_INFO $path_info; - - include fastcgi_params; - fastcgi_param QUERY_STRING $query_string; - fastcgi_param REQUEST_METHOD $request_method; - fastcgi_param CONTENT_TYPE $content_type; - fastcgi_param CONTENT_LENGTH $content_length; - - fastcgi_intercept_errors on; - fastcgi_ignore_client_abort off; - fastcgi_connect_timeout 60; - fastcgi_send_timeout 180; - fastcgi_read_timeout {FCGI_READ_TIMEOUT}; - fastcgi_buffer_size 128k; - fastcgi_buffers 4 256k; - fastcgi_busy_buffers_size 256k; - fastcgi_temp_file_write_size 256k; -} diff --git a/Dockerfiles/web-nginx-pgsql/centos/conf/etc/nginx/includes/server-ssl.conf b/Dockerfiles/web-nginx-pgsql/centos/conf/etc/nginx/includes/server-ssl.conf deleted file mode 100644 index 61c62354..00000000 --- a/Dockerfiles/web-nginx-pgsql/centos/conf/etc/nginx/includes/server-ssl.conf +++ /dev/null @@ -1,17 +0,0 @@ -ssl_certificate /etc/ssl/nginx/ssl.crt; -ssl_certificate_key /etc/ssl/nginx/ssl.key; -ssl_dhparam /etc/ssl/nginx/dhparam.pem; - -ssl_session_timeout 1d; -ssl_session_cache shared:MozSSL:10m; -ssl_session_tickets off; - -# intermediate configuration -ssl_protocols TLSv1.2 TLSv1.3; -ssl_ciphers ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:DHE-RSA-CHACHA20-POLY1305; -ssl_prefer_server_ciphers off; - -# HSTS (ngx_http_headers_module is required) (63072000 seconds) -add_header Strict-Transport-Security "max-age=63072000" always; - -add_header Content-Security-Policy-Report-Only "default-src https:; script-src https: 'unsafe-eval' 'unsafe-inline'; style-src https: 'unsafe-inline'; img-src https: data:; font-src https: data:; report-uri /csp-report"; diff --git a/Dockerfiles/web-nginx-pgsql/centos/conf/etc/nginx/nginx.conf b/Dockerfiles/web-nginx-pgsql/centos/conf/etc/nginx/nginx.conf deleted file mode 100644 index 76021534..00000000 --- a/Dockerfiles/web-nginx-pgsql/centos/conf/etc/nginx/nginx.conf +++ /dev/null @@ -1,71 +0,0 @@ -include /etc/nginx/includes/user.conf; - -worker_processes 5; -worker_rlimit_nofile 256000; - -error_log stderr error; - -pid /tmp/nginx.pid; - -events { - worker_connections 5120; - use epoll; -} - -http { - include /etc/nginx/mime.types; - default_type application/octet-stream; - - log_format main '$remote_addr - $remote_user [$time_local] "$request" ' - '$status $body_bytes_sent "$http_referer" ' - '"$http_user_agent" "$http_x_forwarded_for"'; - - include /etc/nginx/includes/access-log.conf; - error_log stderr error; - - client_body_temp_path /tmp/client_body 1 2; - proxy_temp_path /tmp/proxy 1 2; - fastcgi_temp_path /tmp/fastcgi 1 2; - uwsgi_temp_path /tmp/uwsgi 1 2; - scgi_temp_path /tmp/scgi 1 2; - - client_body_timeout 5m; - send_timeout 5m; - - connection_pool_size 4096; - client_header_buffer_size 4k; - large_client_header_buffers 4 4k; - request_pool_size 4k; - reset_timedout_connection on; - - - gzip on; - gzip_min_length 100; - gzip_buffers 4 8k; - gzip_comp_level 5; - gzip_types text/plain; - gzip_types application/x-javascript; - gzip_types text/css; - - output_buffers 128 512k; - postpone_output 1460; - aio on; - directio 512; - - sendfile on; - client_max_body_size 8m; - client_body_buffer_size 256k; - fastcgi_intercept_errors on; - - tcp_nopush on; - tcp_nodelay on; - - keepalive_timeout 75 20; - - ignore_invalid_headers on; - - index index.php; - server_tokens {EXPOSE_WEB_SERVER_INFO}; - - include /etc/nginx/conf.d/*.conf; -} diff --git a/Dockerfiles/web-nginx-pgsql/centos/conf/etc/php-fpm.conf b/Dockerfiles/web-nginx-pgsql/centos/conf/etc/php-fpm.conf deleted file mode 100644 index c3accf48..00000000 --- a/Dockerfiles/web-nginx-pgsql/centos/conf/etc/php-fpm.conf +++ /dev/null @@ -1,10 +0,0 @@ -include=/etc/php-fpm.d/*.conf - -[global] - -pid = /tmp/php-fpm.pid - -error_log = /dev/fd/2 -log_level = notice - -daemonize = no diff --git a/Dockerfiles/web-nginx-pgsql/centos/conf/etc/php-fpm.d/zabbix.conf b/Dockerfiles/web-nginx-pgsql/centos/conf/etc/php-fpm.d/zabbix.conf deleted file mode 100644 index 66c3c125..00000000 --- a/Dockerfiles/web-nginx-pgsql/centos/conf/etc/php-fpm.d/zabbix.conf +++ /dev/null @@ -1,36 +0,0 @@ -[zabbix] - -; https://www.php.net/manual/en/security.hiding.php -php_value[expose_php] = ${EXPOSE_WEB_SERVER_INFO} - -listen = /tmp/php-fpm.sock - -clear_env = no - -pm = ${PHP_FPM_PM} -pm.max_children = ${PHP_FPM_PM_MAX_CHILDREN} -pm.start_servers = ${PHP_FPM_PM_START_SERVERS} -pm.min_spare_servers = ${PHP_FPM_PM_MIN_SPARE_SERVERS} -pm.max_spare_servers = ${PHP_FPM_PM_MAX_SPARE_SERVERS} -pm.max_requests = ${PHP_FPM_PM_MAX_REQUESTS} - -slowlog = /dev/fd/1 - -php_admin_value[error_log] = /dev/fd/2 -php_admin_flag[log_errors] = on -catch_workers_output = yes - -php_value[session.save_handler] = files -php_value[session.save_path] = /var/lib/php/session - -php_value[max_execution_time] = ${ZBX_MAXEXECUTIONTIME} -php_value[memory_limit] = ${ZBX_MEMORYLIMIT} -php_value[post_max_size] = ${ZBX_POSTMAXSIZE} -php_value[upload_max_filesize] = ${ZBX_UPLOADMAXFILESIZE} -php_value[max_input_time] = ${ZBX_MAXINPUTTIME} -php_value[max_input_vars] = 10000 -php_value[date.timezone] = ${PHP_TZ} - -; PHP-FPM monitoring -pm.status_path = /status -ping.path = /ping diff --git a/Dockerfiles/web-nginx-pgsql/centos/conf/etc/zabbix/nginx.conf b/Dockerfiles/web-nginx-pgsql/centos/conf/etc/zabbix/nginx.conf deleted file mode 100644 index 42d5aa2b..00000000 --- a/Dockerfiles/web-nginx-pgsql/centos/conf/etc/zabbix/nginx.conf +++ /dev/null @@ -1,7 +0,0 @@ -server { - listen 8080; - include /etc/nginx/includes/listen-ipv6.conf; - - include /etc/nginx/includes/real-ip.conf; - include /etc/nginx/includes/server-common.conf; -} diff --git a/Dockerfiles/web-nginx-pgsql/centos/conf/etc/zabbix/nginx_ssl.conf b/Dockerfiles/web-nginx-pgsql/centos/conf/etc/zabbix/nginx_ssl.conf deleted file mode 100644 index 01fbf7b4..00000000 --- a/Dockerfiles/web-nginx-pgsql/centos/conf/etc/zabbix/nginx_ssl.conf +++ /dev/null @@ -1,10 +0,0 @@ -server { - listen 8443 ssl; - include /etc/nginx/includes/listen-ipv6-ssl.conf; - - http2 on; - - include /etc/nginx/includes/real-ip.conf; - include /etc/nginx/includes/server-ssl.conf; - include /etc/nginx/includes/server-common.conf; -} diff --git a/Dockerfiles/web-nginx-pgsql/ol/.dockerignore b/Dockerfiles/web-nginx-pgsql/ol/.dockerignore deleted file mode 100644 index 88a84e55..00000000 --- a/Dockerfiles/web-nginx-pgsql/ol/.dockerignore +++ /dev/null @@ -1 +0,0 @@ -build.sh diff --git a/Dockerfiles/web-nginx-pgsql/ol/Dockerfile b/Dockerfiles/web-nginx-pgsql/ol/Dockerfile deleted file mode 100644 index 5088c29f..00000000 --- a/Dockerfiles/web-nginx-pgsql/ol/Dockerfile +++ /dev/null @@ -1,144 +0,0 @@ -# syntax=docker/dockerfile:1.6 -ARG OS_BASE_IMAGE=container-registry.oracle.com/os/oraclelinux:10-slim -ARG MAJOR_VERSION=7.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.12 -ARG BUILD_BASE_IMAGE=zabbix-build-pgsql:ol-${ZBX_VERSION} - -FROM ${BUILD_BASE_IMAGE} AS builder -FROM builder AS clean_builder - -ARG ZBX_VERSION - -RUN set -eux && \ - rm -rf \ - "/tmp/zabbix-${ZBX_VERSION}/ui/tests" \ - "/tmp/zabbix-${ZBX_VERSION}/ui/conf/zabbix.conf.php" \ - "/tmp/zabbix-${ZBX_VERSION}/ui/conf/zabbix.conf.php.example" \ - "/tmp/zabbix-${ZBX_VERSION}/ui/conf/maintenance.inc.php" && \ - find "/tmp/zabbix-${ZBX_VERSION}/ui/locale" -name '*.po' -delete && \ - find "/tmp/zabbix-${ZBX_VERSION}/ui/locale" -name '*.sh' -delete - -FROM ${OS_BASE_IMAGE} - -ARG MAJOR_VERSION -ARG ZBX_VERSION -ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git - -ENV TERM=xterm \ - ZBX_VERSION=${ZBX_VERSION} \ - ZBX_SOURCES=${ZBX_SOURCES} \ - ZABBIX_CONF_DIR=/etc/zabbix \ - ZABBIX_USER_HOME_DIR=/var/lib/zabbix \ - ZABBIX_WWW_ROOT=/usr/share/zabbix - -ENV NGINX_BIN=/usr/sbin/nginx \ - PHP_FPM_BIN=/usr/sbin/php-fpm \ - NGINX_CONFD_DIR=/etc/nginx/conf.d \ - PHP_FPM_CONFIG=/etc/php-fpm.conf \ - PHP_ZBX_CONFIG_FILE=/etc/php-fpm.d/zabbix.conf - -LABEL org.opencontainers.image.authors="Alexey Pustovalov " \ - org.opencontainers.image.description="Zabbix web-interface based on Nginx web server with PostgreSQL database support" \ - org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ - org.opencontainers.image.licenses="AGPL v3.0" \ - org.opencontainers.image.source="${ZBX_SOURCES}" \ - org.opencontainers.image.title="Zabbix web-interface (Nginx, PostgreSQL)" \ - org.opencontainers.image.url="https://zabbix.com/" \ - org.opencontainers.image.vendor="Zabbix SIA" \ - org.opencontainers.image.version="${ZBX_VERSION}" - -STOPSIGNAL SIGTERM - -COPY --from=clean_builder /tmp/zabbix-${ZBX_VERSION}/ui ${ZABBIX_WWW_ROOT}/ -COPY --from=clean_builder /tmp/zabbix-${ZBX_VERSION}-output/web/conf ${ZABBIX_CONF_DIR}/web/ -COPY conf/etc/ /etc/ - -RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ - --mount=type=tmpfs,target=/var/cache/yum/ \ - set -eux && \ - INSTALL_PKGS="bash \ - curl \ - findutils \ - glibc-locale-source \ - gzip \ - jq \ - nginx \ - php-fpm \ - php-bcmath \ - php-curl \ - php-gd \ - php-json \ - php-ldap \ - php-mbstring \ - php-pgsql \ - php-xml \ - postgresql18" && \ - microdnf -y install \ - --disablerepo="*" \ - --enablerepo="ol10_baseos_latest" \ - --enablerepo="ol10_appstream" \ - --setopt=install_weak_deps=0 \ - --setopt=keepcache=0 \ - --best \ - --nodocs \ - ${INSTALL_PKGS} && \ - groupadd \ - --system \ - --gid 1995 \ - zabbix && \ - useradd \ - --system \ - --comment "Zabbix monitoring system" \ - -g zabbix \ - --uid 1997 \ - --shell /sbin/nologin \ - --home-dir ${ZABBIX_USER_HOME_DIR} \ - zabbix && \ - mkdir -p ${ZABBIX_CONF_DIR} \ - ${ZABBIX_CONF_DIR}/web \ - ${ZABBIX_CONF_DIR}/web/certs \ - ${ZABBIX_USER_HOME_DIR}/enc \ - ${ZABBIX_USER_HOME_DIR}/enc_internal \ - /var/lib/php/session && \ - rm -rf /etc/nginx/conf.d/*.conf \ - /etc/php-fpm.d/www.conf && \ - ln -sf /dev/stdout /var/log/nginx/access.log && \ - ln -sf /dev/stderr /var/log/nginx/error.log && \ - ln -sf "${ZABBIX_CONF_DIR}/web/zabbix.conf.php" "${ZABBIX_WWW_ROOT}/conf/zabbix.conf.php" && \ - ln -sf "${ZABBIX_CONF_DIR}/web/maintenance.inc.php" "${ZABBIX_WWW_ROOT}/conf/maintenance.inc.php" && \ - awk "/display/ && /true/ {gsub(/^[ \t]+|[ \t]+$/, \"\", \$0); print \$0}" "${ZABBIX_WWW_ROOT}/include/locales.inc.php" | \ - cut -d"'" -f 2 | sort -u | \ - xargs -r -I '{}' bash -c 'echo "{}" && localedef -c -i {} -f UTF-8 {}.UTF-8 2>/dev/null' && \ - FIX_PERM_LIST="\ - ${ZABBIX_CONF_DIR}/ \ - ${ZABBIX_WWW_ROOT}/include/defines.inc.php \ - ${ZABBIX_WWW_ROOT}/modules/ \ - ${ZABBIX_USER_HOME_DIR}/ \ - /etc/nginx/ \ - /etc/php-fpm.d/ \ - /etc/php-fpm.conf \ - /var/log/nginx/ \ - /var/lib/php/session/" && \ - chown --quiet -R zabbix:0 ${FIX_PERM_LIST} && \ - chmod -R g=u ${FIX_PERM_LIST} && \ - microdnf -y remove \ - findutils \ - glibc-locale-source \ - gzip - -RUN --mount=from=entrypoints,target=/tmp/entrypoints,ro \ - set -eux && \ - install -d /usr/lib/docker-entrypoint && \ - install -m 0755 /tmp/entrypoints/web-nginx-pgsql.sh /usr/bin/docker-entrypoint.sh && \ - install -m 0644 /tmp/entrypoints/lib/*.sh /usr/lib/docker-entrypoint/ - -HEALTHCHECK --interval=1m30s --timeout=3s --retries=3 --start-period=40s --start-interval=5s \ - CMD curl -f http://localhost:8080/ping || exit 1 - -EXPOSE 8080/tcp 8443/tcp - -WORKDIR ${ZABBIX_WWW_ROOT} - -USER 1997 - -ENTRYPOINT ["docker-entrypoint.sh"] diff --git a/Dockerfiles/web-nginx-pgsql/ol/README.md b/Dockerfiles/web-nginx-pgsql/ol/README.md deleted file mode 120000 index 32d46ee8..00000000 --- a/Dockerfiles/web-nginx-pgsql/ol/README.md +++ /dev/null @@ -1 +0,0 @@ -../README.md \ No newline at end of file diff --git a/Dockerfiles/web-nginx-pgsql/ol/build.sh b/Dockerfiles/web-nginx-pgsql/ol/build.sh deleted file mode 120000 index 46b20313..00000000 --- a/Dockerfiles/web-nginx-pgsql/ol/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../../build.sh \ No newline at end of file diff --git a/Dockerfiles/web-nginx-pgsql/ol/conf/etc/nginx/includes/server-common.conf b/Dockerfiles/web-nginx-pgsql/ol/conf/etc/nginx/includes/server-common.conf deleted file mode 100644 index b77386b5..00000000 --- a/Dockerfiles/web-nginx-pgsql/ol/conf/etc/nginx/includes/server-common.conf +++ /dev/null @@ -1,105 +0,0 @@ -server_name zabbix; -index {HTTP_INDEX_FILE}; - -include /etc/nginx/includes/access-log.conf; -error_log stderr notice; - -set $webroot '/usr/share/zabbix'; - -root $webroot; - -large_client_header_buffers 8 8k; -client_max_body_size 10M; - -location = /favicon.ico { - log_not_found off; -} - -location = /robots.txt { - allow all; - log_not_found off; - access_log off; -} - -# Deny all attempts to access hidden files such as .htaccess, .htpasswd, .DS_Store (Mac). -location ~ /\. { - deny all; - access_log off; - log_not_found off; -} - -# caching of files -location ~* \.ico$ { - access_log off; - expires 1y; -} - -location ~* \.(js|css|png|jpg|jpeg|gif|xml|txt|svg)$ { - expires 14d; -} - -location ~* \.(woff|woff2|ttf|otf)$ { - access_log off; - expires 30d; -} - -location ~ /(app\/|conf[^\.]|include\/|local\/|locale\/|vendor\/) { - deny all; - return 404; -} - -location = /data/top_passwords.txt { - deny all; - return 404; -} - -location = /nginx-status { - access_log off; - allow 127.0.0.1; - allow ::1; - deny all; - stub_status; -} - -location ~ ^/(status|ping)$ { - access_log off; - - fastcgi_pass unix:/tmp/php-fpm.sock; - - fastcgi_param SCRIPT_FILENAME $webroot$fastcgi_script_name; - include fastcgi_params; -} - -location / { - try_files $uri $uri/ =404; -} - -location ~ [^/]\.php(/|$) { - fastcgi_split_path_info ^(.+\.php)(/.+)$; - set $path_info $fastcgi_path_info; - try_files $fastcgi_script_name =404; - - fastcgi_pass unix:/tmp/php-fpm.sock; - fastcgi_index {HTTP_INDEX_FILE}; - - fastcgi_param DOCUMENT_ROOT $webroot; - fastcgi_param SCRIPT_FILENAME $webroot$fastcgi_script_name; - fastcgi_param PATH_TRANSLATED $webroot$fastcgi_script_name; - fastcgi_param PATH_INFO $path_info; - - include fastcgi_params; - fastcgi_param QUERY_STRING $query_string; - fastcgi_param REQUEST_METHOD $request_method; - fastcgi_param CONTENT_TYPE $content_type; - fastcgi_param CONTENT_LENGTH $content_length; - - fastcgi_intercept_errors on; - fastcgi_ignore_client_abort off; - fastcgi_connect_timeout 60; - fastcgi_send_timeout 180; - fastcgi_read_timeout {FCGI_READ_TIMEOUT}; - fastcgi_buffer_size 128k; - fastcgi_buffers 4 256k; - fastcgi_busy_buffers_size 256k; - fastcgi_temp_file_write_size 256k; -} diff --git a/Dockerfiles/web-nginx-pgsql/ol/conf/etc/nginx/includes/server-ssl.conf b/Dockerfiles/web-nginx-pgsql/ol/conf/etc/nginx/includes/server-ssl.conf deleted file mode 100644 index 61c62354..00000000 --- a/Dockerfiles/web-nginx-pgsql/ol/conf/etc/nginx/includes/server-ssl.conf +++ /dev/null @@ -1,17 +0,0 @@ -ssl_certificate /etc/ssl/nginx/ssl.crt; -ssl_certificate_key /etc/ssl/nginx/ssl.key; -ssl_dhparam /etc/ssl/nginx/dhparam.pem; - -ssl_session_timeout 1d; -ssl_session_cache shared:MozSSL:10m; -ssl_session_tickets off; - -# intermediate configuration -ssl_protocols TLSv1.2 TLSv1.3; -ssl_ciphers ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:DHE-RSA-CHACHA20-POLY1305; -ssl_prefer_server_ciphers off; - -# HSTS (ngx_http_headers_module is required) (63072000 seconds) -add_header Strict-Transport-Security "max-age=63072000" always; - -add_header Content-Security-Policy-Report-Only "default-src https:; script-src https: 'unsafe-eval' 'unsafe-inline'; style-src https: 'unsafe-inline'; img-src https: data:; font-src https: data:; report-uri /csp-report"; diff --git a/Dockerfiles/web-nginx-pgsql/ol/conf/etc/nginx/nginx.conf b/Dockerfiles/web-nginx-pgsql/ol/conf/etc/nginx/nginx.conf deleted file mode 100644 index 76021534..00000000 --- a/Dockerfiles/web-nginx-pgsql/ol/conf/etc/nginx/nginx.conf +++ /dev/null @@ -1,71 +0,0 @@ -include /etc/nginx/includes/user.conf; - -worker_processes 5; -worker_rlimit_nofile 256000; - -error_log stderr error; - -pid /tmp/nginx.pid; - -events { - worker_connections 5120; - use epoll; -} - -http { - include /etc/nginx/mime.types; - default_type application/octet-stream; - - log_format main '$remote_addr - $remote_user [$time_local] "$request" ' - '$status $body_bytes_sent "$http_referer" ' - '"$http_user_agent" "$http_x_forwarded_for"'; - - include /etc/nginx/includes/access-log.conf; - error_log stderr error; - - client_body_temp_path /tmp/client_body 1 2; - proxy_temp_path /tmp/proxy 1 2; - fastcgi_temp_path /tmp/fastcgi 1 2; - uwsgi_temp_path /tmp/uwsgi 1 2; - scgi_temp_path /tmp/scgi 1 2; - - client_body_timeout 5m; - send_timeout 5m; - - connection_pool_size 4096; - client_header_buffer_size 4k; - large_client_header_buffers 4 4k; - request_pool_size 4k; - reset_timedout_connection on; - - - gzip on; - gzip_min_length 100; - gzip_buffers 4 8k; - gzip_comp_level 5; - gzip_types text/plain; - gzip_types application/x-javascript; - gzip_types text/css; - - output_buffers 128 512k; - postpone_output 1460; - aio on; - directio 512; - - sendfile on; - client_max_body_size 8m; - client_body_buffer_size 256k; - fastcgi_intercept_errors on; - - tcp_nopush on; - tcp_nodelay on; - - keepalive_timeout 75 20; - - ignore_invalid_headers on; - - index index.php; - server_tokens {EXPOSE_WEB_SERVER_INFO}; - - include /etc/nginx/conf.d/*.conf; -} diff --git a/Dockerfiles/web-nginx-pgsql/ol/conf/etc/php-fpm.conf b/Dockerfiles/web-nginx-pgsql/ol/conf/etc/php-fpm.conf deleted file mode 100644 index c3accf48..00000000 --- a/Dockerfiles/web-nginx-pgsql/ol/conf/etc/php-fpm.conf +++ /dev/null @@ -1,10 +0,0 @@ -include=/etc/php-fpm.d/*.conf - -[global] - -pid = /tmp/php-fpm.pid - -error_log = /dev/fd/2 -log_level = notice - -daemonize = no diff --git a/Dockerfiles/web-nginx-pgsql/ol/conf/etc/php-fpm.d/zabbix.conf b/Dockerfiles/web-nginx-pgsql/ol/conf/etc/php-fpm.d/zabbix.conf deleted file mode 100644 index 66c3c125..00000000 --- a/Dockerfiles/web-nginx-pgsql/ol/conf/etc/php-fpm.d/zabbix.conf +++ /dev/null @@ -1,36 +0,0 @@ -[zabbix] - -; https://www.php.net/manual/en/security.hiding.php -php_value[expose_php] = ${EXPOSE_WEB_SERVER_INFO} - -listen = /tmp/php-fpm.sock - -clear_env = no - -pm = ${PHP_FPM_PM} -pm.max_children = ${PHP_FPM_PM_MAX_CHILDREN} -pm.start_servers = ${PHP_FPM_PM_START_SERVERS} -pm.min_spare_servers = ${PHP_FPM_PM_MIN_SPARE_SERVERS} -pm.max_spare_servers = ${PHP_FPM_PM_MAX_SPARE_SERVERS} -pm.max_requests = ${PHP_FPM_PM_MAX_REQUESTS} - -slowlog = /dev/fd/1 - -php_admin_value[error_log] = /dev/fd/2 -php_admin_flag[log_errors] = on -catch_workers_output = yes - -php_value[session.save_handler] = files -php_value[session.save_path] = /var/lib/php/session - -php_value[max_execution_time] = ${ZBX_MAXEXECUTIONTIME} -php_value[memory_limit] = ${ZBX_MEMORYLIMIT} -php_value[post_max_size] = ${ZBX_POSTMAXSIZE} -php_value[upload_max_filesize] = ${ZBX_UPLOADMAXFILESIZE} -php_value[max_input_time] = ${ZBX_MAXINPUTTIME} -php_value[max_input_vars] = 10000 -php_value[date.timezone] = ${PHP_TZ} - -; PHP-FPM monitoring -pm.status_path = /status -ping.path = /ping diff --git a/Dockerfiles/web-nginx-pgsql/ol/conf/etc/zabbix/nginx.conf b/Dockerfiles/web-nginx-pgsql/ol/conf/etc/zabbix/nginx.conf deleted file mode 100644 index 42d5aa2b..00000000 --- a/Dockerfiles/web-nginx-pgsql/ol/conf/etc/zabbix/nginx.conf +++ /dev/null @@ -1,7 +0,0 @@ -server { - listen 8080; - include /etc/nginx/includes/listen-ipv6.conf; - - include /etc/nginx/includes/real-ip.conf; - include /etc/nginx/includes/server-common.conf; -} diff --git a/Dockerfiles/web-nginx-pgsql/ol/conf/etc/zabbix/nginx_ssl.conf b/Dockerfiles/web-nginx-pgsql/ol/conf/etc/zabbix/nginx_ssl.conf deleted file mode 100644 index 01fbf7b4..00000000 --- a/Dockerfiles/web-nginx-pgsql/ol/conf/etc/zabbix/nginx_ssl.conf +++ /dev/null @@ -1,10 +0,0 @@ -server { - listen 8443 ssl; - include /etc/nginx/includes/listen-ipv6-ssl.conf; - - http2 on; - - include /etc/nginx/includes/real-ip.conf; - include /etc/nginx/includes/server-ssl.conf; - include /etc/nginx/includes/server-common.conf; -} diff --git a/Dockerfiles/web-nginx-pgsql/rhel/.dockerignore b/Dockerfiles/web-nginx-pgsql/rhel/.dockerignore deleted file mode 100644 index 88a84e55..00000000 --- a/Dockerfiles/web-nginx-pgsql/rhel/.dockerignore +++ /dev/null @@ -1 +0,0 @@ -build.sh diff --git a/Dockerfiles/web-nginx-pgsql/rhel/Dockerfile b/Dockerfiles/web-nginx-pgsql/rhel/Dockerfile deleted file mode 100644 index 25da37a0..00000000 --- a/Dockerfiles/web-nginx-pgsql/rhel/Dockerfile +++ /dev/null @@ -1,168 +0,0 @@ -# syntax=docker/dockerfile:1.6 -ARG OS_BASE_IMAGE=registry.access.redhat.com/ubi10/ubi-minimal:10.2 -ARG MAJOR_VERSION=7.4 -ARG RELEASE=12 -ARG ZBX_VERSION=${MAJOR_VERSION}.12 -ARG BUILD_BASE_IMAGE=zabbix-build-pgsql:rhel-${ZBX_VERSION} - -FROM ${BUILD_BASE_IMAGE} AS builder -FROM builder AS clean_builder - -ARG ZBX_VERSION - -RUN set -eux && \ - rm -rf \ - "/tmp/zabbix-${ZBX_VERSION}/ui/tests" \ - "/tmp/zabbix-${ZBX_VERSION}/ui/conf/zabbix.conf.php" \ - "/tmp/zabbix-${ZBX_VERSION}/ui/conf/zabbix.conf.php.example" \ - "/tmp/zabbix-${ZBX_VERSION}/ui/conf/maintenance.inc.php" && \ - find "/tmp/zabbix-${ZBX_VERSION}/ui/locale" -name '*.po' -delete && \ - find "/tmp/zabbix-${ZBX_VERSION}/ui/locale" -name '*.sh' -delete - -FROM ${OS_BASE_IMAGE} - -ARG MAJOR_VERSION -ARG RELEASE -ARG ZBX_VERSION -ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git - -ENV TERM=xterm \ - ZBX_VERSION=${ZBX_VERSION} \ - ZBX_SOURCES=${ZBX_SOURCES} \ - ZABBIX_CONF_DIR=/etc/zabbix \ - ZABBIX_USER_HOME_DIR=/var/lib/zabbix \ - ZABBIX_WWW_ROOT=/usr/share/zabbix - -ENV NGINX_BIN=/usr/sbin/nginx \ - PHP_FPM_BIN=/usr/sbin/php-fpm \ - NGINX_CONFD_DIR=/etc/nginx/conf.d \ - PHP_FPM_CONFIG=/etc/php-fpm.conf \ - PHP_ZBX_CONFIG_FILE=/etc/php-fpm.d/zabbix.conf - -LABEL description="Zabbix web-interface based on Nginx web server with PostgreSQL database support" \ - maintainer="alexey.pustovalov@zabbix.com" \ - name="zabbix/zabbix-web-pgsql-74" \ - 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-74:${ZBX_VERSION}" \ - summary="Zabbix web-interface based on Nginx web server with PostgreSQL database support" \ - url="https://www.zabbix.com/" \ - vendor="Zabbix SIA" \ - version="${MAJOR_VERSION}" \ - io.k8s.description="Zabbix web-interface based on Nginx web server with PostgreSQL database support" \ - io.k8s.display-name="Zabbix Frontend (Nginx)" \ - io.openshift.expose-services="8080:http,8443:https" \ - 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-74:${ZBX_VERSION}" \ - org.label-schema.license="AGPL v3.0" \ - org.label-schema.name="zabbix-web-pgsql-rhel" \ - org.label-schema.schema-version="1.0" \ - org.label-schema.url="https://zabbix.com/" \ - org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ - org.label-schema.vcs-ref="${VCS_REF}" \ - org.label-schema.vcs-url="${ZBX_SOURCES}" \ - org.label-schema.vendor="Zabbix SIA" \ - org.label-schema.version="${ZBX_VERSION}" - -STOPSIGNAL SIGTERM - -COPY licenses /licenses/ -COPY --from=clean_builder /tmp/zabbix-${ZBX_VERSION}/ui ${ZABBIX_WWW_ROOT}/ -COPY --from=clean_builder /tmp/zabbix-${ZBX_VERSION}-output/web/conf ${ZABBIX_CONF_DIR}/web/ -COPY conf/etc/ /etc/ - -RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ - --mount=type=tmpfs,target=/var/cache/yum/ \ - set -eux && \ - INSTALL_PKGS="bash \ - curl-minimal \ - findutils \ - glibc-locale-source \ - gzip \ - jq \ - shadow-utils \ - tzdata \ - nginx \ - php-fpm \ - php-bcmath \ - php-curl \ - php-gd \ - php-json \ - php-ldap \ - php-mbstring \ - php-pgsql \ - php-xml \ - postgresql18" && \ - ARCH_SUFFIX="$(arch)"; \ - microdnf -y install \ - --disablerepo="*" \ - --enablerepo="ubi-10-baseos-rpms" \ - --enablerepo="ubi-10-appstream-rpms" \ - --enablerepo="rhel-10-for-$ARCH_SUFFIX-baseos-rpms" \ - --enablerepo="rhel-10-for-$ARCH_SUFFIX-appstream-rpms" \ - --setopt=install_weak_deps=0 \ - --setopt=keepcache=0 \ - --best \ - --setopt=tsflags=nodocs \ - ${INSTALL_PKGS} && \ - groupadd \ - --system \ - --gid 1995 \ - zabbix && \ - useradd \ - --system \ - --comment "Zabbix monitoring system" \ - -g zabbix \ - --uid 1997 \ - --shell /sbin/nologin \ - --home-dir ${ZABBIX_USER_HOME_DIR} \ - zabbix && \ - mkdir -p ${ZABBIX_CONF_DIR} \ - ${ZABBIX_CONF_DIR}/web \ - ${ZABBIX_CONF_DIR}/web/certs \ - ${ZABBIX_USER_HOME_DIR}/enc \ - ${ZABBIX_USER_HOME_DIR}/enc_internal \ - /var/lib/php/session && \ - rm -rf /etc/nginx/conf.d/*.conf \ - /etc/php-fpm.d/www.conf && \ - ln -sf /dev/stdout /var/log/nginx/access.log && \ - ln -sf /dev/stderr /var/log/nginx/error.log && \ - ln -sf "${ZABBIX_CONF_DIR}/web/zabbix.conf.php" "${ZABBIX_WWW_ROOT}/conf/zabbix.conf.php" && \ - ln -sf "${ZABBIX_CONF_DIR}/web/maintenance.inc.php" "${ZABBIX_WWW_ROOT}/conf/maintenance.inc.php" && \ - awk "/display/ && /true/ {gsub(/^[ \t]+|[ \t]+$/, \"\", \$0); print \$0}" "${ZABBIX_WWW_ROOT}/include/locales.inc.php" | \ - cut -d"'" -f 2 | sort -u | \ - xargs -r -I '{}' bash -c 'echo "{}" && localedef -c -i {} -f UTF-8 {}.UTF-8 2>/dev/null' && \ - FIX_PERM_LIST="\ - ${ZABBIX_CONF_DIR}/ \ - ${ZABBIX_WWW_ROOT}/include/defines.inc.php \ - ${ZABBIX_WWW_ROOT}/modules/ \ - ${ZABBIX_USER_HOME_DIR}/ \ - /etc/nginx/ \ - /etc/php-fpm.d/ \ - /etc/php-fpm.conf \ - /var/log/nginx/ \ - /var/lib/php/session/" && \ - chown --quiet -R zabbix:0 ${FIX_PERM_LIST} && \ - chmod -R g=u ${FIX_PERM_LIST} && \ - microdnf -y remove \ - findutils \ - glibc-locale-source \ - gzip - -RUN --mount=from=entrypoints,target=/tmp/entrypoints,ro \ - set -eux && \ - install -d /usr/lib/docker-entrypoint && \ - install -m 0755 /tmp/entrypoints/web-nginx-pgsql.sh /usr/bin/docker-entrypoint.sh && \ - install -m 0644 /tmp/entrypoints/lib/*.sh /usr/lib/docker-entrypoint/ - -HEALTHCHECK --interval=1m30s --timeout=3s --retries=3 --start-period=40s --start-interval=5s \ - CMD curl -f http://localhost:8080/ping || exit 1 - -EXPOSE 8080/tcp 8443/tcp - -WORKDIR ${ZABBIX_WWW_ROOT} - -USER 1997 - -ENTRYPOINT ["docker-entrypoint.sh"] diff --git a/Dockerfiles/web-nginx-pgsql/rhel/README.html b/Dockerfiles/web-nginx-pgsql/rhel/README.html deleted file mode 100644 index af6bbc1c..00000000 --- a/Dockerfiles/web-nginx-pgsql/rhel/README.html +++ /dev/null @@ -1,200 +0,0 @@ -

What is Zabbix?

-

Zabbix is an enterprise-class open source distributed monitoring solution.

-

Zabbix is software that monitors numerous parameters of a network and the health and integrity of servers. Zabbix uses a flexible notification mechanism that allows users to configure e-mail based alerts for virtually any event. This allows a fast reaction to server problems. Zabbix offers excellent reporting and data visualisation features based on the stored data. This makes Zabbix ideal for capacity planning.

-

For more information and related downloads for Zabbix components, please visit zabbix.com

-

What is Zabbix web interface?

-

Zabbix web interface is a part of Zabbix software. It is used to manage resources under monitoring and view monitoring statistics.

-

Zabbix web interface images

-

Images are updated when new releases are published.

-

Zabbix web interface available in four editions:

-
    -
  • Zabbix web-interface based on Apache2 web server with MySQL database support
    • -
  • Zabbix web-interface based on Apache2 web server with PostgreSQL database support
    • -
  • Zabbix web-interface based on Nginx web server with MySQL database support
    • -
  • Zabbix web-interface based on Nginx web server with PostgreSQL database support
    • -
-

The image based on Nginx web server with PostgreSQL database support.

-

How to use this image

-

Start zabbix-web-nginx-pgsql

-

Start a Zabbix web-interface container as follows:

-
podman run \
-    --name some-zabbix-web-nginx-pgsql \
-    -e DB_SERVER_HOST="some-postgres-server" \
-    -e POSTGRES_USER="some-user" \
-    -e POSTGRES_PASSWORD="some-password" \
-    -e ZBX_SERVER_HOST="some-zabbix-server" \
-    -e PHP_TZ="some-timezone" \
-    -d registry.connect.redhat.com/zabbix/zabbix-web-pgsql-74:tag
-
-

Where some-zabbix-web-nginx-pgsql is the name you want to assign to your container, some-postgres-server is IP or DNS name of PostgreSQL server, some-user is user to connect to Zabbix database on PostgreSQL server, some-password is the password to connect to PostgreSQL server, some-zabbix-server is IP or DNS name of Zabbix server or proxy, some-timezone is PHP like timezone name and tag is the tag specifying the version you want.

-

Linking the container to Zabbix server

-
podman run \
-    --name some-zabbix-web-nginx-pgsql \
-    --link some-zabbix-server:zabbix-server \
-    -e DB_SERVER_HOST="some-postgres-server" \
-    -e POSTGRES_USER="some-user" \
-    -e POSTGRES_PASSWORD="some-password" \
-    -e ZBX_SERVER_HOST="some-zabbix-server" \
-    -e PHP_TZ="some-timezone" \
-    -d registry.connect.redhat.com/zabbix/zabbix-web-pgsql-74:tag
-
-

Linking the container to PostgreSQL database

-
podman run \
-    --name some-zabbix-web-nginx-pgsql \
-    --link some-postgres-server:postgres \
-    -e DB_SERVER_HOST="some-postgres-server" \
-    -e POSTGRES_USER="some-user" \
-    -e POSTGRES_PASSWORD="some-password" \
-    -e ZBX_SERVER_HOST="some-zabbix-server" \
-    -e PHP_TZ="some-timezone" \
-    -d registry.connect.redhat.com/zabbix/zabbix-web-pgsql-74:tag
-
-

Container shell access and viewing Zabbix web interface logs

-

The podman exec command allows you to run commands inside a Podman container. The following command line will give you a bash shell inside your zabbix-web-nginx-pgsql container:

-
$ podman exec -ti some-zabbix-web-nginx-pgsql /bin/bash
-
-

The Zabbix web interface log is available through Podman's container log:

-
$ podman logs  some-zabbix-web-nginx-pgsql
-
-

Environment Variables

-

When you start the zabbix-web-nginx-pgsql image, you can adjust the configuration of the Zabbix web interface by passing one or more environment variables on the podman run command line.

-

ZBX_SERVER_HOST

-

This variable is IP or DNS name of Zabbix server. By default, value is zabbix-server.

-

ZBX_SERVER_PORT

-

This variable is port Zabbix server listening on. By default, value is 10051.

-

DB_SERVER_HOST

-

This variable is IP or DNS name of PostgreSQL server. By default, value is 'postgres-server'

-

DB_SERVER_PORT

-

This variable is port of PostgreSQL server. By default, value is '5432'.

-

POSTGRES_USER, POSTGRES_PASSWORD, POSTGRES_USER_FILE, POSTGRES_PASSWORD_FILE

-

These variables are used by Zabbix web interface to connect to Zabbix database. With the _FILE variables you can instead provide the path to a file which contains the user / the password instead. When secrets are not managed by an orchestrator, you also have to mount the files. Those are exclusive so you can just provide one type - either POSTGRES_USER or POSTGRES_USER_FILE!

-
podman run \
-    --name some-zabbix-web-nginx-pgsql \
-    -e DB_SERVER_HOST="some-postgres-server" \
-    -v ./.POSTGRES_USER:/run/secrets/POSTGRES_USER \
-    -e POSTGRES_USER_FILE=/run/secrets/POSTGRES_USER \
-    -v ./.POSTGRES_PASSWORD:/run/secrets/POSTGRES_PASSWORD \
-    -e POSTGRES_PASSWORD_FILE=/var/run/secrets/POSTGRES_PASSWORD \
-    -e ZBX_SERVER_HOST="some-zabbix-server" \
-    -e PHP_TZ="some-timezone" \
-    -d registry.connect.redhat.com/zabbix/zabbix-web-pgsql-74:tag
-
-

Podman secrets can be used to avoid exposing credentials in the command line:

-
printf "zabbix" | podman secret create POSTGRES_USER -
-printf "zabbix" | podman secret create POSTGRES_PASSWORD -
-podman run \
-    --name some-zabbix-web-nginx-pgsql \
-    -e DB_SERVER_HOST="some-postgres-server" \
-    -e POSTGRES_USER_FILE=/run/secrets/POSTGRES_USER \
-    -e POSTGRES_PASSWORD_FILE=/run/secrets/POSTGRES_PASSWORD \
-    -e ZBX_SERVER_HOST="some-zabbix-server" \
-    -e PHP_TZ="some-timezone" \
-    -d registry.connect.redhat.com/zabbix/zabbix-web-pgsql-74:tag
-
-

By default, values for POSTGRES_USER and POSTGRES_PASSWORD are zabbix, zabbix.

-

POSTGRES_DB

-

The variable is Zabbix database name. By default, value is zabbix.

-

POSTGRES_USE_IMPLICIT_SEARCH_PATH

-

In some setups, for example including PgBouncer, setting the search_path via connection parameters fails. If this variable is set to "true", the image skips setting the search_path and trusts that the search_path of the Zabbix user is setup correctly in PostgreSQL database.

-

ZBX_HISTORYSTORAGEURL

-

History storage HTTP[S] URL. This parameter is used for Elasticsearch setup. Available since 3.4.5.

-

ZBX_HISTORYSTORAGETYPES

-

Array of value types to be sent to the history storage. An example: ['uint', 'dbl']. This parameter is used for Elasticsearch setup. Available since 3.4.5.

-

PHP_TZ

-

The variable is timezone in PHP format. Full list of supported timezones are available on php.net. By default, value is 'Europe/Riga' and system timezone since Zabbix 5.2.0.

-

ZBX_SERVER_NAME

-

The variable is visible Zabbix installation name in right or left top corner of the web interface.

-

DB_DOUBLE_IEEE754

-

Use IEEE754 compatible value range for 64-bit Numeric (float) history values. Available since 5.0.0. Enabled by default.

-

ENABLE_WEB_ACCESS_LOG

-

The variable sets the Access Log directive for Web server. By default, value corresponds to standard output.

-

HTTP_INDEX_FILE

-

The variable controls default index page. By default, index.php.

-

EXPOSE_WEB_SERVER_INFO

-

The variable allows to hide Web server and PHP versions. By default, on.

-

ZBX_MAXEXECUTIONTIME

-

The variable is PHP max_execution_time option. By default, value is 300.

-

ZBX_MEMORYLIMIT

-

The variable is PHP memory_limit option. By default, value is 128M.

-

ZBX_POSTMAXSIZE

-

The variable is PHP post_max_size option. By default, value is 16M.

-

ZBX_UPLOADMAXFILESIZE

-

The variable is PHP upload_max_filesize option. By default, value is 2M.

-

ZBX_MAXINPUTTIME

-

The variable is PHP max_input_time option. By default, value is 300.

-

ZBX_SESSION_NAME

-

The variable is Zabbix frontend definition. String used as the name of the Zabbix frontend session cookie. By default, value is zbx_sessionid.

-

ZBX_DENY_GUI_ACCESS

-

Enable (true) maintenance mode for Zabbix web-interface.

-

ZBX_GUI_ACCESS_IP_RANGE

-

Array of IP addresses which are allowed for accessing to Zabbix web-interface during maintenance period.

-

ZBX_GUI_WARNING_MSG

-

Information message about maintenance period for Zabbix web-interface.

-

ZBX_DB_ENCRYPTION

-

The variable allows to activate encryption for connections to Zabbix database. Even if no other environment variables are specified, connections will be TLS-encrypted if ZBX_DB_ENCRYPTION=true specified. Available since 5.0.0. Disabled by default.

-

ZBX_DB_KEY_FILE

-

The variable allows to specify the full path to a valid TLS key file. Available since 5.0.0.

-

ZBX_DB_CERT_FILE

-

The variable allows to specify the full path to a valid TLS certificate file. Available since 5.0.0.

-

ZBX_DB_CA_FILE

-

The variable allows to specify the full path to a valid TLS certificate authority file. Available since 5.0.0.

-

ZBX_DB_VERIFY_HOST

-

The variable allows to activate host verification. Available since 5.0.0.

-

ZBX_SSO_SP_KEY

-

The variable allows to specify a custom file path to the Service Provider (SP) private key file.

-

ZBX_SSO_SP_CERT

-

The variable allows to specify a custom file path to the Service Provider (SP) cert file.

-

ZBX_SSO_IDP_CERT

-

The variable allows to specify a custom file path to the SAML Certificate provided by the Identity Provider (ID) file.

-

ZBX_SSO_SETTINGS

-

The variable allows to specify custom SSO settings in JSON format. Available since 5.0.0.

-

Example of YAML Mapping to Sequences

-
....
-  environment:
-    ZBX_SSO_SETTINGS: "{'baseurl': 'https://zabbix.example.com', 'use_proxy_headers': true, 'strict': false}"
-    ....
-....
-
-

ZBX_ALLOW_HTTP_AUTH

-

The variable allows to disable user HTTP authentication.

-

Other variables

-

Additionally the image allows to specify many other environment variables listed below:

-
ZBX_VAULT=HashiCorp # Allowed values: HashiCorp, CyberArk. Required when Vault is used. Available since 6.2.0
-ZBX_VAULTDBPATH= # Available since 5.2.0
-ZBX_VAULTURL=https://127.0.0.1:8200 # Available since 5.2.0
-VAULT_TOKEN= # Available since 5.2.0
-ZBX_VAULTPREFIX= # Available since 7.0.0
-ZBX_VAULTCERTFILE= # Available since 6.2.0
-ZBX_VAULTKEYFILE= # Available since 6.2.0
-ZBX_VAULTCACHE=false # Available since 6.2.0
-
-ZBX_SERVER_TLS_ACTIVE=false # Available since 7.4.0
-ZBX_SERVER_TLS_CAFILE= # Available since 7.4.0
-ZBX_SERVER_TLS_CA= # Available since 7.4.0
-ZBX_SERVER_TLS_KEYFILE= # Available since 7.4.0
-ZBX_SERVER_TLS_KEY= # Available since 7.4.0
-ZBX_SERVER_TLS_CERTFILE= # Available since 7.4.0
-ZBX_SERVER_TLS_CERT= # Available since 7.4.0
-ZBX_SERVER_TLS_CERT_ISSUER= # Available since 7.4.0
-ZBX_SERVER_TLS_CERT_SUBJECT= # Available since 7.4.0
-
-Allowed PHP-FPM configuration options:
-PHP_FPM_PM=dynamic
-PHP_FPM_PM_MAX_CHILDREN=50
-PHP_FPM_PM_START_SERVERS=5
-PHP_FPM_PM_MIN_SPARE_SERVERS=5
-PHP_FPM_PM_MAX_SPARE_SERVERS=35
-PHP_FPM_PM_MAX_REQUESTS=0
-
-Allowed Nginx configuration options:
-WEB_REAL_IP_FROM=
-WEB_REAL_IP_HEADER=
-
-

Allowed volumes for the Zabbix web interface container

-

/etc/ssl/nginx

-

The volume allows to enable HTTPS for the Zabbix web interface. The volume must contain three files ssl.crt, ssl.key and dhparam.pem prepared for Nginx SSL connections.

-

Please follow official Nginx documentation to get more details about how to create certificate files.

-

/etc/zabbix/web/certs

-

The volume allows to use custom certificates for SAML authentication. The volume must contain three files sp.key, sp.crt and idp.crt. Available since 5.0.0.

-

/var/lib/zabbix/enc

-

The volume is used to store TLS related files. These file names are specified using ZBX_SERVER_TLS_CAFILE, ZBX_SERVER_TLS_KEYFILE and ZBX_SERVER_TLS_CERTFILE variables. Additionally it is possible to use environment variables ZBX_SERVER_TLS_CA, ZBX_SERVER_TLS_KEY and ZBX_SERVER_TLS_CERT with plaintext values. Available since 7.4.0.

diff --git a/Dockerfiles/web-nginx-pgsql/rhel/build.sh b/Dockerfiles/web-nginx-pgsql/rhel/build.sh deleted file mode 120000 index 46b20313..00000000 --- a/Dockerfiles/web-nginx-pgsql/rhel/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../../build.sh \ No newline at end of file diff --git a/Dockerfiles/web-nginx-pgsql/rhel/conf/etc/nginx/includes/server-common.conf b/Dockerfiles/web-nginx-pgsql/rhel/conf/etc/nginx/includes/server-common.conf deleted file mode 100644 index b77386b5..00000000 --- a/Dockerfiles/web-nginx-pgsql/rhel/conf/etc/nginx/includes/server-common.conf +++ /dev/null @@ -1,105 +0,0 @@ -server_name zabbix; -index {HTTP_INDEX_FILE}; - -include /etc/nginx/includes/access-log.conf; -error_log stderr notice; - -set $webroot '/usr/share/zabbix'; - -root $webroot; - -large_client_header_buffers 8 8k; -client_max_body_size 10M; - -location = /favicon.ico { - log_not_found off; -} - -location = /robots.txt { - allow all; - log_not_found off; - access_log off; -} - -# Deny all attempts to access hidden files such as .htaccess, .htpasswd, .DS_Store (Mac). -location ~ /\. { - deny all; - access_log off; - log_not_found off; -} - -# caching of files -location ~* \.ico$ { - access_log off; - expires 1y; -} - -location ~* \.(js|css|png|jpg|jpeg|gif|xml|txt|svg)$ { - expires 14d; -} - -location ~* \.(woff|woff2|ttf|otf)$ { - access_log off; - expires 30d; -} - -location ~ /(app\/|conf[^\.]|include\/|local\/|locale\/|vendor\/) { - deny all; - return 404; -} - -location = /data/top_passwords.txt { - deny all; - return 404; -} - -location = /nginx-status { - access_log off; - allow 127.0.0.1; - allow ::1; - deny all; - stub_status; -} - -location ~ ^/(status|ping)$ { - access_log off; - - fastcgi_pass unix:/tmp/php-fpm.sock; - - fastcgi_param SCRIPT_FILENAME $webroot$fastcgi_script_name; - include fastcgi_params; -} - -location / { - try_files $uri $uri/ =404; -} - -location ~ [^/]\.php(/|$) { - fastcgi_split_path_info ^(.+\.php)(/.+)$; - set $path_info $fastcgi_path_info; - try_files $fastcgi_script_name =404; - - fastcgi_pass unix:/tmp/php-fpm.sock; - fastcgi_index {HTTP_INDEX_FILE}; - - fastcgi_param DOCUMENT_ROOT $webroot; - fastcgi_param SCRIPT_FILENAME $webroot$fastcgi_script_name; - fastcgi_param PATH_TRANSLATED $webroot$fastcgi_script_name; - fastcgi_param PATH_INFO $path_info; - - include fastcgi_params; - fastcgi_param QUERY_STRING $query_string; - fastcgi_param REQUEST_METHOD $request_method; - fastcgi_param CONTENT_TYPE $content_type; - fastcgi_param CONTENT_LENGTH $content_length; - - fastcgi_intercept_errors on; - fastcgi_ignore_client_abort off; - fastcgi_connect_timeout 60; - fastcgi_send_timeout 180; - fastcgi_read_timeout {FCGI_READ_TIMEOUT}; - fastcgi_buffer_size 128k; - fastcgi_buffers 4 256k; - fastcgi_busy_buffers_size 256k; - fastcgi_temp_file_write_size 256k; -} diff --git a/Dockerfiles/web-nginx-pgsql/rhel/conf/etc/nginx/includes/server-ssl.conf b/Dockerfiles/web-nginx-pgsql/rhel/conf/etc/nginx/includes/server-ssl.conf deleted file mode 100644 index 61c62354..00000000 --- a/Dockerfiles/web-nginx-pgsql/rhel/conf/etc/nginx/includes/server-ssl.conf +++ /dev/null @@ -1,17 +0,0 @@ -ssl_certificate /etc/ssl/nginx/ssl.crt; -ssl_certificate_key /etc/ssl/nginx/ssl.key; -ssl_dhparam /etc/ssl/nginx/dhparam.pem; - -ssl_session_timeout 1d; -ssl_session_cache shared:MozSSL:10m; -ssl_session_tickets off; - -# intermediate configuration -ssl_protocols TLSv1.2 TLSv1.3; -ssl_ciphers ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:DHE-RSA-CHACHA20-POLY1305; -ssl_prefer_server_ciphers off; - -# HSTS (ngx_http_headers_module is required) (63072000 seconds) -add_header Strict-Transport-Security "max-age=63072000" always; - -add_header Content-Security-Policy-Report-Only "default-src https:; script-src https: 'unsafe-eval' 'unsafe-inline'; style-src https: 'unsafe-inline'; img-src https: data:; font-src https: data:; report-uri /csp-report"; diff --git a/Dockerfiles/web-nginx-pgsql/rhel/conf/etc/nginx/nginx.conf b/Dockerfiles/web-nginx-pgsql/rhel/conf/etc/nginx/nginx.conf deleted file mode 100644 index 76021534..00000000 --- a/Dockerfiles/web-nginx-pgsql/rhel/conf/etc/nginx/nginx.conf +++ /dev/null @@ -1,71 +0,0 @@ -include /etc/nginx/includes/user.conf; - -worker_processes 5; -worker_rlimit_nofile 256000; - -error_log stderr error; - -pid /tmp/nginx.pid; - -events { - worker_connections 5120; - use epoll; -} - -http { - include /etc/nginx/mime.types; - default_type application/octet-stream; - - log_format main '$remote_addr - $remote_user [$time_local] "$request" ' - '$status $body_bytes_sent "$http_referer" ' - '"$http_user_agent" "$http_x_forwarded_for"'; - - include /etc/nginx/includes/access-log.conf; - error_log stderr error; - - client_body_temp_path /tmp/client_body 1 2; - proxy_temp_path /tmp/proxy 1 2; - fastcgi_temp_path /tmp/fastcgi 1 2; - uwsgi_temp_path /tmp/uwsgi 1 2; - scgi_temp_path /tmp/scgi 1 2; - - client_body_timeout 5m; - send_timeout 5m; - - connection_pool_size 4096; - client_header_buffer_size 4k; - large_client_header_buffers 4 4k; - request_pool_size 4k; - reset_timedout_connection on; - - - gzip on; - gzip_min_length 100; - gzip_buffers 4 8k; - gzip_comp_level 5; - gzip_types text/plain; - gzip_types application/x-javascript; - gzip_types text/css; - - output_buffers 128 512k; - postpone_output 1460; - aio on; - directio 512; - - sendfile on; - client_max_body_size 8m; - client_body_buffer_size 256k; - fastcgi_intercept_errors on; - - tcp_nopush on; - tcp_nodelay on; - - keepalive_timeout 75 20; - - ignore_invalid_headers on; - - index index.php; - server_tokens {EXPOSE_WEB_SERVER_INFO}; - - include /etc/nginx/conf.d/*.conf; -} diff --git a/Dockerfiles/web-nginx-pgsql/rhel/conf/etc/php-fpm.conf b/Dockerfiles/web-nginx-pgsql/rhel/conf/etc/php-fpm.conf deleted file mode 100644 index c3accf48..00000000 --- a/Dockerfiles/web-nginx-pgsql/rhel/conf/etc/php-fpm.conf +++ /dev/null @@ -1,10 +0,0 @@ -include=/etc/php-fpm.d/*.conf - -[global] - -pid = /tmp/php-fpm.pid - -error_log = /dev/fd/2 -log_level = notice - -daemonize = no diff --git a/Dockerfiles/web-nginx-pgsql/rhel/conf/etc/php-fpm.d/zabbix.conf b/Dockerfiles/web-nginx-pgsql/rhel/conf/etc/php-fpm.d/zabbix.conf deleted file mode 100644 index 66c3c125..00000000 --- a/Dockerfiles/web-nginx-pgsql/rhel/conf/etc/php-fpm.d/zabbix.conf +++ /dev/null @@ -1,36 +0,0 @@ -[zabbix] - -; https://www.php.net/manual/en/security.hiding.php -php_value[expose_php] = ${EXPOSE_WEB_SERVER_INFO} - -listen = /tmp/php-fpm.sock - -clear_env = no - -pm = ${PHP_FPM_PM} -pm.max_children = ${PHP_FPM_PM_MAX_CHILDREN} -pm.start_servers = ${PHP_FPM_PM_START_SERVERS} -pm.min_spare_servers = ${PHP_FPM_PM_MIN_SPARE_SERVERS} -pm.max_spare_servers = ${PHP_FPM_PM_MAX_SPARE_SERVERS} -pm.max_requests = ${PHP_FPM_PM_MAX_REQUESTS} - -slowlog = /dev/fd/1 - -php_admin_value[error_log] = /dev/fd/2 -php_admin_flag[log_errors] = on -catch_workers_output = yes - -php_value[session.save_handler] = files -php_value[session.save_path] = /var/lib/php/session - -php_value[max_execution_time] = ${ZBX_MAXEXECUTIONTIME} -php_value[memory_limit] = ${ZBX_MEMORYLIMIT} -php_value[post_max_size] = ${ZBX_POSTMAXSIZE} -php_value[upload_max_filesize] = ${ZBX_UPLOADMAXFILESIZE} -php_value[max_input_time] = ${ZBX_MAXINPUTTIME} -php_value[max_input_vars] = 10000 -php_value[date.timezone] = ${PHP_TZ} - -; PHP-FPM monitoring -pm.status_path = /status -ping.path = /ping diff --git a/Dockerfiles/web-nginx-pgsql/rhel/conf/etc/zabbix/nginx.conf b/Dockerfiles/web-nginx-pgsql/rhel/conf/etc/zabbix/nginx.conf deleted file mode 100644 index 42d5aa2b..00000000 --- a/Dockerfiles/web-nginx-pgsql/rhel/conf/etc/zabbix/nginx.conf +++ /dev/null @@ -1,7 +0,0 @@ -server { - listen 8080; - include /etc/nginx/includes/listen-ipv6.conf; - - include /etc/nginx/includes/real-ip.conf; - include /etc/nginx/includes/server-common.conf; -} diff --git a/Dockerfiles/web-nginx-pgsql/rhel/conf/etc/zabbix/nginx_ssl.conf b/Dockerfiles/web-nginx-pgsql/rhel/conf/etc/zabbix/nginx_ssl.conf deleted file mode 100644 index 01fbf7b4..00000000 --- a/Dockerfiles/web-nginx-pgsql/rhel/conf/etc/zabbix/nginx_ssl.conf +++ /dev/null @@ -1,10 +0,0 @@ -server { - listen 8443 ssl; - include /etc/nginx/includes/listen-ipv6-ssl.conf; - - http2 on; - - include /etc/nginx/includes/real-ip.conf; - include /etc/nginx/includes/server-ssl.conf; - include /etc/nginx/includes/server-common.conf; -} diff --git a/Dockerfiles/web-nginx-pgsql/rhel/licenses/AGPL-v3.0.txt b/Dockerfiles/web-nginx-pgsql/rhel/licenses/AGPL-v3.0.txt deleted file mode 100644 index be3f7b28..00000000 --- a/Dockerfiles/web-nginx-pgsql/rhel/licenses/AGPL-v3.0.txt +++ /dev/null @@ -1,661 +0,0 @@ - GNU AFFERO GENERAL PUBLIC LICENSE - Version 3, 19 November 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU Affero General Public License is a free, copyleft license for -software and other kinds of works, specifically designed to ensure -cooperation with the community in the case of network server software. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -our General Public Licenses are intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - Developers that use our General Public Licenses protect your rights -with two steps: (1) assert copyright on the software, and (2) offer -you this License which gives you legal permission to copy, distribute -and/or modify the software. - - A secondary benefit of defending all users' freedom is that -improvements made in alternate versions of the program, if they -receive widespread use, become available for other developers to -incorporate. Many developers of free software are heartened and -encouraged by the resulting cooperation. However, in the case of -software used on network servers, this result may fail to come about. -The GNU General Public License permits making a modified version and -letting the public access it on a server without ever releasing its -source code to the public. - - The GNU Affero General Public License is designed specifically to -ensure that, in such cases, the modified source code becomes available -to the community. It requires the operator of a network server to -provide the source code of the modified version running there to the -users of that server. Therefore, public use of a modified version, on -a publicly accessible server, gives the public access to the source -code of the modified version. - - An older license, called the Affero General Public License and -published by Affero, was designed to accomplish similar goals. This is -a different license, not a version of the Affero GPL, but Affero has -released a new version of the Affero GPL which permits relicensing under -this license. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU Affero General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Remote Network Interaction; Use with the GNU General Public License. - - Notwithstanding any other provision of this License, if you modify the -Program, your modified version must prominently offer all users -interacting with it remotely through a computer network (if your version -supports such interaction) an opportunity to receive the Corresponding -Source of your version by providing access to the Corresponding Source -from a network server at no charge, through some standard or customary -means of facilitating copying of software. This Corresponding Source -shall include the Corresponding Source for any work covered by version 3 -of the GNU General Public License that is incorporated pursuant to the -following paragraph. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the work with which it is combined will remain governed by version -3 of the GNU General Public License. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU Affero General Public License from time to time. Such new versions -will be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU Affero General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU Affero General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU Affero General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Affero General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Affero General Public License for more details. - - You should have received a copy of the GNU Affero General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If your software can interact with users remotely through a computer -network, you should also make sure that it provides a way for users to -get its source. For example, if your program is a web application, its -interface could display a "Source" link that leads users to an archive -of the code. There are many ways you could offer source, and different -solutions will be better for different programs; see section 13 for the -specific requirements. - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU AGPL, see -. diff --git a/Dockerfiles/web-nginx-pgsql/ubuntu/.dockerignore b/Dockerfiles/web-nginx-pgsql/ubuntu/.dockerignore deleted file mode 100644 index 88a84e55..00000000 --- a/Dockerfiles/web-nginx-pgsql/ubuntu/.dockerignore +++ /dev/null @@ -1 +0,0 @@ -build.sh diff --git a/Dockerfiles/web-nginx-pgsql/ubuntu/Dockerfile b/Dockerfiles/web-nginx-pgsql/ubuntu/Dockerfile deleted file mode 100644 index a2de08d3..00000000 --- a/Dockerfiles/web-nginx-pgsql/ubuntu/Dockerfile +++ /dev/null @@ -1,147 +0,0 @@ -# syntax=docker/dockerfile:1.6 -ARG OS_BASE_IMAGE=ubuntu:resolute -ARG MAJOR_VERSION=7.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.12 -ARG BUILD_BASE_IMAGE=zabbix-build-pgsql:ubuntu-${ZBX_VERSION} - -FROM ${BUILD_BASE_IMAGE} AS builder -FROM builder AS clean_builder - -ARG ZBX_VERSION - -RUN set -eux && \ - rm -rf \ - "/tmp/zabbix-${ZBX_VERSION}/ui/tests" \ - "/tmp/zabbix-${ZBX_VERSION}/ui/conf/zabbix.conf.php" \ - "/tmp/zabbix-${ZBX_VERSION}/ui/conf/zabbix.conf.php.example" \ - "/tmp/zabbix-${ZBX_VERSION}/ui/conf/maintenance.inc.php" && \ - find "/tmp/zabbix-${ZBX_VERSION}/ui/locale" -name '*.po' -delete && \ - find "/tmp/zabbix-${ZBX_VERSION}/ui/locale" -name '*.sh' -delete - -FROM ${OS_BASE_IMAGE} - -ARG MAJOR_VERSION -ARG ZBX_VERSION -ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git - -ENV TERM=xterm \ - ZBX_VERSION=${ZBX_VERSION} \ - ZBX_SOURCES=${ZBX_SOURCES} \ - ZABBIX_CONF_DIR=/etc/zabbix \ - ZABBIX_USER_HOME_DIR=/var/lib/zabbix \ - ZABBIX_WWW_ROOT=/usr/share/zabbix \ - PYTHONDONTWRITEBYTECODE=1 - -ENV DAEMON_USER=www-data \ - DAEMON_GROUP=www-data \ - NGINX_BIN=/usr/sbin/nginx \ - PHP_FPM_BIN=/usr/sbin/php-fpm8.5 \ - NGINX_CONFD_DIR=/etc/nginx/conf.d \ - PHP_FPM_CONFIG=/etc/php/8.5/fpm/php-fpm.conf \ - PHP_ZBX_CONFIG_FILE=/etc/php/8.5/fpm/pool.d/zabbix.conf - -LABEL org.opencontainers.image.authors="Alexey Pustovalov " \ - org.opencontainers.image.description="Zabbix web-interface based on Nginx web server with PostgreSQL database support" \ - org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ - org.opencontainers.image.licenses="AGPL v3.0" \ - org.opencontainers.image.source="${ZBX_SOURCES}" \ - org.opencontainers.image.title="Zabbix web-interface (Nginx, PostgreSQL)" \ - org.opencontainers.image.url="https://zabbix.com/" \ - org.opencontainers.image.vendor="Zabbix SIA" \ - org.opencontainers.image.version="${ZBX_VERSION}" - -STOPSIGNAL SIGTERM - -COPY --from=clean_builder /tmp/zabbix-${ZBX_VERSION}/ui ${ZABBIX_WWW_ROOT}/ -COPY --from=clean_builder /tmp/zabbix-${ZBX_VERSION}-output/web/conf ${ZABBIX_CONF_DIR}/web/ -COPY conf/etc/ /etc/ - -RUN --mount=type=cache,target=/var/cache/apt/,sharing=locked \ - --mount=type=cache,target=/var/lib/apt/,sharing=locked \ - set -eux && \ - INSTALL_PKGS="bash \ - ca-certificates \ - curl \ - jq \ - locales \ - tzdata \ - libldap-common \ - nginx \ - php8.5-fpm \ - php8.5-bcmath \ - php8.5-curl \ - php8.5-gd \ - php8.5-ldap \ - php8.5-mbstring \ - php8.5-pgsql \ - php8.5-xml \ - postgresql-client" && \ - apt-get update && \ - DEBIAN_FRONTEND=noninteractive apt-get -y \ - -o Dpkg::Options::="--force-confdef" \ - -o Dpkg::Options::="--force-confold" \ - --no-install-recommends install \ - ${INSTALL_PKGS} && \ - groupadd \ - --system \ - --gid 1995 \ - zabbix && \ - useradd \ - --system \ - --comment "Zabbix monitoring system" \ - -g zabbix \ - --uid 1997 \ - --shell /sbin/nologin \ - --home-dir ${ZABBIX_USER_HOME_DIR} \ - zabbix && \ - mkdir -p \ - ${ZABBIX_CONF_DIR} \ - ${ZABBIX_CONF_DIR}/web \ - ${ZABBIX_CONF_DIR}/web/certs \ - ${ZABBIX_USER_HOME_DIR} \ - ${ZABBIX_USER_HOME_DIR}/enc \ - ${ZABBIX_USER_HOME_DIR}/enc_internal \ - /var/lib/php/session \ - /var/lib/locales/supported.d && \ - rm -rf \ - /etc/nginx/conf.d/*.conf \ - /var/cache/nginx/ \ - /etc/php/8.5/fpm/pool.d/www.conf \ - /etc/php/8.5/fpm/php-fpm.conf.dpkg-dist && \ - ln -sf /dev/stdout /var/log/nginx/access.log && \ - ln -sf /dev/stderr /var/log/nginx/error.log && \ - ln -sf "${ZABBIX_CONF_DIR}/web/zabbix.conf.php" "${ZABBIX_WWW_ROOT}/conf/zabbix.conf.php" && \ - ln -sf "${ZABBIX_CONF_DIR}/web/maintenance.inc.php" "${ZABBIX_WWW_ROOT}/conf/maintenance.inc.php" && \ - rm -f /var/lib/locales/supported.d/local && \ - awk "/display/ && /true/ {gsub(/^[ \t]+|[ \t]+$/, \"\", \$0); print \$0}" "${ZABBIX_WWW_ROOT}/include/locales.inc.php" | \ - cut -d"'" -f 2 | sort -u | \ - xargs -r -I '{}' bash -c 'echo "{}.UTF-8 UTF-8" >> /var/lib/locales/supported.d/local' && \ - dpkg-reconfigure locales && \ - FIX_PERM_LIST="\ - ${ZABBIX_CONF_DIR}/ \ - ${ZABBIX_WWW_ROOT}/include/defines.inc.php \ - ${ZABBIX_WWW_ROOT}/modules/ \ - ${ZABBIX_USER_HOME_DIR}/ \ - /etc/nginx/ \ - /etc/php/8.5/fpm/php-fpm.conf \ - /etc/php/8.5/fpm/pool.d/ \ - /var/lib/php/session/" && \ - chown --quiet -R zabbix:0 ${FIX_PERM_LIST} && \ - chmod -R g=u ${FIX_PERM_LIST} - -RUN --mount=from=entrypoints,target=/tmp/entrypoints,ro \ - set -eux && \ - install -d /usr/lib/docker-entrypoint && \ - install -m 0755 /tmp/entrypoints/web-nginx-pgsql.sh /usr/bin/docker-entrypoint.sh && \ - install -m 0644 /tmp/entrypoints/lib/*.sh /usr/lib/docker-entrypoint/ - -HEALTHCHECK --interval=1m30s --timeout=3s --retries=3 --start-period=40s --start-interval=5s \ - CMD curl -f http://localhost:8080/ping || exit 1 - -EXPOSE 8080/tcp 8443/tcp - -WORKDIR ${ZABBIX_WWW_ROOT} - -USER 1997 - -ENTRYPOINT ["docker-entrypoint.sh"] diff --git a/Dockerfiles/web-nginx-pgsql/ubuntu/README.md b/Dockerfiles/web-nginx-pgsql/ubuntu/README.md deleted file mode 120000 index 32d46ee8..00000000 --- a/Dockerfiles/web-nginx-pgsql/ubuntu/README.md +++ /dev/null @@ -1 +0,0 @@ -../README.md \ No newline at end of file diff --git a/Dockerfiles/web-nginx-pgsql/ubuntu/build.sh b/Dockerfiles/web-nginx-pgsql/ubuntu/build.sh deleted file mode 120000 index 46b20313..00000000 --- a/Dockerfiles/web-nginx-pgsql/ubuntu/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../../build.sh \ No newline at end of file diff --git a/Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/nginx/includes/server-common.conf b/Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/nginx/includes/server-common.conf deleted file mode 100644 index b77386b5..00000000 --- a/Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/nginx/includes/server-common.conf +++ /dev/null @@ -1,105 +0,0 @@ -server_name zabbix; -index {HTTP_INDEX_FILE}; - -include /etc/nginx/includes/access-log.conf; -error_log stderr notice; - -set $webroot '/usr/share/zabbix'; - -root $webroot; - -large_client_header_buffers 8 8k; -client_max_body_size 10M; - -location = /favicon.ico { - log_not_found off; -} - -location = /robots.txt { - allow all; - log_not_found off; - access_log off; -} - -# Deny all attempts to access hidden files such as .htaccess, .htpasswd, .DS_Store (Mac). -location ~ /\. { - deny all; - access_log off; - log_not_found off; -} - -# caching of files -location ~* \.ico$ { - access_log off; - expires 1y; -} - -location ~* \.(js|css|png|jpg|jpeg|gif|xml|txt|svg)$ { - expires 14d; -} - -location ~* \.(woff|woff2|ttf|otf)$ { - access_log off; - expires 30d; -} - -location ~ /(app\/|conf[^\.]|include\/|local\/|locale\/|vendor\/) { - deny all; - return 404; -} - -location = /data/top_passwords.txt { - deny all; - return 404; -} - -location = /nginx-status { - access_log off; - allow 127.0.0.1; - allow ::1; - deny all; - stub_status; -} - -location ~ ^/(status|ping)$ { - access_log off; - - fastcgi_pass unix:/tmp/php-fpm.sock; - - fastcgi_param SCRIPT_FILENAME $webroot$fastcgi_script_name; - include fastcgi_params; -} - -location / { - try_files $uri $uri/ =404; -} - -location ~ [^/]\.php(/|$) { - fastcgi_split_path_info ^(.+\.php)(/.+)$; - set $path_info $fastcgi_path_info; - try_files $fastcgi_script_name =404; - - fastcgi_pass unix:/tmp/php-fpm.sock; - fastcgi_index {HTTP_INDEX_FILE}; - - fastcgi_param DOCUMENT_ROOT $webroot; - fastcgi_param SCRIPT_FILENAME $webroot$fastcgi_script_name; - fastcgi_param PATH_TRANSLATED $webroot$fastcgi_script_name; - fastcgi_param PATH_INFO $path_info; - - include fastcgi_params; - fastcgi_param QUERY_STRING $query_string; - fastcgi_param REQUEST_METHOD $request_method; - fastcgi_param CONTENT_TYPE $content_type; - fastcgi_param CONTENT_LENGTH $content_length; - - fastcgi_intercept_errors on; - fastcgi_ignore_client_abort off; - fastcgi_connect_timeout 60; - fastcgi_send_timeout 180; - fastcgi_read_timeout {FCGI_READ_TIMEOUT}; - fastcgi_buffer_size 128k; - fastcgi_buffers 4 256k; - fastcgi_busy_buffers_size 256k; - fastcgi_temp_file_write_size 256k; -} diff --git a/Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/nginx/includes/server-ssl.conf b/Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/nginx/includes/server-ssl.conf deleted file mode 100644 index 61c62354..00000000 --- a/Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/nginx/includes/server-ssl.conf +++ /dev/null @@ -1,17 +0,0 @@ -ssl_certificate /etc/ssl/nginx/ssl.crt; -ssl_certificate_key /etc/ssl/nginx/ssl.key; -ssl_dhparam /etc/ssl/nginx/dhparam.pem; - -ssl_session_timeout 1d; -ssl_session_cache shared:MozSSL:10m; -ssl_session_tickets off; - -# intermediate configuration -ssl_protocols TLSv1.2 TLSv1.3; -ssl_ciphers ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:DHE-RSA-CHACHA20-POLY1305; -ssl_prefer_server_ciphers off; - -# HSTS (ngx_http_headers_module is required) (63072000 seconds) -add_header Strict-Transport-Security "max-age=63072000" always; - -add_header Content-Security-Policy-Report-Only "default-src https:; script-src https: 'unsafe-eval' 'unsafe-inline'; style-src https: 'unsafe-inline'; img-src https: data:; font-src https: data:; report-uri /csp-report"; diff --git a/Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/nginx/nginx.conf b/Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/nginx/nginx.conf deleted file mode 100644 index 46db6396..00000000 --- a/Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/nginx/nginx.conf +++ /dev/null @@ -1,71 +0,0 @@ -include /etc/nginx/includes/user.conf; - -worker_processes 5; -worker_rlimit_nofile 256000; - -error_log stderr error; - -pid /tmp/nginx.pid; - -events { - worker_connections 5120; - use epoll; -} - -http { - include /etc/nginx/mime.types; - default_type application/octet-stream; - - log_format main '$remote_addr - $remote_user [$time_local] "$request" ' - '$status $body_bytes_sent "$http_referer" ' - '"$http_user_agent" "$http_x_forwarded_for"'; - - include /etc/nginx/includes/access-log.conf; - error_log stderr error; - - client_body_temp_path /tmp/client_body 1 2; - proxy_temp_path /tmp/proxy 1 2; - fastcgi_temp_path /tmp/fastcgi 1 2; - uwsgi_temp_path /tmp/uwsgi 1 2; - scgi_temp_path /tmp/scgi 1 2; - - client_body_timeout 5m; - send_timeout 5m; - - connection_pool_size 4096; - client_header_buffer_size 4k; - large_client_header_buffers 4 4k; - request_pool_size 4k; - reset_timedout_connection on; - - - gzip on; - gzip_min_length 100; - gzip_buffers 4 8k; - gzip_comp_level 5; - gzip_types text/plain; - gzip_types application/x-javascript; - gzip_types text/css; - - output_buffers 128 512k; - postpone_output 1460; -# aio on; - directio 512; - - sendfile on; - client_max_body_size 8m; - client_body_buffer_size 256k; - fastcgi_intercept_errors on; - - tcp_nopush on; - tcp_nodelay on; - - keepalive_timeout 75 20; - - ignore_invalid_headers on; - - index index.php; - server_tokens {EXPOSE_WEB_SERVER_INFO}; - - include /etc/nginx/conf.d/*.conf; -} diff --git a/Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/php/8.5/fpm/php-fpm.conf b/Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/php/8.5/fpm/php-fpm.conf deleted file mode 100644 index a2ae51f4..00000000 --- a/Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/php/8.5/fpm/php-fpm.conf +++ /dev/null @@ -1,10 +0,0 @@ -include=/etc/php/8.5/fpm/pool.d/*.conf - -[global] - -pid = /tmp/php-fpm.pid - -error_log = /dev/fd/2 -log_level = notice - -daemonize = no diff --git a/Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/php/8.5/fpm/pool.d/zabbix.conf b/Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/php/8.5/fpm/pool.d/zabbix.conf deleted file mode 100644 index 66c3c125..00000000 --- a/Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/php/8.5/fpm/pool.d/zabbix.conf +++ /dev/null @@ -1,36 +0,0 @@ -[zabbix] - -; https://www.php.net/manual/en/security.hiding.php -php_value[expose_php] = ${EXPOSE_WEB_SERVER_INFO} - -listen = /tmp/php-fpm.sock - -clear_env = no - -pm = ${PHP_FPM_PM} -pm.max_children = ${PHP_FPM_PM_MAX_CHILDREN} -pm.start_servers = ${PHP_FPM_PM_START_SERVERS} -pm.min_spare_servers = ${PHP_FPM_PM_MIN_SPARE_SERVERS} -pm.max_spare_servers = ${PHP_FPM_PM_MAX_SPARE_SERVERS} -pm.max_requests = ${PHP_FPM_PM_MAX_REQUESTS} - -slowlog = /dev/fd/1 - -php_admin_value[error_log] = /dev/fd/2 -php_admin_flag[log_errors] = on -catch_workers_output = yes - -php_value[session.save_handler] = files -php_value[session.save_path] = /var/lib/php/session - -php_value[max_execution_time] = ${ZBX_MAXEXECUTIONTIME} -php_value[memory_limit] = ${ZBX_MEMORYLIMIT} -php_value[post_max_size] = ${ZBX_POSTMAXSIZE} -php_value[upload_max_filesize] = ${ZBX_UPLOADMAXFILESIZE} -php_value[max_input_time] = ${ZBX_MAXINPUTTIME} -php_value[max_input_vars] = 10000 -php_value[date.timezone] = ${PHP_TZ} - -; PHP-FPM monitoring -pm.status_path = /status -ping.path = /ping diff --git a/Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/zabbix/nginx.conf b/Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/zabbix/nginx.conf deleted file mode 100644 index 42d5aa2b..00000000 --- a/Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/zabbix/nginx.conf +++ /dev/null @@ -1,7 +0,0 @@ -server { - listen 8080; - include /etc/nginx/includes/listen-ipv6.conf; - - include /etc/nginx/includes/real-ip.conf; - include /etc/nginx/includes/server-common.conf; -} diff --git a/Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/zabbix/nginx_ssl.conf b/Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/zabbix/nginx_ssl.conf deleted file mode 100644 index 01fbf7b4..00000000 --- a/Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/zabbix/nginx_ssl.conf +++ /dev/null @@ -1,10 +0,0 @@ -server { - listen 8443 ssl; - include /etc/nginx/includes/listen-ipv6-ssl.conf; - - http2 on; - - include /etc/nginx/includes/real-ip.conf; - include /etc/nginx/includes/server-ssl.conf; - include /etc/nginx/includes/server-common.conf; -} diff --git a/Dockerfiles/web-service/README.md b/Dockerfiles/web-service/README.md deleted file mode 100644 index 71fe9327..00000000 --- a/Dockerfiles/web-service/README.md +++ /dev/null @@ -1,166 +0,0 @@ -![logo](https://assets.zabbix.com/img/logo/zabbix_logo_500x131.png) - -# What is Zabbix? - -Zabbix is an enterprise-class open source distributed monitoring solution. - -Zabbix is software that monitors numerous parameters of a network and the health and integrity of servers. Zabbix uses a flexible notification mechanism that allows users to configure e-mail based alerts for virtually any event. This allows a fast reaction to server problems. Zabbix offers excellent reporting and data visualisation features based on the stored data. This makes Zabbix ideal for capacity planning. - -For more information and related downloads for Zabbix components, please visit https://hub.docker.com/u/zabbix/ and https://zabbix.com - -# What is Zabbix web service? - -Zabbix web service for performing various tasks using headless web browser (for example, reporting). - -# Zabbix web service images - -These are the only official Zabbix web service Docker images. They are based on Alpine Linux v3.24, Ubuntu 26.04 (resolute), CentOS Stream 10 and Oracle Linux 10 images. The available versions of Zabbix web service are: - - Zabbix web service 6.0 (tags: alpine-6.0-latest, ubuntu-6.0-latest, ol-6.0-latest) - Zabbix web service 6.0.* (tags: alpine-6.0.*, ubuntu-6.0.*, ol-6.0.*) - Zabbix web service 7.0 (tags: alpine-7.0-latest, ubuntu-7.0-latest, ol-7.0-latest) - Zabbix web service 7.0.* (tags: alpine-7.0.*, ubuntu-7.0.*, ol-7.0.*) - Zabbix web service 7.2 (tags: alpine-7.2-latest, ubuntu-7.2-latest, ol-7.2-latest) - Zabbix web service 7.2.* (tags: alpine-7.2.*, ubuntu-7.2.*, ol-7.2.*) - Zabbix web service 7.4 (tags: alpine-7.4-latest, ubuntu-7.4-latest, ol-7.4-latest, alpine-latest, ubuntu-latest, ol-latest, latest) - Zabbix web service 7.4.* (tags: alpine-7.4.*, ubuntu-7.4.*, ol-7.4.*) - Zabbix web service 8.0 (tags: alpine-trunk, ubuntu-trunk, ol-trunk) - -Images are updated when new releases are published. The image with ``latest`` tag is based on Alpine Linux. - -# How to use this image - -## Start `zabbix-web-service` - -Start a Zabbix web service container as follows: - - docker run --name some-zabbix-web-service -e ZBX_ALLOWEDIP="some-zabbix-server" --cap-add=SYS_ADMIN -d zabbix/zabbix-web-service:tag - -Where `some-zabbix-web-service` is the name you want to assign to your container, `some-zabbix-server` is IP or DNS name of Zabbix server and `tag` is the tag specifying the version you want. See the list above for relevant tags, or look at the [full list of tags](https://hub.docker.com/r/zabbix/zabbix-web-service/tags/). - -## Connects from Zabbix server in other containers - -This image exposes the standard Zabbix web service port (``10053``) to perform communication, so container linking makes Zabbix web service instance available to Zabbix server containers. Start your application container like this in order to link it to the Zabbix web service container: - -```console -$ docker run --name some-zabbix-server --link some-zabbix-web-service:zabbix-web-service -e ZBX_STARTREPORTWRITERS="2" -e ZBX_WEBSERVICEURL="http://some-zabbix-web-service:10053/report" -d zabbix/zabbix-server:latest -``` - -## Container shell access and viewing Zabbix web service logs - -The `docker exec` command allows you to run commands inside a Docker container. The following command line will give you a bash shell inside your `zabbix-web-service` container: - -```console -$ docker exec -ti some-zabbix-web-service /bin/bash -``` - -The Zabbix web service log is available through Docker's container log: - -```console -$ docker logs some-zabbix-web-service -``` - -## Environment Variables - -When you start the `zabbix-web-service` image, you can adjust the configuration of the Zabbix web service by passing one or more environment variables on the `docker run` command line. - -### `ZBX_ALLOWEDIP` - -This variable is IP or DNS name or list of IP / DNS names of Zabbix server. By default, value is `zabbix-server`. - -### `ZBX_LISTENPORT` - -Listen port for incoming request. By default, value is `10053`. - -### `ZBX_DEBUGLEVEL` - -The variable is used to specify debug level. By default, value is ``3``. It is ``DebugLevel`` parameter in ``zabbix_web_service.conf``. Allowed values are listed below: -- ``0`` - basic information about starting and stopping of Zabbix processes; -- ``1`` - critical information -- ``2`` - error information -- ``3`` - warnings -- ``4`` - for debugging (produces lots of information) -- ``5`` - extended debugging (produces even more information) - -### `ZBX_TIMEOUT` - -The variable is used to specify timeout for processing requests. By default, value is ``3``. - -### Other variables - -Additionally the image allows to specify many other environment variables listed below: - -``` -ZBX_TLSACCEPT=unencrypted -ZBX_TLSCAFILE= -ZBX_TLSCA= -ZBX_TLSCERTFILE= -ZBX_TLSCERT= -ZBX_TLSKEYFILE= -ZBX_TLSKEY= -ZBX_IGNOREURLCERTERRORS=0 -``` - -Default values of these variables are specified after equal sign. - -Please use official documentation for [``zabbix_web_service.conf``](https://www.zabbix.com/documentation/current/manual/appendix/config/zabbix_web_service) to get more information about the variables. - -## Allowed volumes for the Zabbix web service container - -### ``/var/lib/zabbix/enc`` - -The volume is used to store TLS related files. These file names are specified using ``ZBX_TLSCAFILE``, ``ZBX_TLSCERTFILE`` and ``ZBX_TLSKEYFILE`` variables. Additionally it is possible to use environment variables ``ZBX_TLSCA``, ``ZBX_TLSCERT`` and ``ZBX_TLSKEY`` with plaintext values. - -# The image variants - -The `zabbix-web-service` images come in many flavors, each designed for a specific use case. - -## `zabbix-web-service:alpine-` - -This image is based on the popular [Alpine Linux project](http://alpinelinux.org), available in [the `alpine` official image](https://hub.docker.com/_/alpine). Alpine Linux is much smaller than most distribution base images (~5MB), and thus leads to much slimmer images in general. - -This variant is highly recommended when final image size being as small as possible is desired. The main caveat to note is that it does use [musl libc](http://www.musl-libc.org) instead of [glibc and friends](http://www.etalabs.net/compare_libcs.html), so certain software might run into issues depending on the depth of their libc requirements. However, most software doesn't have an issue with this, so this variant is usually a very safe choice. See [this Hacker News comment thread](https://news.ycombinator.com/item?id=10782897) for more discussion of the issues that might arise and some pro/con comparisons of using Alpine-based images. - -To minimize image size, it's uncommon for additional related tools (such as `git` or `bash`) to be included in Alpine-based images. Using this image as a base, add the things you need in your own Dockerfile (see the [`alpine` image description](https://hub.docker.com/_/alpine/) for examples of how to install packages if you are unfamiliar). - -## `zabbix-web-service:ubuntu-` - -This is the defacto image. If you are unsure about what your needs are, you probably want to use this one. It is designed to be used both as a throw away container (mount your source code and start the container to start your app), as well as the base to build other images off of. - -## `zabbix-web-service:ol-` - -Oracle Linux is an open-source operating system available under the GNU General Public License (GPLv2). Suitable for general purpose or Oracle workloads, it benefits from rigorous testing of more than 128,000 hours per day with real-world workloads and includes unique innovations such as Ksplice for zero-downtime kernel patching, DTrace for real-time diagnostics, the powerful Btrfs file system, and more. - -# User Feedback - -## Documentation - -Documentation for this image is stored in the [`web-service/` directory](https://github.com/zabbix/zabbix-docker/tree/7.4/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.4/README.md) before attempting a pull request. - -## Issues - -If you have any problems with or questions about this image, please contact us through a [GitHub issue](https://github.com/zabbix/zabbix-docker/issues). - -### Known issues - -Zabbix web services uses Google Chromium with headless mode. Because of restrictions you may see the following error during report generation: -``` -Failed to move to new namespace: PID namespaces supported, Network namespace supported, but failed: errno = Operation not permitted -``` - -To avoid the issue it is required to add ``SYS_ADMIN`` capability for Zabbix web service. The capability is redundant and allow too much. - -## Contributing - -You are invited to contribute new features, fixes, or updates, large or small; we are always thrilled to receive pull requests, and do our best to process them as fast as we can. - -Before you start to code, we recommend discussing your plans through a [GitHub issue](https://github.com/zabbix/zabbix-docker/issues), especially for more ambitious contributions. This gives other contributors a chance to point you in the right direction, give you feedback on your design, and help you find out if someone else is working on the same thing. - -## License - -Starting from Zabbix version 7.0, all subsequent Zabbix versions will be released under the GNU Affero General Public License version 3 (AGPLv3). -You can modify the relevant version and propagate such modified version under the terms of the AGPLv3 as published by the Free Software Foundation. -For additional details, including answers to common questions about the AGPLv3, see the generic FAQ from the [Free Software Foundation](http://www.fsf.org/licenses/gpl-faq.html). - -Zabbix is Open Source Software, however, if you use Zabbix in a commercial context we kindly ask you to support the development of Zabbix by purchasing some level of technical support. -All previous Zabbix software versions up to 6.4 are released under the GNU General Public License version 2 (GPLv2). The formal terms of the GPLv2 and AGPLv3 can be found at http://www.fsf.org/licenses/. diff --git a/Dockerfiles/web-service/alpine/.dockerignore b/Dockerfiles/web-service/alpine/.dockerignore deleted file mode 100644 index 88a84e55..00000000 --- a/Dockerfiles/web-service/alpine/.dockerignore +++ /dev/null @@ -1 +0,0 @@ -build.sh diff --git a/Dockerfiles/web-service/alpine/Dockerfile b/Dockerfiles/web-service/alpine/Dockerfile deleted file mode 100644 index ba11ac2f..00000000 --- a/Dockerfiles/web-service/alpine/Dockerfile +++ /dev/null @@ -1,79 +0,0 @@ -# syntax=docker/dockerfile:1.6 -ARG OS_BASE_IMAGE=alpine:3.24 -ARG MAJOR_VERSION=7.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.12 -ARG BUILD_BASE_IMAGE=zabbix-build-mysql:alpine-${ZBX_VERSION} - -FROM ${BUILD_BASE_IMAGE} AS builder - -FROM ${OS_BASE_IMAGE} - -ARG MAJOR_VERSION -ARG ZBX_VERSION -ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git - -ENV TERM=xterm \ - ZBX_VERSION=${ZBX_VERSION} \ - ZBX_SOURCES=${ZBX_SOURCES} \ - ZABBIX_USER_HOME_DIR=/var/lib/zabbix \ - ZABBIX_CONF_DIR=/etc/zabbix - -LABEL org.opencontainers.image.authors="Alexey Pustovalov " \ - org.opencontainers.image.description="Zabbix web service for performing various tasks using headless web browser" \ - org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ - org.opencontainers.image.licenses="AGPL v3.0" \ - org.opencontainers.image.source="${ZBX_SOURCES}" \ - org.opencontainers.image.title="Zabbix web service" \ - org.opencontainers.image.url="https://zabbix.com/" \ - org.opencontainers.image.vendor="Zabbix SIA" \ - org.opencontainers.image.version="${ZBX_VERSION}" - -STOPSIGNAL SIGTERM - -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/web_service/sbin/zabbix_web_service /usr/sbin/zabbix_web_service -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/web_service/conf/ ${ZABBIX_CONF_DIR}/ - -RUN set -eux && \ - INSTALL_PKGS="bash \ - ca-certificates \ - chromium" && \ - apk add \ - --no-cache \ - --clean-protected \ - ${INSTALL_PKGS} && \ - addgroup \ - --system \ - --gid 1995 \ - zabbix && \ - adduser \ - --system \ - --gecos "Zabbix monitoring system" \ - --disabled-password \ - --uid 1997 \ - --ingroup zabbix \ - --shell /sbin/nologin \ - --home ${ZABBIX_USER_HOME_DIR} \ - zabbix && \ - mkdir -p ${ZABBIX_CONF_DIR} \ - ${ZABBIX_USER_HOME_DIR} \ - ${ZABBIX_USER_HOME_DIR}/enc \ - ${ZABBIX_USER_HOME_DIR}/enc_internal && \ - chown --quiet -R zabbix:0 ${ZABBIX_USER_HOME_DIR}/ && \ - chmod -R g=u ${ZABBIX_USER_HOME_DIR}/ && \ - /usr/sbin/zabbix_web_service -V - -RUN --mount=from=entrypoints,target=/tmp/entrypoints,ro \ - set -eux && \ - install -d /usr/lib/docker-entrypoint && \ - install -m 0755 /tmp/entrypoints/web-service.sh /usr/bin/docker-entrypoint.sh && \ - install -m 0644 /tmp/entrypoints/lib/*.sh /usr/lib/docker-entrypoint/ - -EXPOSE 10053/tcp - -WORKDIR ${ZABBIX_USER_HOME_DIR} - -USER 1997 - -ENTRYPOINT ["docker-entrypoint.sh"] - -CMD ["/usr/sbin/zabbix_web_service", "-c", "/etc/zabbix/zabbix_web_service.conf"] diff --git a/Dockerfiles/web-service/alpine/README.md b/Dockerfiles/web-service/alpine/README.md deleted file mode 120000 index 32d46ee8..00000000 --- a/Dockerfiles/web-service/alpine/README.md +++ /dev/null @@ -1 +0,0 @@ -../README.md \ No newline at end of file diff --git a/Dockerfiles/web-service/alpine/build.sh b/Dockerfiles/web-service/alpine/build.sh deleted file mode 120000 index 46b20313..00000000 --- a/Dockerfiles/web-service/alpine/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../../build.sh \ No newline at end of file diff --git a/Dockerfiles/web-service/centos/.dockerignore b/Dockerfiles/web-service/centos/.dockerignore deleted file mode 100644 index 88a84e55..00000000 --- a/Dockerfiles/web-service/centos/.dockerignore +++ /dev/null @@ -1 +0,0 @@ -build.sh diff --git a/Dockerfiles/web-service/centos/Dockerfile b/Dockerfiles/web-service/centos/Dockerfile deleted file mode 100644 index 45786b85..00000000 --- a/Dockerfiles/web-service/centos/Dockerfile +++ /dev/null @@ -1,96 +0,0 @@ -# syntax=docker/dockerfile:1.6 -ARG OS_BASE_IMAGE=quay.io/centos/centos:stream10-minimal -ARG MAJOR_VERSION=7.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.12 -ARG BUILD_BASE_IMAGE=zabbix-build-mysql:centos-${ZBX_VERSION} - -FROM ${BUILD_BASE_IMAGE} AS builder - -FROM ${OS_BASE_IMAGE} - -ARG MAJOR_VERSION -ARG ZBX_VERSION -ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git - -ENV TERM=xterm \ - ZBX_VERSION=${ZBX_VERSION} \ - ZBX_SOURCES=${ZBX_SOURCES} \ - ZABBIX_USER_HOME_DIR=/var/lib/zabbix \ - ZABBIX_CONF_DIR=/etc/zabbix \ - PATH=/usr/lib64/chromium-browser:$PATH - -LABEL org.opencontainers.image.authors="Alexey Pustovalov " \ - org.opencontainers.image.description="Zabbix web service for performing various tasks using headless web browser" \ - org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ - org.opencontainers.image.licenses="AGPL v3.0" \ - org.opencontainers.image.source="${ZBX_SOURCES}" \ - org.opencontainers.image.title="Zabbix web service" \ - org.opencontainers.image.url="https://zabbix.com/" \ - org.opencontainers.image.vendor="Zabbix SIA" \ - org.opencontainers.image.version="${ZBX_VERSION}" - -STOPSIGNAL SIGTERM - -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/web_service/sbin/zabbix_web_service /usr/sbin/zabbix_web_service -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/web_service/conf/ ${ZABBIX_CONF_DIR}/ - -RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ - --mount=type=tmpfs,target=/var/cache/yum/ \ - set -eux && \ - INSTALL_PKGS="bash \ - ca-certificates \ - shadow-utils \ - chromium-headless" && \ - microdnf -y install \ - --disablerepo="*" \ - --enablerepo="extras-common" \ - --setopt=install_weak_deps=0 \ - --setopt=keepcache=0 \ - --best \ - --nodocs \ - epel-release && \ - microdnf -y install \ - --disablerepo="*" \ - --enablerepo="baseos" \ - --enablerepo="appstream" \ - --enablerepo="epel" \ - --setopt=install_weak_deps=0 \ - --setopt=keepcache=0 \ - --best \ - --nodocs \ - ${INSTALL_PKGS} && \ - groupadd \ - --system \ - --gid 1995 \ - zabbix && \ - useradd \ - --system \ - --comment "Zabbix monitoring system" \ - -g zabbix \ - --uid 1997 \ - --shell /sbin/nologin \ - --home-dir ${ZABBIX_USER_HOME_DIR} \ - zabbix && \ - mkdir -p ${ZABBIX_CONF_DIR} \ - ${ZABBIX_USER_HOME_DIR} \ - ${ZABBIX_USER_HOME_DIR}/enc \ - ${ZABBIX_USER_HOME_DIR}/enc_internal && \ - chown --quiet -R zabbix:0 ${ZABBIX_USER_HOME_DIR}/ && \ - chmod -R g=u ${ZABBIX_USER_HOME_DIR}/ && \ - /usr/sbin/zabbix_web_service -V - -RUN --mount=from=entrypoints,target=/tmp/entrypoints,ro \ - set -eux && \ - install -d /usr/lib/docker-entrypoint && \ - install -m 0755 /tmp/entrypoints/web-service.sh /usr/bin/docker-entrypoint.sh && \ - install -m 0644 /tmp/entrypoints/lib/*.sh /usr/lib/docker-entrypoint/ - -EXPOSE 10053/tcp - -WORKDIR ${ZABBIX_USER_HOME_DIR} - -USER 1997 - -ENTRYPOINT ["docker-entrypoint.sh"] - -CMD ["/usr/sbin/zabbix_web_service", "-c", "/etc/zabbix/zabbix_web_service.conf"] diff --git a/Dockerfiles/web-service/centos/README.md b/Dockerfiles/web-service/centos/README.md deleted file mode 120000 index 32d46ee8..00000000 --- a/Dockerfiles/web-service/centos/README.md +++ /dev/null @@ -1 +0,0 @@ -../README.md \ No newline at end of file diff --git a/Dockerfiles/web-service/centos/build.sh b/Dockerfiles/web-service/centos/build.sh deleted file mode 120000 index 46b20313..00000000 --- a/Dockerfiles/web-service/centos/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../../build.sh \ No newline at end of file diff --git a/Dockerfiles/web-service/ol/.dockerignore b/Dockerfiles/web-service/ol/.dockerignore deleted file mode 100644 index 88a84e55..00000000 --- a/Dockerfiles/web-service/ol/.dockerignore +++ /dev/null @@ -1 +0,0 @@ -build.sh diff --git a/Dockerfiles/web-service/ol/Dockerfile b/Dockerfiles/web-service/ol/Dockerfile deleted file mode 100644 index 7b2fe7c8..00000000 --- a/Dockerfiles/web-service/ol/Dockerfile +++ /dev/null @@ -1,94 +0,0 @@ -# syntax=docker/dockerfile:1.6 -ARG OS_BASE_IMAGE=container-registry.oracle.com/os/oraclelinux:10-slim -ARG MAJOR_VERSION=7.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.12 -ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ol-${ZBX_VERSION} - -FROM ${BUILD_BASE_IMAGE} AS builder - -FROM ${OS_BASE_IMAGE} - -ARG MAJOR_VERSION -ARG ZBX_VERSION -ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git - -ENV TERM=xterm \ - ZBX_VERSION=${ZBX_VERSION} \ - ZBX_SOURCES=${ZBX_SOURCES} \ - ZABBIX_USER_HOME_DIR=/var/lib/zabbix \ - ZABBIX_CONF_DIR=/etc/zabbix \ - PATH=/usr/lib64/chromium-browser:$PATH - -LABEL org.opencontainers.image.authors="Alexey Pustovalov " \ - org.opencontainers.image.description="Zabbix web service for performing various tasks using headless web browser" \ - org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ - org.opencontainers.image.licenses="AGPL v3.0" \ - org.opencontainers.image.source="${ZBX_SOURCES}" \ - org.opencontainers.image.title="Zabbix web service" \ - org.opencontainers.image.url="https://zabbix.com/" \ - org.opencontainers.image.vendor="Zabbix SIA" \ - org.opencontainers.image.version="${ZBX_VERSION}" - -STOPSIGNAL SIGTERM - -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/web_service/sbin/zabbix_web_service /usr/sbin/zabbix_web_service -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/web_service/conf/ ${ZABBIX_CONF_DIR}/ - -RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ - --mount=type=tmpfs,target=/var/cache/yum/ \ - set -eux && \ - INSTALL_PKGS="bash \ - chromium-headless" && \ - microdnf -y install \ - --disablerepo="*" \ - --enablerepo="ol10_baseos_latest" \ - --setopt=install_weak_deps=0 \ - --setopt=keepcache=0 \ - --best \ - --nodocs \ - oracle-epel-release-el10 && \ - microdnf -y install \ - --disablerepo="*" \ - --enablerepo="ol10_baseos_latest" \ - --enablerepo="ol10_appstream" \ - --enablerepo="ol10_u1_developer_EPEL" \ - --setopt=install_weak_deps=0 \ - --setopt=keepcache=0 \ - --best \ - --nodocs \ - ${INSTALL_PKGS} && \ - groupadd \ - --system \ - --gid 1995 \ - zabbix && \ - useradd \ - --system \ - --comment "Zabbix monitoring system" \ - -g zabbix \ - --uid 1997 \ - --shell /sbin/nologin \ - --home-dir ${ZABBIX_USER_HOME_DIR} \ - zabbix && \ - mkdir -p ${ZABBIX_CONF_DIR} \ - ${ZABBIX_USER_HOME_DIR} \ - ${ZABBIX_USER_HOME_DIR}/enc \ - ${ZABBIX_USER_HOME_DIR}/enc_internal && \ - chown --quiet -R zabbix:0 ${ZABBIX_USER_HOME_DIR}/ && \ - chmod -R g=u ${ZABBIX_USER_HOME_DIR}/ && \ - /usr/sbin/zabbix_web_service -V - -RUN --mount=from=entrypoints,target=/tmp/entrypoints,ro \ - set -eux && \ - install -d /usr/lib/docker-entrypoint && \ - install -m 0755 /tmp/entrypoints/web-service.sh /usr/bin/docker-entrypoint.sh && \ - install -m 0644 /tmp/entrypoints/lib/*.sh /usr/lib/docker-entrypoint/ - -EXPOSE 10053/tcp - -WORKDIR ${ZABBIX_USER_HOME_DIR} - -USER 1997 - -ENTRYPOINT ["docker-entrypoint.sh"] - -CMD ["/usr/sbin/zabbix_web_service", "-c", "/etc/zabbix/zabbix_web_service.conf"] diff --git a/Dockerfiles/web-service/ol/README.md b/Dockerfiles/web-service/ol/README.md deleted file mode 120000 index 32d46ee8..00000000 --- a/Dockerfiles/web-service/ol/README.md +++ /dev/null @@ -1 +0,0 @@ -../README.md \ No newline at end of file diff --git a/Dockerfiles/web-service/ol/build.sh b/Dockerfiles/web-service/ol/build.sh deleted file mode 120000 index 46b20313..00000000 --- a/Dockerfiles/web-service/ol/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../../build.sh \ No newline at end of file diff --git a/Dockerfiles/web-service/rhel/.dockerignore b/Dockerfiles/web-service/rhel/.dockerignore deleted file mode 100644 index 88a84e55..00000000 --- a/Dockerfiles/web-service/rhel/.dockerignore +++ /dev/null @@ -1 +0,0 @@ -build.sh diff --git a/Dockerfiles/web-service/rhel/Dockerfile b/Dockerfiles/web-service/rhel/Dockerfile deleted file mode 100644 index fb482bf8..00000000 --- a/Dockerfiles/web-service/rhel/Dockerfile +++ /dev/null @@ -1,112 +0,0 @@ -# syntax=docker/dockerfile:1.6 -ARG OS_BASE_IMAGE=registry.access.redhat.com/ubi10/ubi-minimal:10.2 -ARG MAJOR_VERSION=7.4 -ARG RELEASE=12 -ARG ZBX_VERSION=${MAJOR_VERSION}.12 -ARG BUILD_BASE_IMAGE=zabbix-build-mysql:rhel-${ZBX_VERSION} - -FROM ${BUILD_BASE_IMAGE} AS builder - -FROM ${OS_BASE_IMAGE} - -ARG MAJOR_VERSION -ARG RELEASE -ARG ZBX_VERSION -ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git - -ENV TERM=xterm \ - ZBX_VERSION=${ZBX_VERSION} \ - ZBX_SOURCES=${ZBX_SOURCES} \ - ZABBIX_USER_HOME_DIR=/var/lib/zabbix \ - ZABBIX_CONF_DIR=/etc/zabbix \ - PATH=/usr/lib64/chromium-browser:$PATH - -LABEL description="Zabbix web service for performing various tasks using headless web browser" \ - maintainer="alexey.pustovalov@zabbix.com" \ - name="zabbix/zabbix-web-service-74" \ - 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-74:${ZBX_VERSION}" \ - summary="Zabbix web service" \ - url="https://www.zabbix.com/" \ - vendor="Zabbix SIA" \ - version="${MAJOR_VERSION}" \ - io.k8s.description="Zabbix web service for performing various tasks using headless web browser" \ - io.k8s.display-name="Zabbix web service" \ - io.openshift.expose-services="10053:10053" \ - 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-74:${ZBX_VERSION}" \ - org.label-schema.license="AGPL v3.0" \ - org.label-schema.name="zabbix-web-service-rhel" \ - org.label-schema.schema-version="1.0" \ - org.label-schema.url="https://zabbix.com/" \ - org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ - org.label-schema.vcs-ref="${VCS_REF}" \ - org.label-schema.vcs-url="${ZBX_SOURCES}" \ - org.label-schema.vendor="Zabbix SIA" \ - org.label-schema.version="${ZBX_VERSION}" - -STOPSIGNAL SIGTERM - -COPY licenses /licenses/ -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/web_service/sbin/zabbix_web_service /usr/sbin/zabbix_web_service -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/web_service/conf/ ${ZABBIX_CONF_DIR}/ - -RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ - --mount=type=tmpfs,target=/var/cache/yum/ \ - set -eux && \ - INSTALL_PKGS="bash \ - shadow-utils \ - chromium-headless" && \ - curl --tlsv1.2 -sSf -L https://dl.fedoraproject.org/pub/epel/epel-release-latest-10.noarch.rpm -o /tmp/epel-release-latest-10.noarch.rpm && \ - rpm -ivh /tmp/epel-release-latest-10.noarch.rpm && \ - rm -rf /tmp/epel-release-latest-10.noarch.rpm && \ - ARCH_SUFFIX="$(arch)"; \ - microdnf -y install \ - --disablerepo="*" \ - --enablerepo="ubi-10-baseos-rpms" \ - --enablerepo="ubi-10-appstream-rpms" \ - --enablerepo="rhel-10-for-$ARCH_SUFFIX-baseos-rpms" \ - --enablerepo="rhel-10-for-$ARCH_SUFFIX-appstream-rpms" \ - --enablerepo="epel" \ - --setopt=install_weak_deps=0 \ - --setopt=keepcache=0 \ - --best \ - --setopt=tsflags=nodocs \ - ${INSTALL_PKGS} && \ - groupadd \ - --system \ - --gid 1995 \ - zabbix && \ - useradd \ - --system \ - --comment "Zabbix monitoring system" \ - -g zabbix \ - --uid 1997 \ - --shell /sbin/nologin \ - --home-dir ${ZABBIX_USER_HOME_DIR} \ - zabbix && \ - mkdir -p ${ZABBIX_CONF_DIR} \ - ${ZABBIX_USER_HOME_DIR} \ - ${ZABBIX_USER_HOME_DIR}/enc \ - ${ZABBIX_USER_HOME_DIR}/enc_internal && \ - chown --quiet -R zabbix:0 ${ZABBIX_USER_HOME_DIR}/ && \ - chmod -R g=u ${ZABBIX_USER_HOME_DIR}/ && \ - /usr/sbin/zabbix_web_service -V - -RUN --mount=from=entrypoints,target=/tmp/entrypoints,ro \ - set -eux && \ - install -d /usr/lib/docker-entrypoint && \ - install -m 0755 /tmp/entrypoints/web-service.sh /usr/bin/docker-entrypoint.sh && \ - install -m 0644 /tmp/entrypoints/lib/*.sh /usr/lib/docker-entrypoint/ - -EXPOSE 10053/tcp - -WORKDIR ${ZABBIX_USER_HOME_DIR} - -USER 1997 - -ENTRYPOINT ["docker-entrypoint.sh"] - -CMD ["/usr/sbin/zabbix_web_service", "-c", "/etc/zabbix/zabbix_web_service.conf"] diff --git a/Dockerfiles/web-service/rhel/README.html b/Dockerfiles/web-service/rhel/README.html deleted file mode 100644 index 78405d50..00000000 --- a/Dockerfiles/web-service/rhel/README.html +++ /dev/null @@ -1,68 +0,0 @@ -

What is Zabbix?

-

Zabbix is an enterprise-class open source distributed monitoring solution.

-

Zabbix is software that monitors numerous parameters of a network and the health and integrity of servers. Zabbix uses a flexible notification mechanism that allows users to configure e-mail based alerts for virtually any event. This allows a fast reaction to server problems. Zabbix offers excellent reporting and data visualisation features based on the stored data. This makes Zabbix ideal for capacity planning.

-

For more information and related downloads for Zabbix components, please visit zabbix.com

-

What is Zabbix web service?

-

Zabbix web service for performing various tasks using headless web browser (for example, reporting).

-

Zabbix web service images

-

Images are updated when new releases are published.

-

How to use this image

-

Start zabbix-web-service

-

Start a Zabbix web service container as follows:

-
podman run \
-    --name some-zabbix-web-service \
-    -e ZBX_ALLOWEDIP="some-zabbix-server" \
-    --cap-add=SYS_ADMIN \
-    -d registry.connect.redhat.com/zabbix/zabbix-web-service-74:tag
-
-

Where some-zabbix-web-service is the name you want to assign to your container, some-zabbix-server is IP or DNS name of Zabbix server and tag is the tag specifying the version you want.

-

Connects from Zabbix server in other containers

-

This image exposes the standard Zabbix web service port (10053) to perform communication, so container linking makes Zabbix web service instance available to Zabbix server containers. Start your application container like this in order to link it to the Zabbix web service container:

-
$ podman run \
-    --name some-zabbix-server \
-    --link some-zabbix-web-service:zabbix-web-service \
-    -e ZBX_STARTREPORTWRITERS="2" \
-    -e ZBX_WEBSERVICEURL="http://some-zabbix-web-service:10053/report" \
-    -d zabbix/zabbix-server:latest
-
-

Container shell access and viewing Zabbix web service logs

-

The podman exec command allows you to run commands inside a Podman container. The following command line will give you a bash shell inside your zabbix-web-service container:

-
$ podman exec -ti some-zabbix-web-service /bin/bash
-
-

The Zabbix web service log is available through Podman's container log:

-
$ podman logs some-zabbix-web-service
-
-

Environment Variables

-

When you start the zabbix-web-service image, you can adjust the configuration of the Zabbix web service by passing one or more environment variables on the podman run command line.

-

ZBX_ALLOWEDIP

-

This variable is IP or DNS name or list of IP / DNS names of Zabbix server. By default, value is zabbix-server.

-

ZBX_LISTENPORT

-

Listen port for incoming request. By default, value is 10053.

-

ZBX_DEBUGLEVEL

-

The variable is used to specify debug level. By default, value is 3. It is DebugLevel parameter in zabbix_web_service.conf. Allowed values are listed below:

-
    -
  • 0 - basic information about starting and stopping of Zabbix processes;
    • -
  • 1 - critical information
    • -
  • 2 - error information
    • -
  • 3 - warnings
    • -
  • 4 - for debugging (produces lots of information)
    • -
  • 5 - extended debugging (produces even more information)
    • -
-

ZBX_TIMEOUT

-

The variable is used to specify timeout for processing requests. By default, value is 3.

-

Other variables

-

Additionally the image allows to specify many other environment variables listed below:

-
ZBX_TLSACCEPT=unencrypted
-ZBX_TLSCAFILE=
-ZBX_TLSCA=
-ZBX_TLSCERTFILE=
-ZBX_TLSCERT=
-ZBX_TLSKEYFILE=
-ZBX_TLSKEY=
-ZBX_IGNOREURLCERTERRORS=0
-
-

Default values of these variables are specified after equal sign.

-

Please use official documentation for zabbix_web_service.conf to get more information about the variables.

-

Allowed volumes for the Zabbix web service container

-

/var/lib/zabbix/enc

-

The volume is used to store TLS related files. These file names are specified using ZBX_TLSCAFILE, ZBX_TLSCERTFILE and ZBX_TLSKEYFILE variables. Additionally it is possible to use environment variables ZBX_TLSCA, ZBX_TLSCERT and ZBX_TLSKEY with plaintext values.

diff --git a/Dockerfiles/web-service/rhel/build.sh b/Dockerfiles/web-service/rhel/build.sh deleted file mode 120000 index 46b20313..00000000 --- a/Dockerfiles/web-service/rhel/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../../build.sh \ No newline at end of file diff --git a/Dockerfiles/web-service/rhel/licenses/AGPL-v3.0.txt b/Dockerfiles/web-service/rhel/licenses/AGPL-v3.0.txt deleted file mode 100644 index be3f7b28..00000000 --- a/Dockerfiles/web-service/rhel/licenses/AGPL-v3.0.txt +++ /dev/null @@ -1,661 +0,0 @@ - GNU AFFERO GENERAL PUBLIC LICENSE - Version 3, 19 November 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU Affero General Public License is a free, copyleft license for -software and other kinds of works, specifically designed to ensure -cooperation with the community in the case of network server software. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -our General Public Licenses are intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - Developers that use our General Public Licenses protect your rights -with two steps: (1) assert copyright on the software, and (2) offer -you this License which gives you legal permission to copy, distribute -and/or modify the software. - - A secondary benefit of defending all users' freedom is that -improvements made in alternate versions of the program, if they -receive widespread use, become available for other developers to -incorporate. Many developers of free software are heartened and -encouraged by the resulting cooperation. However, in the case of -software used on network servers, this result may fail to come about. -The GNU General Public License permits making a modified version and -letting the public access it on a server without ever releasing its -source code to the public. - - The GNU Affero General Public License is designed specifically to -ensure that, in such cases, the modified source code becomes available -to the community. It requires the operator of a network server to -provide the source code of the modified version running there to the -users of that server. Therefore, public use of a modified version, on -a publicly accessible server, gives the public access to the source -code of the modified version. - - An older license, called the Affero General Public License and -published by Affero, was designed to accomplish similar goals. This is -a different license, not a version of the Affero GPL, but Affero has -released a new version of the Affero GPL which permits relicensing under -this license. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU Affero General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Remote Network Interaction; Use with the GNU General Public License. - - Notwithstanding any other provision of this License, if you modify the -Program, your modified version must prominently offer all users -interacting with it remotely through a computer network (if your version -supports such interaction) an opportunity to receive the Corresponding -Source of your version by providing access to the Corresponding Source -from a network server at no charge, through some standard or customary -means of facilitating copying of software. This Corresponding Source -shall include the Corresponding Source for any work covered by version 3 -of the GNU General Public License that is incorporated pursuant to the -following paragraph. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the work with which it is combined will remain governed by version -3 of the GNU General Public License. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU Affero General Public License from time to time. Such new versions -will be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU Affero General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU Affero General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU Affero General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Affero General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Affero General Public License for more details. - - You should have received a copy of the GNU Affero General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If your software can interact with users remotely through a computer -network, you should also make sure that it provides a way for users to -get its source. For example, if your program is a web application, its -interface could display a "Source" link that leads users to an archive -of the code. There are many ways you could offer source, and different -solutions will be better for different programs; see section 13 for the -specific requirements. - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU AGPL, see -. diff --git a/Dockerfiles/web-service/ubuntu/.dockerignore b/Dockerfiles/web-service/ubuntu/.dockerignore deleted file mode 100644 index 88a84e55..00000000 --- a/Dockerfiles/web-service/ubuntu/.dockerignore +++ /dev/null @@ -1 +0,0 @@ -build.sh diff --git a/Dockerfiles/web-service/ubuntu/Dockerfile b/Dockerfiles/web-service/ubuntu/Dockerfile deleted file mode 100644 index eab09e0d..00000000 --- a/Dockerfiles/web-service/ubuntu/Dockerfile +++ /dev/null @@ -1,91 +0,0 @@ -# syntax=docker/dockerfile:1.6 -ARG OS_BASE_IMAGE=ubuntu:resolute -ARG MAJOR_VERSION=7.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.12 -ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION} - -FROM ${BUILD_BASE_IMAGE} AS builder - -FROM ${OS_BASE_IMAGE} - -ARG MAJOR_VERSION -ARG ZBX_VERSION -ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git - -ENV TERM=xterm \ - ZBX_VERSION=${ZBX_VERSION} \ - ZBX_SOURCES=${ZBX_SOURCES} \ - ZABBIX_USER_HOME_DIR=/var/lib/zabbix \ - ZABBIX_CONF_DIR=/etc/zabbix - -LABEL org.opencontainers.image.authors="Alexey Pustovalov " \ - org.opencontainers.image.description="Zabbix web service for performing various tasks using headless web browser" \ - org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ - org.opencontainers.image.licenses="AGPL v3.0" \ - org.opencontainers.image.source="${ZBX_SOURCES}" \ - org.opencontainers.image.title="Zabbix web service" \ - org.opencontainers.image.url="https://zabbix.com/" \ - org.opencontainers.image.vendor="Zabbix SIA" \ - org.opencontainers.image.version="${ZBX_VERSION}" - -STOPSIGNAL SIGTERM - -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/web_service/sbin/zabbix_web_service /usr/sbin/zabbix_web_service -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/web_service/conf/ ${ZABBIX_CONF_DIR}/ - -RUN --mount=type=cache,target=/var/cache/apt/,sharing=locked \ - --mount=type=cache,target=/var/lib/apt/,sharing=locked \ - set -eux && \ - INSTALL_SYSTEM_PKGS="ca-certificates \ - debian-archive-keyring" && \ - apt-get update && \ - DEBIAN_FRONTEND=noninteractive apt-get install -y \ - --no-install-recommends \ - ${INSTALL_SYSTEM_PKGS} - -COPY conf/etc/ /etc/ - -RUN --mount=type=cache,target=/var/cache/apt/,sharing=locked \ - --mount=type=cache,target=/var/lib/apt/,sharing=locked \ - set -eux && \ - INSTALL_PKGS="chromium \ - chromium-sandbox" && \ - apt-get update && \ - DEBIAN_FRONTEND=noninteractive apt-get install -y \ - --no-install-recommends \ - ${INSTALL_PKGS} && \ - groupadd \ - --system \ - --gid 1995 \ - zabbix && \ - useradd \ - --system \ - --comment "Zabbix monitoring system" \ - -g zabbix \ - --uid 1997 \ - --shell /sbin/nologin \ - --home-dir ${ZABBIX_USER_HOME_DIR} \ - zabbix && \ - mkdir -p ${ZABBIX_CONF_DIR} \ - ${ZABBIX_USER_HOME_DIR} \ - ${ZABBIX_USER_HOME_DIR}/enc \ - ${ZABBIX_USER_HOME_DIR}/enc_internal && \ - chown --quiet -R zabbix:0 ${ZABBIX_USER_HOME_DIR}/ && \ - chmod -R g=u ${ZABBIX_USER_HOME_DIR}/ && \ - /usr/sbin/zabbix_web_service -V - -RUN --mount=from=entrypoints,target=/tmp/entrypoints,ro \ - set -eux && \ - install -d /usr/lib/docker-entrypoint && \ - install -m 0755 /tmp/entrypoints/web-service.sh /usr/bin/docker-entrypoint.sh && \ - install -m 0644 /tmp/entrypoints/lib/*.sh /usr/lib/docker-entrypoint/ - -EXPOSE 10053/tcp - -WORKDIR ${ZABBIX_USER_HOME_DIR} - -USER 1997 - -ENTRYPOINT ["docker-entrypoint.sh"] - -CMD ["/usr/sbin/zabbix_web_service", "-c", "/etc/zabbix/zabbix_web_service.conf"] diff --git a/Dockerfiles/web-service/ubuntu/README.md b/Dockerfiles/web-service/ubuntu/README.md deleted file mode 120000 index 32d46ee8..00000000 --- a/Dockerfiles/web-service/ubuntu/README.md +++ /dev/null @@ -1 +0,0 @@ -../README.md \ No newline at end of file diff --git a/Dockerfiles/web-service/ubuntu/build.sh b/Dockerfiles/web-service/ubuntu/build.sh deleted file mode 120000 index 46b20313..00000000 --- a/Dockerfiles/web-service/ubuntu/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../../build.sh \ No newline at end of file diff --git a/Dockerfiles/web-service/ubuntu/conf/etc/apt/preferences.d/chromium.pref b/Dockerfiles/web-service/ubuntu/conf/etc/apt/preferences.d/chromium.pref deleted file mode 100644 index 71ad9031..00000000 --- a/Dockerfiles/web-service/ubuntu/conf/etc/apt/preferences.d/chromium.pref +++ /dev/null @@ -1,14 +0,0 @@ -# Note: 2 blank lines are required between entries -Package: * -Pin: release a=resolute -Pin-Priority: 500 - -Package: * -Pin: release o=Debian -Pin-Priority: 300 - -# Pattern includes 'chromium', 'chromium-browser' and similarly -# named dependencies: -Package: chromium* -Pin: release o=Debian -Pin-Priority: 700 diff --git a/Dockerfiles/web-service/ubuntu/conf/etc/apt/sources.list.d/debian.sources b/Dockerfiles/web-service/ubuntu/conf/etc/apt/sources.list.d/debian.sources deleted file mode 100644 index 3b75b70c..00000000 --- a/Dockerfiles/web-service/ubuntu/conf/etc/apt/sources.list.d/debian.sources +++ /dev/null @@ -1,11 +0,0 @@ -Types: deb -URIs: https://deb.debian.org/debian -Suites: trixie trixie-updates -Components: main -Signed-By: /usr/share/keyrings/debian-archive-keyring.gpg - -Types: deb -URIs: https://security.debian.org/debian-security -Suites: trixie-security -Components: main -Signed-By: /usr/share/keyrings/debian-archive-keyring.gpg