extern/zabbix-docker
1
0
Fork 0
mirror of https://github.com/zabbix/zabbix-docker.git synced 2025-08-16 11:37:49 +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

9
server-mysql/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
@ -44,6 +44,7 @@ RUN addgroup zabbix && \
mkdir -p /usr/share/doc/zabbix-${ZBX_TYPE}-${ZBX_DB_TYPE} && \
apk update && \
apk add ${APK_FLAGS_PERSISTENT} \
tini \
bash \
fping \
iputils \
@ -53,7 +54,7 @@ RUN addgroup zabbix && \
libssh2 \
libxml2 \
mariadb-client \
mariadb-client-libs \
mariadb-connector-c \
net-snmp-agent-libs \
openipmi-libs \
pcre \
@ -141,4 +142,6 @@ VOLUME ["/var/lib/zabbix/snmptraps", "/var/lib/zabbix/ssh_keys", "/var/lib/zabbi
COPY ["docker-entrypoint.sh", "/usr/bin/"]
ENTRYPOINT ["docker-entrypoint.sh"]
ENTRYPOINT ["/sbin/tini", "--"]
CMD ["docker-entrypoint.sh"]

2
server-mysql/alpine/README.md
View File

@ -16,7 +16,7 @@ The server performs the polling and trapping of data, it calculates triggers, se
# Zabbix server images
These are the only official Zabbix server Docker images. They are based on Alpine Linux v3.4, Ubuntu 18.04 (bionic) and CentOS 7 images. The available versions of Zabbix server are:
These are the only official Zabbix server Docker images. They are based on Alpine Linux v3.9, Ubuntu 18.04 (bionic) and CentOS 7 images. The available versions of Zabbix server are:
Zabbix server 3.0 (tags: alpine-3.0-latest, ubuntu-3.0-latest, centos-3.0-latest)
Zabbix server 3.0.* (tags: alpine-3.0.*, ubuntu-3.0.*, centos-3.0.*)