diff --git a/agent/alpine/Dockerfile b/agent/alpine/Dockerfile index 1d1c8529d..5e767c02e 100644 --- a/agent/alpine/Dockerfile +++ b/agent/alpine/Dockerfile @@ -90,8 +90,6 @@ EXPOSE 10050/TCP WORKDIR /var/lib/zabbix -VOLUME ["/etc/zabbix/zabbix_agentd.d", "/var/lib/zabbix/enc", "/var/lib/zabbix/modules"] - COPY ["docker-entrypoint.sh", "/usr/bin/"] ENTRYPOINT ["/sbin/tini", "--", "/usr/bin/docker-entrypoint.sh"] diff --git a/agent/centos/Dockerfile b/agent/centos/Dockerfile index d0f13dacc..bde429eda 100644 --- a/agent/centos/Dockerfile +++ b/agent/centos/Dockerfile @@ -96,8 +96,6 @@ EXPOSE 10050/TCP WORKDIR /var/lib/zabbix -VOLUME ["/etc/zabbix/zabbix_agentd.d", "/var/lib/zabbix/enc", "/var/lib/zabbix/modules"] - COPY ["docker-entrypoint.sh", "/usr/bin/"] ENTRYPOINT ["/sbin/tini", "--", "/usr/bin/docker-entrypoint.sh"] diff --git a/agent/ubuntu/Dockerfile b/agent/ubuntu/Dockerfile index 5cf6e4ef4..a86a2614b 100644 --- a/agent/ubuntu/Dockerfile +++ b/agent/ubuntu/Dockerfile @@ -117,8 +117,6 @@ EXPOSE 10050/TCP WORKDIR /var/lib/zabbix -VOLUME ["/etc/zabbix/zabbix_agentd.d", "/var/lib/zabbix/enc", "/var/lib/zabbix/modules"] - COPY ["docker-entrypoint.sh", "/usr/bin/"] ENTRYPOINT ["/sbin/tini", "--", "/usr/bin/docker-entrypoint.sh"] diff --git a/proxy-mysql/alpine/Dockerfile b/proxy-mysql/alpine/Dockerfile index 1caf44de1..6584cb248 100644 --- a/proxy-mysql/alpine/Dockerfile +++ b/proxy-mysql/alpine/Dockerfile @@ -123,8 +123,7 @@ EXPOSE 10051/TCP WORKDIR /var/lib/zabbix -VOLUME ["/usr/lib/zabbix/externalscripts", "/var/lib/zabbix/enc", "/var/lib/zabbix/modules", "/var/lib/zabbix/snmptraps"] -VOLUME ["/var/lib/zabbix/ssh_keys", "/var/lib/zabbix/ssl/certs", "/var/lib/zabbix/ssl/keys", "/var/lib/zabbix/ssl/ssl_ca"] +VOLUME ["/var/lib/zabbix/snmptraps"] COPY ["docker-entrypoint.sh", "/usr/bin/"] diff --git a/proxy-mysql/centos/Dockerfile b/proxy-mysql/centos/Dockerfile index d7d0b6a5c..ffbdb8be0 100644 --- a/proxy-mysql/centos/Dockerfile +++ b/proxy-mysql/centos/Dockerfile @@ -129,8 +129,7 @@ EXPOSE 10051/TCP WORKDIR /var/lib/zabbix -VOLUME ["/usr/lib/zabbix/externalscripts", "/var/lib/zabbix/enc", "/var/lib/zabbix/modules", "/var/lib/zabbix/snmptraps"] -VOLUME ["/var/lib/zabbix/ssh_keys", "/var/lib/zabbix/ssl/certs", "/var/lib/zabbix/ssl/keys", "/var/lib/zabbix/ssl/ssl_ca"] +VOLUME ["/var/lib/zabbix/snmptraps"] COPY ["docker-entrypoint.sh", "/usr/bin/"] diff --git a/proxy-mysql/ubuntu/Dockerfile b/proxy-mysql/ubuntu/Dockerfile index 479ae8874..a36d2b82b 100644 --- a/proxy-mysql/ubuntu/Dockerfile +++ b/proxy-mysql/ubuntu/Dockerfile @@ -160,8 +160,7 @@ EXPOSE 10051/TCP WORKDIR /var/lib/zabbix -VOLUME ["/usr/lib/zabbix/externalscripts", "/var/lib/zabbix/enc", "/var/lib/zabbix/modules", "/var/lib/zabbix/snmptraps"] -VOLUME ["/var/lib/zabbix/ssh_keys", "/var/lib/zabbix/ssl/certs", "/var/lib/zabbix/ssl/keys", "/var/lib/zabbix/ssl/ssl_ca"] +VOLUME ["/var/lib/zabbix/snmptraps"] COPY ["docker-entrypoint.sh", "/usr/bin/"] diff --git a/proxy-sqlite3/alpine/Dockerfile b/proxy-sqlite3/alpine/Dockerfile index 83a9d6e12..c25fec7c2 100644 --- a/proxy-sqlite3/alpine/Dockerfile +++ b/proxy-sqlite3/alpine/Dockerfile @@ -119,8 +119,7 @@ EXPOSE 10051/TCP WORKDIR /var/lib/zabbix -VOLUME ["/usr/lib/zabbix/externalscripts", "/var/lib/zabbix/enc", "/var/lib/zabbix/modules", "/var/lib/zabbix/snmptraps"] -VOLUME ["/var/lib/zabbix/ssh_keys", "/var/lib/zabbix/ssl/certs", "/var/lib/zabbix/ssl/keys", "/var/lib/zabbix/ssl/ssl_ca"] +VOLUME ["/var/lib/zabbix/snmptraps"] COPY ["docker-entrypoint.sh", "/usr/bin/"] diff --git a/proxy-sqlite3/centos/Dockerfile b/proxy-sqlite3/centos/Dockerfile index 8e0f49ed1..bf3a69af2 100644 --- a/proxy-sqlite3/centos/Dockerfile +++ b/proxy-sqlite3/centos/Dockerfile @@ -128,8 +128,7 @@ EXPOSE 10051/TCP WORKDIR /var/lib/zabbix -VOLUME ["/usr/lib/zabbix/externalscripts", "/var/lib/zabbix/enc", "/var/lib/zabbix/modules", "/var/lib/zabbix/snmptraps"] -VOLUME ["/var/lib/zabbix/ssh_keys", "/var/lib/zabbix/ssl/certs", "/var/lib/zabbix/ssl/keys", "/var/lib/zabbix/ssl/ssl_ca"] +VOLUME ["/var/lib/zabbix/snmptraps"] COPY ["docker-entrypoint.sh", "/usr/bin/"] diff --git a/proxy-sqlite3/ubuntu/Dockerfile b/proxy-sqlite3/ubuntu/Dockerfile index d0cbb0586..5931eb0eb 100644 --- a/proxy-sqlite3/ubuntu/Dockerfile +++ b/proxy-sqlite3/ubuntu/Dockerfile @@ -155,8 +155,7 @@ EXPOSE 10051/TCP WORKDIR /var/lib/zabbix -VOLUME ["/usr/lib/zabbix/externalscripts", "/var/lib/zabbix/enc", "/var/lib/zabbix/modules", "/var/lib/zabbix/snmptraps"] -VOLUME ["/var/lib/zabbix/ssh_keys", "/var/lib/zabbix/ssl/certs", "/var/lib/zabbix/ssl/keys", "/var/lib/zabbix/ssl/ssl_ca"] +VOLUME ["/var/lib/zabbix/snmptraps"] COPY ["docker-entrypoint.sh", "/usr/bin/"] diff --git a/server-mysql/alpine/Dockerfile b/server-mysql/alpine/Dockerfile index 315b8d85e..3bdb70866 100644 --- a/server-mysql/alpine/Dockerfile +++ b/server-mysql/alpine/Dockerfile @@ -128,9 +128,7 @@ EXPOSE 10051/TCP WORKDIR /var/lib/zabbix -VOLUME ["/usr/lib/zabbix/alertscripts", "/usr/lib/zabbix/externalscripts", "/var/lib/zabbix/enc", "/var/lib/zabbix/mibs", "/var/lib/zabbix/modules"] -VOLUME ["/var/lib/zabbix/snmptraps", "/var/lib/zabbix/ssh_keys", "/var/lib/zabbix/ssl/certs", "/var/lib/zabbix/ssl/keys", "/var/lib/zabbix/ssl/ssl_ca"] -VOLUME ["/var/lib/zabbix/export"] +VOLUME ["/var/lib/zabbix/snmptraps", "/var/lib/zabbix/export"] COPY ["docker-entrypoint.sh", "/usr/bin/"] diff --git a/server-mysql/centos/Dockerfile b/server-mysql/centos/Dockerfile index 9ba80cc6b..d2d539887 100644 --- a/server-mysql/centos/Dockerfile +++ b/server-mysql/centos/Dockerfile @@ -135,10 +135,8 @@ EXPOSE 10051/TCP WORKDIR /var/lib/zabbix -VOLUME ["/usr/lib/zabbix/alertscripts", "/usr/lib/zabbix/externalscripts", "/var/lib/zabbix/enc", "/var/lib/zabbix/mibs", "/var/lib/zabbix/modules"] -VOLUME ["/var/lib/zabbix/snmptraps", "/var/lib/zabbix/ssh_keys", "/var/lib/zabbix/ssl/certs", "/var/lib/zabbix/ssl/keys", "/var/lib/zabbix/ssl/ssl_ca"] -VOLUME ["/var/lib/zabbix/export"] - +VOLUME ["/var/lib/zabbix/snmptraps", "/var/lib/zabbix/export"] + COPY ["docker-entrypoint.sh", "/usr/bin/"] ENTRYPOINT ["/sbin/tini", "--", "/usr/bin/docker-entrypoint.sh"] diff --git a/server-mysql/ubuntu/Dockerfile b/server-mysql/ubuntu/Dockerfile index 1656a334f..2fe5799ba 100644 --- a/server-mysql/ubuntu/Dockerfile +++ b/server-mysql/ubuntu/Dockerfile @@ -165,9 +165,7 @@ EXPOSE 10051/TCP WORKDIR /var/lib/zabbix -VOLUME ["/usr/lib/zabbix/alertscripts", "/usr/lib/zabbix/externalscripts", "/var/lib/zabbix/enc", "/var/lib/zabbix/mibs", "/var/lib/zabbix/modules"] -VOLUME ["/var/lib/zabbix/snmptraps", "/var/lib/zabbix/ssh_keys", "/var/lib/zabbix/ssl/certs", "/var/lib/zabbix/ssl/keys", "/var/lib/zabbix/ssl/ssl_ca"] -VOLUME ["/var/lib/zabbix/export"] +VOLUME ["/var/lib/zabbix/snmptraps", "/var/lib/zabbix/export"] COPY ["docker-entrypoint.sh", "/usr/bin/"] diff --git a/server-pgsql/alpine/Dockerfile b/server-pgsql/alpine/Dockerfile index fb4440218..bb14d574d 100644 --- a/server-pgsql/alpine/Dockerfile +++ b/server-pgsql/alpine/Dockerfile @@ -130,9 +130,7 @@ EXPOSE 10051/TCP WORKDIR /var/lib/zabbix -VOLUME ["/usr/lib/zabbix/alertscripts", "/usr/lib/zabbix/externalscripts", "/var/lib/zabbix/enc", "/var/lib/zabbix/mibs", "/var/lib/zabbix/modules"] -VOLUME ["/var/lib/zabbix/snmptraps", "/var/lib/zabbix/ssh_keys", "/var/lib/zabbix/ssl/certs", "/var/lib/zabbix/ssl/keys", "/var/lib/zabbix/ssl/ssl_ca"] -VOLUME ["/var/lib/zabbix/export"] +VOLUME ["/var/lib/zabbix/snmptraps", "/var/lib/zabbix/export"] COPY ["docker-entrypoint.sh", "/usr/bin/"] diff --git a/server-pgsql/centos/Dockerfile b/server-pgsql/centos/Dockerfile index 796832584..25cdfdb0d 100644 --- a/server-pgsql/centos/Dockerfile +++ b/server-pgsql/centos/Dockerfile @@ -137,10 +137,8 @@ EXPOSE 10051/TCP WORKDIR /var/lib/zabbix -VOLUME ["/usr/lib/zabbix/alertscripts", "/usr/lib/zabbix/externalscripts", "/var/lib/zabbix/enc", "/var/lib/zabbix/mibs", "/var/lib/zabbix/modules"] -VOLUME ["/var/lib/zabbix/snmptraps", "/var/lib/zabbix/ssh_keys", "/var/lib/zabbix/ssl/certs", "/var/lib/zabbix/ssl/keys", "/var/lib/zabbix/ssl/ssl_ca"] -VOLUME ["/var/lib/zabbix/export"] - +VOLUME ["/var/lib/zabbix/snmptraps", "/var/lib/zabbix/export"] + COPY ["docker-entrypoint.sh", "/usr/bin/"] ENTRYPOINT ["/sbin/tini", "--", "/usr/bin/docker-entrypoint.sh"] diff --git a/server-pgsql/ubuntu/Dockerfile b/server-pgsql/ubuntu/Dockerfile index c1e26cd58..7219e1464 100644 --- a/server-pgsql/ubuntu/Dockerfile +++ b/server-pgsql/ubuntu/Dockerfile @@ -167,10 +167,8 @@ EXPOSE 10051/TCP WORKDIR /var/lib/zabbix -VOLUME ["/usr/lib/zabbix/alertscripts", "/usr/lib/zabbix/externalscripts", "/var/lib/zabbix/enc", "/var/lib/zabbix/mibs", "/var/lib/zabbix/modules"] -VOLUME ["/var/lib/zabbix/snmptraps", "/var/lib/zabbix/ssh_keys", "/var/lib/zabbix/ssl/certs", "/var/lib/zabbix/ssl/keys", "/var/lib/zabbix/ssl/ssl_ca"] -VOLUME ["/var/lib/zabbix/export"] - +VOLUME ["/var/lib/zabbix/snmptraps", "/var/lib/zabbix/export"] + COPY ["docker-entrypoint.sh", "/usr/bin/"] ENTRYPOINT ["/sbin/tini", "--", "/usr/bin/docker-entrypoint.sh"] diff --git a/snmptraps/alpine/Dockerfile b/snmptraps/alpine/Dockerfile index ab07d3290..67e8ff0bf 100644 --- a/snmptraps/alpine/Dockerfile +++ b/snmptraps/alpine/Dockerfile @@ -70,7 +70,7 @@ EXPOSE 1162/UDP WORKDIR /var/lib/zabbix/snmptraps/ -VOLUME ["/var/lib/zabbix/snmptraps", "/var/lib/zabbix/mibs"] +VOLUME ["/var/lib/zabbix/snmptraps"] COPY ["conf/etc/supervisor/", "/etc/supervisor/"] COPY ["conf/etc/logrotate.d/zabbix_snmptraps", "/etc/logrotate.d/"] diff --git a/snmptraps/centos/Dockerfile b/snmptraps/centos/Dockerfile index ff3130dd8..daf3803b7 100644 --- a/snmptraps/centos/Dockerfile +++ b/snmptraps/centos/Dockerfile @@ -74,7 +74,7 @@ EXPOSE 1162/UDP WORKDIR /var/lib/zabbix/snmptraps/ -VOLUME ["/var/lib/zabbix/snmptraps", "/var/lib/zabbix/mibs"] +VOLUME ["/var/lib/zabbix/snmptraps"] COPY ["conf/etc/supervisor/", "/etc/supervisor/"] COPY ["conf/etc/logrotate.d/zabbix_snmptraps", "/etc/logrotate.d/"] diff --git a/snmptraps/ubuntu/Dockerfile b/snmptraps/ubuntu/Dockerfile index ee5783006..fc7cd28ee 100644 --- a/snmptraps/ubuntu/Dockerfile +++ b/snmptraps/ubuntu/Dockerfile @@ -84,7 +84,7 @@ EXPOSE 1162/UDP WORKDIR /var/lib/zabbix/snmptraps/ -VOLUME ["/var/lib/zabbix/snmptraps", "/var/lib/zabbix/mibs"] +VOLUME ["/var/lib/zabbix/snmptraps"] COPY ["conf/etc/supervisor/", "/etc/supervisor/"] COPY ["conf/etc/logrotate.d/zabbix_snmptraps", "/etc/logrotate.d/"] diff --git a/web-apache-mysql/alpine/Dockerfile b/web-apache-mysql/alpine/Dockerfile index b41fda64c..269c58035 100644 --- a/web-apache-mysql/alpine/Dockerfile +++ b/web-apache-mysql/alpine/Dockerfile @@ -94,8 +94,6 @@ EXPOSE 8080/TCP 8443/TCP WORKDIR /usr/share/zabbix -VOLUME ["/etc/ssl/apache2", "/usr/share/zabbix/modules/"] - COPY ["docker-entrypoint.sh", "/usr/bin/"] USER 1997 diff --git a/web-apache-mysql/centos/Dockerfile b/web-apache-mysql/centos/Dockerfile index 041f34385..31d79ba78 100644 --- a/web-apache-mysql/centos/Dockerfile +++ b/web-apache-mysql/centos/Dockerfile @@ -98,8 +98,6 @@ EXPOSE 8080/TCP 8443/TCP WORKDIR /usr/share/zabbix -VOLUME ["/etc/ssl/apache2", "/usr/share/zabbix/modules"] - COPY ["docker-entrypoint.sh", "/usr/bin/"] USER 1997 diff --git a/web-apache-mysql/ubuntu/Dockerfile b/web-apache-mysql/ubuntu/Dockerfile index b772d3989..ee64be28a 100644 --- a/web-apache-mysql/ubuntu/Dockerfile +++ b/web-apache-mysql/ubuntu/Dockerfile @@ -107,8 +107,6 @@ EXPOSE 8080/TCP 8443/TCP WORKDIR /usr/share/zabbix -VOLUME ["/etc/ssl/apache2", "/usr/share/zabbix/modules"] - COPY ["docker-entrypoint.sh", "/usr/bin/"] USER 1997 diff --git a/web-apache-pgsql/alpine/Dockerfile b/web-apache-pgsql/alpine/Dockerfile index 8a50707a0..03f655619 100644 --- a/web-apache-pgsql/alpine/Dockerfile +++ b/web-apache-pgsql/alpine/Dockerfile @@ -93,8 +93,6 @@ EXPOSE 8080/TCP 8443/TCP WORKDIR /usr/share/zabbix -VOLUME ["/etc/ssl/apache2", "/usr/share/zabbix/modules"] - COPY ["docker-entrypoint.sh", "/usr/bin/"] USER 1997 diff --git a/web-apache-pgsql/centos/Dockerfile b/web-apache-pgsql/centos/Dockerfile index 587b46be1..d6eda9561 100644 --- a/web-apache-pgsql/centos/Dockerfile +++ b/web-apache-pgsql/centos/Dockerfile @@ -98,8 +98,6 @@ EXPOSE 8080/TCP 8443/TCP WORKDIR /usr/share/zabbix -VOLUME ["/etc/ssl/apache2", "/usr/share/zabbix/modules"] - COPY ["docker-entrypoint.sh", "/usr/bin/"] USER 1997 diff --git a/web-apache-pgsql/ubuntu/Dockerfile b/web-apache-pgsql/ubuntu/Dockerfile index 67557d885..fe377020a 100644 --- a/web-apache-pgsql/ubuntu/Dockerfile +++ b/web-apache-pgsql/ubuntu/Dockerfile @@ -107,8 +107,6 @@ EXPOSE 8080/TCP 8443/TCP WORKDIR /usr/share/zabbix -VOLUME ["/etc/ssl/apache2"] - COPY ["docker-entrypoint.sh", "/usr/bin/"] USER 1997 diff --git a/web-nginx-mysql/alpine/Dockerfile b/web-nginx-mysql/alpine/Dockerfile index 8fe5b5a46..c07dc49c0 100644 --- a/web-nginx-mysql/alpine/Dockerfile +++ b/web-nginx-mysql/alpine/Dockerfile @@ -91,8 +91,6 @@ EXPOSE 8080/TCP 8443/TCP WORKDIR /usr/share/zabbix -VOLUME ["/etc/ssl/nginx", "/usr/share/zabbix/modules"] - COPY ["docker-entrypoint.sh", "/usr/bin/"] USER 1997 diff --git a/web-nginx-mysql/centos/Dockerfile b/web-nginx-mysql/centos/Dockerfile index 07666bf99..fa7e37d80 100644 --- a/web-nginx-mysql/centos/Dockerfile +++ b/web-nginx-mysql/centos/Dockerfile @@ -90,8 +90,6 @@ EXPOSE 8080/TCP 8443/TCP WORKDIR /usr/share/zabbix -VOLUME ["/etc/ssl/nginx", "/usr/share/zabbix/modules"] - COPY ["docker-entrypoint.sh", "/usr/bin/"] USER 1997 diff --git a/web-nginx-mysql/ubuntu/Dockerfile b/web-nginx-mysql/ubuntu/Dockerfile index e156ff718..fedf12408 100644 --- a/web-nginx-mysql/ubuntu/Dockerfile +++ b/web-nginx-mysql/ubuntu/Dockerfile @@ -120,8 +120,6 @@ EXPOSE 8080/TCP 8443/TCP WORKDIR /usr/share/zabbix -VOLUME ["/etc/ssl/nginx"] - COPY ["docker-entrypoint.sh", "/usr/bin/"] USER 1997 diff --git a/web-nginx-pgsql/alpine/Dockerfile b/web-nginx-pgsql/alpine/Dockerfile index 31900dfdf..3e1cb954b 100644 --- a/web-nginx-pgsql/alpine/Dockerfile +++ b/web-nginx-pgsql/alpine/Dockerfile @@ -90,8 +90,6 @@ EXPOSE 8080/TCP 8443/TCP WORKDIR /usr/share/zabbix -VOLUME ["/etc/ssl/nginx", "/usr/share/zabbix/modules"] - COPY ["docker-entrypoint.sh", "/usr/bin/"] USER 1997 diff --git a/web-nginx-pgsql/centos/Dockerfile b/web-nginx-pgsql/centos/Dockerfile index 1c3b4b183..e16cb05d3 100644 --- a/web-nginx-pgsql/centos/Dockerfile +++ b/web-nginx-pgsql/centos/Dockerfile @@ -90,8 +90,6 @@ EXPOSE 8080/TCP 8443/TCP WORKDIR /usr/share/zabbix -VOLUME ["/etc/ssl/nginx", "/usr/share/zabbix/modules"] - COPY ["docker-entrypoint.sh", "/usr/bin/"] USER 1997 diff --git a/web-nginx-pgsql/ubuntu/Dockerfile b/web-nginx-pgsql/ubuntu/Dockerfile index d065c2c4a..f1d4e9449 100644 --- a/web-nginx-pgsql/ubuntu/Dockerfile +++ b/web-nginx-pgsql/ubuntu/Dockerfile @@ -120,8 +120,6 @@ EXPOSE 8080/TCP 8443/TCP WORKDIR /usr/share/zabbix -VOLUME ["/etc/ssl/nginx"] - COPY ["docker-entrypoint.sh", "/usr/bin/"] USER 1997