diff --git a/agent/alpine/Dockerfile b/agent/alpine/Dockerfile index 7a06d3c51..da6c77146 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 9c5ca357b..c6839992e 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 f58eb8833..9028e50cf 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 636fe75a6..355eef5a0 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 246b864fd..859301baa 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 0a398e7c0..00ab9425b 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 65042c8d0..8785daac9 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 dbfe57ef5..5f912c0e3 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 f5a6222a4..7ce46f0d7 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 942b1ccd4..9228ec191 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 4a3f0e76c..1d5f67ec1 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 3ed79680a..2b7888091 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 f9f092e76..b6e40d99c 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 e6452b386..e308714fb 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 8ed3d1022..c047c7f89 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 271d463cb..f527b529c 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 bcd69b7a1..446b490da 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 2bd532617..bf1f6643d 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 7ac5dd5ea..8b3cf0bfb 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 db5dd1fae..323a170ae 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 1662e5dc5..e1bc454d5 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 697bfcd42..3b0fc0234 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 4b85f65a0..89c38db7d 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 502b16e00..8beb5855b 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 2151013ac..95cb3750c 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 b2c11254e..3ae90886c 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 b78b834d2..b5720d061 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 772657809..7d040975d 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 1230809f2..1d171a070 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 08e67900e..9c1f294bf 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