Skip to content

Commit

Permalink
Merge branch 'master' into trunk
Browse files Browse the repository at this point in the history
  • Loading branch information
root committed May 30, 2019
2 parents 6cef547 + 2116d3c commit 3d64a13
Show file tree
Hide file tree
Showing 18 changed files with 18 additions and 54 deletions.
4 changes: 1 addition & 3 deletions agent/alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
4 changes: 1 addition & 3 deletions agent/centos/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
4 changes: 1 addition & 3 deletions agent/ubuntu/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
4 changes: 1 addition & 3 deletions proxy-mysql/alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
4 changes: 1 addition & 3 deletions proxy-mysql/centos/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
4 changes: 1 addition & 3 deletions proxy-mysql/ubuntu/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
4 changes: 1 addition & 3 deletions proxy-sqlite3/alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
4 changes: 1 addition & 3 deletions proxy-sqlite3/centos/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
4 changes: 1 addition & 3 deletions proxy-sqlite3/ubuntu/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
4 changes: 1 addition & 3 deletions server-mysql/alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
4 changes: 1 addition & 3 deletions server-mysql/centos/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
4 changes: 1 addition & 3 deletions server-mysql/ubuntu/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
4 changes: 1 addition & 3 deletions server-pgsql/alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,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"]
4 changes: 1 addition & 3 deletions server-pgsql/centos/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,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"]
4 changes: 1 addition & 3 deletions server-pgsql/ubuntu/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
4 changes: 1 addition & 3 deletions zabbix-appliance/alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
4 changes: 1 addition & 3 deletions zabbix-appliance/centos/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
4 changes: 1 addition & 3 deletions zabbix-appliance/ubuntu/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,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"]

0 comments on commit 3d64a13

Please sign in to comment.