diff --git a/agent/alpine/Dockerfile b/agent/alpine/Dockerfile index 200324c5c..b04ec2f43 100644 --- a/agent/alpine/Dockerfile +++ b/agent/alpine/Dockerfile @@ -103,6 +103,4 @@ VOLUME ["/etc/zabbix/zabbix_agentd.d", "/var/lib/zabbix/enc", "/var/lib/zabbix/m COPY ["docker-entrypoint.sh", "/usr/bin/"] -ENTRYPOINT ["/sbin/tini", "--"] - -CMD ["docker-entrypoint.sh"] +ENTRYPOINT ["/sbin/tini", "--", "/usr/bin/docker-entrypoint.sh"] diff --git a/agent/centos/Dockerfile b/agent/centos/Dockerfile index 3842a56a5..705cf35a8 100644 --- a/agent/centos/Dockerfile +++ b/agent/centos/Dockerfile @@ -102,6 +102,4 @@ VOLUME ["/etc/zabbix/zabbix_agentd.d", "/var/lib/zabbix/enc", "/var/lib/zabbix/m COPY ["docker-entrypoint.sh", "/usr/bin/"] -ENTRYPOINT ["/sbin/tini", "--"] - -CMD ["docker-entrypoint.sh"] +ENTRYPOINT ["/sbin/tini", "--", "/usr/bin/docker-entrypoint.sh"] diff --git a/agent/ubuntu/Dockerfile b/agent/ubuntu/Dockerfile index dbfa3ed41..f600c7f32 100644 --- a/agent/ubuntu/Dockerfile +++ b/agent/ubuntu/Dockerfile @@ -115,6 +115,4 @@ VOLUME ["/etc/zabbix/zabbix_agentd.d", "/var/lib/zabbix/enc", "/var/lib/zabbix/m COPY ["docker-entrypoint.sh", "/usr/bin/"] -ENTRYPOINT ["/sbin/tini", "--"] - -CMD ["docker-entrypoint.sh"] +ENTRYPOINT ["/sbin/tini", "--", "/usr/bin/docker-entrypoint.sh"] diff --git a/proxy-mysql/alpine/Dockerfile b/proxy-mysql/alpine/Dockerfile index 1bb2bfd0d..dd2bd647f 100644 --- a/proxy-mysql/alpine/Dockerfile +++ b/proxy-mysql/alpine/Dockerfile @@ -136,6 +136,4 @@ VOLUME ["/var/lib/zabbix/ssh_keys", "/var/lib/zabbix/ssl/certs", "/var/lib/zabbi COPY ["docker-entrypoint.sh", "/usr/bin/"] -ENTRYPOINT ["/sbin/tini", "--"] - -CMD ["docker-entrypoint.sh"] +ENTRYPOINT ["/sbin/tini", "--", "/usr/bin/docker-entrypoint.sh"] diff --git a/proxy-mysql/centos/Dockerfile b/proxy-mysql/centos/Dockerfile index 376110902..908369aa1 100644 --- a/proxy-mysql/centos/Dockerfile +++ b/proxy-mysql/centos/Dockerfile @@ -139,6 +139,4 @@ VOLUME ["/var/lib/zabbix/ssh_keys", "/var/lib/zabbix/ssl/certs", "/var/lib/zabbi COPY ["docker-entrypoint.sh", "/usr/bin/"] -ENTRYPOINT ["/sbin/tini", "--"] - -CMD ["docker-entrypoint.sh"] +ENTRYPOINT ["/sbin/tini", "--", "/usr/bin/docker-entrypoint.sh"] diff --git a/proxy-mysql/ubuntu/Dockerfile b/proxy-mysql/ubuntu/Dockerfile index 9f515a671..b614df832 100644 --- a/proxy-mysql/ubuntu/Dockerfile +++ b/proxy-mysql/ubuntu/Dockerfile @@ -167,6 +167,4 @@ VOLUME ["/var/lib/zabbix/ssh_keys", "/var/lib/zabbix/ssl/certs", "/var/lib/zabbi COPY ["docker-entrypoint.sh", "/usr/bin/"] -ENTRYPOINT ["/sbin/tini", "--"] - -CMD ["docker-entrypoint.sh"] +ENTRYPOINT ["/sbin/tini", "--", "/usr/bin/docker-entrypoint.sh"] diff --git a/proxy-sqlite3/alpine/Dockerfile b/proxy-sqlite3/alpine/Dockerfile index 024d39848..7fc9de53f 100644 --- a/proxy-sqlite3/alpine/Dockerfile +++ b/proxy-sqlite3/alpine/Dockerfile @@ -130,6 +130,4 @@ VOLUME ["/var/lib/zabbix/ssh_keys", "/var/lib/zabbix/ssl/certs", "/var/lib/zabbi COPY ["docker-entrypoint.sh", "/usr/bin/"] -ENTRYPOINT ["/sbin/tini", "--"] - -CMD ["docker-entrypoint.sh"] +ENTRYPOINT ["/sbin/tini", "--", "/usr/bin/docker-entrypoint.sh"] diff --git a/proxy-sqlite3/centos/Dockerfile b/proxy-sqlite3/centos/Dockerfile index ca5cee21f..4573a006f 100644 --- a/proxy-sqlite3/centos/Dockerfile +++ b/proxy-sqlite3/centos/Dockerfile @@ -138,6 +138,4 @@ VOLUME ["/var/lib/zabbix/ssh_keys", "/var/lib/zabbix/ssl/certs", "/var/lib/zabbi COPY ["docker-entrypoint.sh", "/usr/bin/"] -ENTRYPOINT ["/sbin/tini", "--"] - -CMD ["docker-entrypoint.sh"] +ENTRYPOINT ["/sbin/tini", "--", "/usr/bin/docker-entrypoint.sh"] diff --git a/proxy-sqlite3/ubuntu/Dockerfile b/proxy-sqlite3/ubuntu/Dockerfile index 8fcdd6508..1eee3a4e4 100644 --- a/proxy-sqlite3/ubuntu/Dockerfile +++ b/proxy-sqlite3/ubuntu/Dockerfile @@ -161,6 +161,4 @@ VOLUME ["/var/lib/zabbix/ssh_keys", "/var/lib/zabbix/ssl/certs", "/var/lib/zabbi COPY ["docker-entrypoint.sh", "/usr/bin/"] -ENTRYPOINT ["/sbin/tini", "--"] - -CMD ["docker-entrypoint.sh"] +ENTRYPOINT ["/sbin/tini", "--", "/usr/bin/docker-entrypoint.sh"] diff --git a/server-mysql/alpine/Dockerfile b/server-mysql/alpine/Dockerfile index c846c864b..4a367c699 100644 --- a/server-mysql/alpine/Dockerfile +++ b/server-mysql/alpine/Dockerfile @@ -141,6 +141,4 @@ VOLUME ["/var/lib/zabbix/snmptraps", "/var/lib/zabbix/ssh_keys", "/var/lib/zabbi COPY ["docker-entrypoint.sh", "/usr/bin/"] -ENTRYPOINT ["/sbin/tini", "--"] - -CMD ["docker-entrypoint.sh"] +ENTRYPOINT ["/sbin/tini", "--", "/usr/bin/docker-entrypoint.sh"] diff --git a/server-mysql/centos/Dockerfile b/server-mysql/centos/Dockerfile index 32af0a4b4..b640ad73a 100644 --- a/server-mysql/centos/Dockerfile +++ b/server-mysql/centos/Dockerfile @@ -148,6 +148,4 @@ VOLUME ["/var/lib/zabbix/snmptraps", "/var/lib/zabbix/ssh_keys", "/var/lib/zabbi COPY ["docker-entrypoint.sh", "/usr/bin/"] -ENTRYPOINT ["/sbin/tini", "--"] - -CMD ["docker-entrypoint.sh"] +ENTRYPOINT ["/sbin/tini", "--", "/usr/bin/docker-entrypoint.sh"] diff --git a/server-mysql/ubuntu/Dockerfile b/server-mysql/ubuntu/Dockerfile index 131dc4d25..6f4dde562 100644 --- a/server-mysql/ubuntu/Dockerfile +++ b/server-mysql/ubuntu/Dockerfile @@ -177,6 +177,4 @@ VOLUME ["/var/lib/zabbix/snmptraps", "/var/lib/zabbix/ssh_keys", "/var/lib/zabbi COPY ["docker-entrypoint.sh", "/usr/bin/"] -ENTRYPOINT ["/sbin/tini", "--"] - -CMD ["docker-entrypoint.sh"] +ENTRYPOINT ["/sbin/tini", "--", "/usr/bin/docker-entrypoint.sh"] diff --git a/server-pgsql/alpine/Dockerfile b/server-pgsql/alpine/Dockerfile index 5dc1fee8d..5495e09f5 100644 --- a/server-pgsql/alpine/Dockerfile +++ b/server-pgsql/alpine/Dockerfile @@ -141,6 +141,4 @@ VOLUME ["/var/lib/zabbix/snmptraps", "/var/lib/zabbix/ssh_keys", "/var/lib/zabbi COPY ["docker-entrypoint.sh", "/usr/bin/"] -ENTRYPOINT ["/sbin/tini", "--"] - -CMD ["docker-entrypoint.sh"] +ENTRYPOINT ["/sbin/tini", "--", "/usr/bin/docker-entrypoint.sh"] diff --git a/server-pgsql/centos/Dockerfile b/server-pgsql/centos/Dockerfile index e08a9645a..b8ad62875 100644 --- a/server-pgsql/centos/Dockerfile +++ b/server-pgsql/centos/Dockerfile @@ -149,6 +149,4 @@ VOLUME ["/var/lib/zabbix/snmptraps", "/var/lib/zabbix/ssh_keys", "/var/lib/zabbi COPY ["docker-entrypoint.sh", "/usr/bin/"] -ENTRYPOINT ["/sbin/tini", "--"] - -CMD ["docker-entrypoint.sh"] +ENTRYPOINT ["/sbin/tini", "--", "/usr/bin/docker-entrypoint.sh"] diff --git a/server-pgsql/ubuntu/Dockerfile b/server-pgsql/ubuntu/Dockerfile index 7a4c3199e..c602e6cda 100644 --- a/server-pgsql/ubuntu/Dockerfile +++ b/server-pgsql/ubuntu/Dockerfile @@ -176,6 +176,4 @@ VOLUME ["/var/lib/zabbix/snmptraps", "/var/lib/zabbix/ssh_keys", "/var/lib/zabbi COPY ["docker-entrypoint.sh", "/usr/bin/"] -ENTRYPOINT ["/sbin/tini", "--"] - -CMD ["docker-entrypoint.sh"] +ENTRYPOINT ["/sbin/tini", "--", "/usr/bin/docker-entrypoint.sh"] diff --git a/zabbix-appliance/alpine/Dockerfile b/zabbix-appliance/alpine/Dockerfile index cabd78a24..1dd30751e 100644 --- a/zabbix-appliance/alpine/Dockerfile +++ b/zabbix-appliance/alpine/Dockerfile @@ -193,6 +193,4 @@ COPY ["docker-entrypoint.sh", "/usr/bin/"] ENV ZBX_TYPE=appliance -ENTRYPOINT ["/sbin/tini", "--"] - -CMD ["docker-entrypoint.sh"] +ENTRYPOINT ["/sbin/tini", "--", "/usr/bin/docker-entrypoint.sh"] diff --git a/zabbix-appliance/centos/Dockerfile b/zabbix-appliance/centos/Dockerfile index a607bea50..59effabf2 100644 --- a/zabbix-appliance/centos/Dockerfile +++ b/zabbix-appliance/centos/Dockerfile @@ -198,6 +198,4 @@ COPY ["docker-entrypoint.sh", "/usr/bin/"] ENV ZBX_TYPE=appliance -ENTRYPOINT ["/sbin/tini", "--"] - -CMD ["docker-entrypoint.sh"] +ENTRYPOINT ["/sbin/tini", "--", "/usr/bin/docker-entrypoint.sh"] diff --git a/zabbix-appliance/ubuntu/Dockerfile b/zabbix-appliance/ubuntu/Dockerfile index 65422deae..44c1eb131 100644 --- a/zabbix-appliance/ubuntu/Dockerfile +++ b/zabbix-appliance/ubuntu/Dockerfile @@ -233,6 +233,4 @@ COPY ["docker-entrypoint.sh", "/usr/bin/"] ENV ZBX_TYPE=appliance -ENTRYPOINT ["/sbin/tini", "--"] - -CMD ["docker-entrypoint.sh"] +ENTRYPOINT ["/sbin/tini", "--", "/usr/bin/docker-entrypoint.sh"]