mirror of
https://github.com/zabbix/zabbix-docker.git
synced 2025-04-16 23:38:23 +02:00
Merge branch 'master' into trunk
This commit is contained in:
commit
ede27ff164
@ -1,4 +1,4 @@
|
|||||||
FROM alpine:3.10
|
FROM alpine:3.11
|
||||||
|
|
||||||
LABEL org.opencontainers.image.title="Zabbix agent" \
|
LABEL org.opencontainers.image.title="Zabbix agent" \
|
||||||
org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zabbix.com>" \
|
org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zabbix.com>" \
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
FROM alpine:3.10
|
FROM alpine:3.11
|
||||||
|
|
||||||
LABEL org.opencontainers.image.title="Zabbix Java Gateway" \
|
LABEL org.opencontainers.image.title="Zabbix Java Gateway" \
|
||||||
org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zabbix.com>" \
|
org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zabbix.com>" \
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
FROM alpine:3.10
|
FROM alpine:3.11
|
||||||
|
|
||||||
LABEL org.opencontainers.image.title="Zabbix proxy (MySQL)" \
|
LABEL org.opencontainers.image.title="Zabbix proxy (MySQL)" \
|
||||||
org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zabbix.com>" \
|
org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zabbix.com>" \
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
FROM alpine:3.10
|
FROM alpine:3.11
|
||||||
|
|
||||||
LABEL org.opencontainers.image.title="Zabbix proxy (SQLite3)" \
|
LABEL org.opencontainers.image.title="Zabbix proxy (SQLite3)" \
|
||||||
org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zabbix.com>" \
|
org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zabbix.com>" \
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
FROM alpine:3.10
|
FROM alpine:3.11
|
||||||
|
|
||||||
LABEL org.opencontainers.image.title="Zabbix server (MySQL)" \
|
LABEL org.opencontainers.image.title="Zabbix server (MySQL)" \
|
||||||
org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zabbix.com>" \
|
org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zabbix.com>" \
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
FROM alpine:3.10
|
FROM alpine:3.11
|
||||||
|
|
||||||
LABEL org.opencontainers.image.title="Zabbix server (PostgreSQL)" \
|
LABEL org.opencontainers.image.title="Zabbix server (PostgreSQL)" \
|
||||||
org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zabbix.com>" \
|
org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zabbix.com>" \
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
FROM alpine:3.10
|
FROM alpine:3.11
|
||||||
|
|
||||||
ARG APK_FLAGS_PERSISTENT="--clean-protected --no-cache"
|
ARG APK_FLAGS_PERSISTENT="--clean-protected --no-cache"
|
||||||
ARG APK_FLAGS_DEV="--no-cache"
|
ARG APK_FLAGS_DEV="--no-cache"
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
FROM alpine:3.10
|
FROM alpine:3.11
|
||||||
|
|
||||||
LABEL org.opencontainers.image.title="Zabbix web-interface (Apache, MySQL)" \
|
LABEL org.opencontainers.image.title="Zabbix web-interface (Apache, MySQL)" \
|
||||||
org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zabbix.com>" \
|
org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zabbix.com>" \
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
FROM alpine:3.10
|
FROM alpine:3.11
|
||||||
|
|
||||||
LABEL org.opencontainers.image.title="Zabbix web-interface (Apache, PostgreSQL)" \
|
LABEL org.opencontainers.image.title="Zabbix web-interface (Apache, PostgreSQL)" \
|
||||||
org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zabbix.com>" \
|
org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zabbix.com>" \
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
FROM alpine:3.10
|
FROM alpine:3.11
|
||||||
LABEL maintainer="Alexey Pustovalov <alexey.pustovalov@zabbix.com>"
|
LABEL maintainer="Alexey Pustovalov <alexey.pustovalov@zabbix.com>"
|
||||||
|
|
||||||
ARG BUILD_DATE
|
ARG BUILD_DATE
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
FROM alpine:3.10
|
FROM alpine:3.11
|
||||||
LABEL maintainer="Alexey Pustovalov <alexey.pustovalov@zabbix.com>"
|
LABEL maintainer="Alexey Pustovalov <alexey.pustovalov@zabbix.com>"
|
||||||
|
|
||||||
ARG BUILD_DATE
|
ARG BUILD_DATE
|
||||||
|
Loading…
Reference in New Issue
Block a user