From 2116d3c2f3510dd935c78f6583e5605158e4f249 Mon Sep 17 00:00:00 2001 From: root Date: Thu, 30 May 2019 16:18:29 +0300 Subject: [PATCH] Using ENTRYPOINT only with tini --- agent/alpine/Dockerfile | 4 +--- agent/centos/Dockerfile | 4 +--- agent/ubuntu/Dockerfile | 4 +--- proxy-mysql/alpine/Dockerfile | 4 +--- proxy-mysql/centos/Dockerfile | 4 +--- proxy-mysql/ubuntu/Dockerfile | 4 +--- proxy-sqlite3/alpine/Dockerfile | 4 +--- proxy-sqlite3/centos/Dockerfile | 4 +--- proxy-sqlite3/ubuntu/Dockerfile | 4 +--- server-mysql/alpine/Dockerfile | 4 +--- server-mysql/centos/Dockerfile | 4 +--- server-mysql/ubuntu/Dockerfile | 4 +--- server-pgsql/alpine/Dockerfile | 4 +--- server-pgsql/centos/Dockerfile | 4 +--- server-pgsql/ubuntu/Dockerfile | 4 +--- zabbix-appliance/alpine/Dockerfile | 4 +--- zabbix-appliance/centos/Dockerfile | 4 +--- zabbix-appliance/ubuntu/Dockerfile | 4 +--- 18 files changed, 18 insertions(+), 54 deletions(-) diff --git a/agent/alpine/Dockerfile b/agent/alpine/Dockerfile index 8183d48a0..aa5972c03 100644 --- a/agent/alpine/Dockerfile +++ b/agent/alpine/Dockerfile @@ -101,6 +101,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"] \ No newline at end of file diff --git a/agent/centos/Dockerfile b/agent/centos/Dockerfile index 815c54168..e26f57386 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 436bdac85..a7d137cce 100644 --- a/agent/ubuntu/Dockerfile +++ b/agent/ubuntu/Dockerfile @@ -113,6 +113,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 cc36e70f6..a8f9cfdba 100644 --- a/proxy-mysql/alpine/Dockerfile +++ b/proxy-mysql/alpine/Dockerfile @@ -132,6 +132,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 892992496..40ac0bb6f 100644 --- a/proxy-mysql/centos/Dockerfile +++ b/proxy-mysql/centos/Dockerfile @@ -137,6 +137,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 770e4fac5..ef89aef5c 100644 --- a/proxy-mysql/ubuntu/Dockerfile +++ b/proxy-mysql/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/proxy-sqlite3/alpine/Dockerfile b/proxy-sqlite3/alpine/Dockerfile index 5f0be81c9..3c65e74c5 100644 --- a/proxy-sqlite3/alpine/Dockerfile +++ b/proxy-sqlite3/alpine/Dockerfile @@ -126,6 +126,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 da3dbf732..2f6e8b091 100644 --- a/proxy-sqlite3/centos/Dockerfile +++ b/proxy-sqlite3/centos/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-sqlite3/ubuntu/Dockerfile b/proxy-sqlite3/ubuntu/Dockerfile index 0c71c0f9c..2149e1338 100644 --- a/proxy-sqlite3/ubuntu/Dockerfile +++ b/proxy-sqlite3/ubuntu/Dockerfile @@ -155,6 +155,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 bc5c56fe0..f0d70e89f 100644 --- a/server-mysql/alpine/Dockerfile +++ b/server-mysql/alpine/Dockerfile @@ -137,6 +137,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 9bb8923ac..3610bc007 100644 --- a/server-mysql/centos/Dockerfile +++ b/server-mysql/centos/Dockerfile @@ -146,6 +146,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 abd3b9726..6be40053e 100644 --- a/server-mysql/ubuntu/Dockerfile +++ b/server-mysql/ubuntu/Dockerfile @@ -171,6 +171,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 e03e36254..1f167fc2e 100644 --- a/server-pgsql/alpine/Dockerfile +++ b/server-pgsql/alpine/Dockerfile @@ -137,6 +137,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 4c850ee35..4d78d80d0 100644 --- a/server-pgsql/centos/Dockerfile +++ b/server-pgsql/centos/Dockerfile @@ -147,6 +147,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 6ee39a6c3..0db520993 100644 --- a/server-pgsql/ubuntu/Dockerfile +++ b/server-pgsql/ubuntu/Dockerfile @@ -170,6 +170,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 7d83571db..72495c6a1 100644 --- a/zabbix-appliance/alpine/Dockerfile +++ b/zabbix-appliance/alpine/Dockerfile @@ -188,6 +188,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 a29f8aaec..fc0ff632b 100644 --- a/zabbix-appliance/centos/Dockerfile +++ b/zabbix-appliance/centos/Dockerfile @@ -196,6 +196,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 87c888104..b30f8c408 100644 --- a/zabbix-appliance/ubuntu/Dockerfile +++ b/zabbix-appliance/ubuntu/Dockerfile @@ -227,6 +227,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"]