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

Merge branch 'master' into 4.2

Browse Source
This commit is contained in:
root
2019-04-09 23:36:02 +03:00
parent 92e2aaa969 6e189303f7
commit 060a1cf225
64 changed files with 201 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
proxy-sqlite3/alpine/Dockerfile
View File

@@ -1,4 +1,4 @@
FROM alpine:3.4
FROM alpine:3.9
LABEL maintainer="Alexey Pustovalov <alexey.pustovalov@zabbix.com>"
ARG BUILD_DATE
@@ -41,6 +41,7 @@ RUN addgroup zabbix && \
chown --quiet -R zabbix:root /var/lib/zabbix && \
apk update && \
apk add ${APK_FLAGS_PERSISTENT} \
tini \
bash \
fping \
iputils \
@@ -130,4 +131,6 @@ VOLUME ["/var/lib/zabbix/ssh_keys", "/var/lib/zabbix/ssl/certs", "/var/lib/zabbi
COPY ["docker-entrypoint.sh", "/usr/bin/"]
ENTRYPOINT ["docker-entrypoint.sh"]
ENTRYPOINT ["/sbin/tini", "--"]
CMD ["docker-entrypoint.sh"]