extern/zabbix-docker
1
0
Fork 0
mirror of https://github.com/zabbix/zabbix-docker.git synced 2025-08-09 16:45:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into trunk

Browse Source
This commit is contained in:
root
2019-05-30 16:20:06 +03:00
parent 6cef547817 2116d3c2f3
commit 3d64a13d87
18 changed files with 18 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
proxy-sqlite3/alpine/Dockerfile
View File

@ -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"]