extern/zabbix-docker
1
0
Fork 0
mirror of https://github.com/zabbix/zabbix-docker.git synced 2025-07-28 11:49:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into trunk

Browse Source
This commit is contained in:
Alexey Pustovalov
2020-02-20 18:24:58 +02:00
parent 96f84ddba4 d8bdab1404
commit ede27ff164
11 changed files with 11 additions and 11 deletions
agent/alpine
Dockerfile
java-gateway/alpine
Dockerfile
proxy-mysql/alpine
Dockerfile
proxy-sqlite3/alpine
Dockerfile
server-mysql/alpine
Dockerfile
server-pgsql/alpine
Dockerfile
snmptraps/alpine
Dockerfile
web-apache-mysql/alpine
Dockerfile
web-apache-pgsql/alpine
Dockerfile
web-nginx-mysql/alpine
Dockerfile
web-nginx-pgsql/alpine
Dockerfile

2
agent/alpine/Dockerfile

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

2
java-gateway/alpine/Dockerfile

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

2
proxy-mysql/alpine/Dockerfile

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

2
proxy-sqlite3/alpine/Dockerfile

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

2
server-mysql/alpine/Dockerfile

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

2
server-pgsql/alpine/Dockerfile

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

2
snmptraps/alpine/Dockerfile

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

2
web-apache-mysql/alpine/Dockerfile

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

2
web-apache-pgsql/alpine/Dockerfile

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

2
web-nginx-mysql/alpine/Dockerfile

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

2
web-nginx-pgsql/alpine/Dockerfile

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