Merge branch 'master' into trunk

This commit is contained in:
Alexey Pustovalov 2020-02-20 18:24:58 +02:00
commit ede27ff164
11 changed files with 11 additions and 11 deletions

View File

@ -1,4 +1,4 @@
FROM alpine:3.10
FROM alpine:3.11
LABEL org.opencontainers.image.title="Zabbix agent" \
org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zabbix.com>" \

View File

@ -1,4 +1,4 @@
FROM alpine:3.10
FROM alpine:3.11
LABEL org.opencontainers.image.title="Zabbix Java Gateway" \
org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zabbix.com>" \

View File

@ -1,4 +1,4 @@
FROM alpine:3.10
FROM alpine:3.11
LABEL org.opencontainers.image.title="Zabbix proxy (MySQL)" \
org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zabbix.com>" \

View File

@ -1,4 +1,4 @@
FROM alpine:3.10
FROM alpine:3.11
LABEL org.opencontainers.image.title="Zabbix proxy (SQLite3)" \
org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zabbix.com>" \

View File

@ -1,4 +1,4 @@
FROM alpine:3.10
FROM alpine:3.11
LABEL org.opencontainers.image.title="Zabbix server (MySQL)" \
org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zabbix.com>" \

View File

@ -1,4 +1,4 @@
FROM alpine:3.10
FROM alpine:3.11
LABEL org.opencontainers.image.title="Zabbix server (PostgreSQL)" \
org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zabbix.com>" \

View File

@ -1,4 +1,4 @@
FROM alpine:3.10
FROM alpine:3.11
ARG APK_FLAGS_PERSISTENT="--clean-protected --no-cache"
ARG APK_FLAGS_DEV="--no-cache"

View File

@ -1,4 +1,4 @@
FROM alpine:3.10
FROM alpine:3.11
LABEL org.opencontainers.image.title="Zabbix web-interface (Apache, MySQL)" \
org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zabbix.com>" \

View File

@ -1,4 +1,4 @@
FROM alpine:3.10
FROM alpine:3.11
LABEL org.opencontainers.image.title="Zabbix web-interface (Apache, PostgreSQL)" \
org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zabbix.com>" \

View File

@ -1,4 +1,4 @@
FROM alpine:3.10
FROM alpine:3.11
LABEL maintainer="Alexey Pustovalov <alexey.pustovalov@zabbix.com>"
ARG BUILD_DATE

View File

@ -1,4 +1,4 @@
FROM alpine:3.10
FROM alpine:3.11
LABEL maintainer="Alexey Pustovalov <alexey.pustovalov@zabbix.com>"
ARG BUILD_DATE