diff --git a/agent/alpine/Dockerfile b/agent/alpine/Dockerfile index cf3608d6f..213601cb0 100644 --- a/agent/alpine/Dockerfile +++ b/agent/alpine/Dockerfile @@ -89,8 +89,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 1d5ab4175..3aba83407 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 ff2db5ae3..25611d498 100644 --- a/agent/ubuntu/Dockerfile +++ b/agent/ubuntu/Dockerfile @@ -116,8 +116,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 336bb4566..da66da958 100644 --- a/proxy-mysql/alpine/Dockerfile +++ b/proxy-mysql/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-mysql/centos/Dockerfile b/proxy-mysql/centos/Dockerfile index f58936fed..0e2a561f5 100644 --- a/proxy-mysql/centos/Dockerfile +++ b/proxy-mysql/centos/Dockerfile @@ -127,8 +127,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 10d6d23a1..c04c341c4 100644 --- a/proxy-mysql/ubuntu/Dockerfile +++ b/proxy-mysql/ubuntu/Dockerfile @@ -154,8 +154,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 b71d60c0c..ddf7bfc2e 100644 --- a/proxy-sqlite3/alpine/Dockerfile +++ b/proxy-sqlite3/alpine/Dockerfile @@ -115,8 +115,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 fc15f4b28..e06b786ad 100644 --- a/proxy-sqlite3/centos/Dockerfile +++ b/proxy-sqlite3/centos/Dockerfile @@ -126,8 +126,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 4dd6ec1cc..78bcaf978 100644 --- a/proxy-sqlite3/ubuntu/Dockerfile +++ b/proxy-sqlite3/ubuntu/Dockerfile @@ -149,8 +149,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 1ef5e3a98..42bd4a5be 100644 --- a/server-mysql/alpine/Dockerfile +++ b/server-mysql/alpine/Dockerfile @@ -126,8 +126,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/snmptraps"] COPY ["docker-entrypoint.sh", "/usr/bin/"] diff --git a/server-mysql/centos/Dockerfile b/server-mysql/centos/Dockerfile index fa31a40c2..495fef4e0 100644 --- a/server-mysql/centos/Dockerfile +++ b/server-mysql/centos/Dockerfile @@ -136,9 +136,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/snmptraps"] + 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 bb2bb412e..809b1cb60 100644 --- a/server-mysql/ubuntu/Dockerfile +++ b/server-mysql/ubuntu/Dockerfile @@ -163,8 +163,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/snmptraps"] COPY ["docker-entrypoint.sh", "/usr/bin/"] diff --git a/server-pgsql/alpine/Dockerfile b/server-pgsql/alpine/Dockerfile index 286d20253..aaf8b991a 100644 --- a/server-pgsql/alpine/Dockerfile +++ b/server-pgsql/alpine/Dockerfile @@ -127,8 +127,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/snmptraps"] COPY ["docker-entrypoint.sh", "/usr/bin/"] diff --git a/server-pgsql/centos/Dockerfile b/server-pgsql/centos/Dockerfile index 7e915291e..3b0dfa6d0 100644 --- a/server-pgsql/centos/Dockerfile +++ b/server-pgsql/centos/Dockerfile @@ -137,9 +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/snmptraps"] + 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 0694f9b45..c1aaf2570 100644 --- a/server-pgsql/ubuntu/Dockerfile +++ b/server-pgsql/ubuntu/Dockerfile @@ -164,9 +164,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/snmptraps"] + 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 292dfa2a6..b39704b76 100644 --- a/snmptraps/alpine/Dockerfile +++ b/snmptraps/alpine/Dockerfile @@ -71,7 +71,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 6cb836348..7a85d2eb4 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 c112e00ae..26cfaab21 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 ab7707961..e7573c185 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"] - COPY ["docker-entrypoint.sh", "/usr/bin/"] USER 1997 diff --git a/web-apache-mysql/centos/Dockerfile b/web-apache-mysql/centos/Dockerfile index 8745f8629..231dca994 100644 --- a/web-apache-mysql/centos/Dockerfile +++ b/web-apache-mysql/centos/Dockerfile @@ -91,8 +91,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-apache-mysql/ubuntu/Dockerfile b/web-apache-mysql/ubuntu/Dockerfile index ee94842b2..d018ca100 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"] - COPY ["docker-entrypoint.sh", "/usr/bin/"] USER 1997 diff --git a/web-apache-pgsql/alpine/Dockerfile b/web-apache-pgsql/alpine/Dockerfile index c2ef044a6..47176553c 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"] - COPY ["docker-entrypoint.sh", "/usr/bin/"] USER 1997 diff --git a/web-apache-pgsql/centos/Dockerfile b/web-apache-pgsql/centos/Dockerfile index 60e39a54e..2e61695c0 100644 --- a/web-apache-pgsql/centos/Dockerfile +++ b/web-apache-pgsql/centos/Dockerfile @@ -91,8 +91,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-apache-pgsql/ubuntu/Dockerfile b/web-apache-pgsql/ubuntu/Dockerfile index 1a7746ea6..8c09729be 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 3a9628ec3..eb84db213 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"] - COPY ["docker-entrypoint.sh", "/usr/bin/"] USER 1997 diff --git a/web-nginx-mysql/centos/Dockerfile b/web-nginx-mysql/centos/Dockerfile index 6857b387e..15318e9d1 100644 --- a/web-nginx-mysql/centos/Dockerfile +++ b/web-nginx-mysql/centos/Dockerfile @@ -86,8 +86,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-mysql/ubuntu/Dockerfile b/web-nginx-mysql/ubuntu/Dockerfile index a048ed72b..c7683ed0c 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 eeabfcef6..e6a3a4f4b 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"] - COPY ["docker-entrypoint.sh", "/usr/bin/"] USER 1997 diff --git a/web-nginx-pgsql/centos/Dockerfile b/web-nginx-pgsql/centos/Dockerfile index 497e4c868..22a338f09 100644 --- a/web-nginx-pgsql/centos/Dockerfile +++ b/web-nginx-pgsql/centos/Dockerfile @@ -86,8 +86,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/ubuntu/Dockerfile b/web-nginx-pgsql/ubuntu/Dockerfile index fa6b0bd2b..b225579db 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