From 8e4e3c6b8dc7189312605cc2de34a2dba7840704 Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Fri, 22 Nov 2019 15:07:27 +0900 Subject: [PATCH 1/2] Added missing parameters for Zabbix Agent --- agent/alpine/README.md | 2 ++ agent/centos/README.md | 2 ++ agent/ubuntu/README.md | 2 ++ 3 files changed, 6 insertions(+) diff --git a/agent/alpine/README.md b/agent/alpine/README.md index 0d9b408b6..e644c6e71 100644 --- a/agent/alpine/README.md +++ b/agent/alpine/README.md @@ -137,6 +137,8 @@ Additionally the image allows to specify many other environment variables listed ZBX_SOURCEIP= ZBX_ENABLEREMOTECOMMANDS=0 ZBX_LOGREMOTECOMMANDS=0 +ZBX_HOSTINTERFACE= # Available since 4.4.0 +ZBX_HOSTINTERFACEITEM= # Available since 4.4.0 ZBX_STARTAGENTS=3 ZBX_HOSTNAMEITEM=system.hostname ZBX_METADATA= diff --git a/agent/centos/README.md b/agent/centos/README.md index 0d9b408b6..e644c6e71 100644 --- a/agent/centos/README.md +++ b/agent/centos/README.md @@ -137,6 +137,8 @@ Additionally the image allows to specify many other environment variables listed ZBX_SOURCEIP= ZBX_ENABLEREMOTECOMMANDS=0 ZBX_LOGREMOTECOMMANDS=0 +ZBX_HOSTINTERFACE= # Available since 4.4.0 +ZBX_HOSTINTERFACEITEM= # Available since 4.4.0 ZBX_STARTAGENTS=3 ZBX_HOSTNAMEITEM=system.hostname ZBX_METADATA= diff --git a/agent/ubuntu/README.md b/agent/ubuntu/README.md index 0d9b408b6..e644c6e71 100644 --- a/agent/ubuntu/README.md +++ b/agent/ubuntu/README.md @@ -137,6 +137,8 @@ Additionally the image allows to specify many other environment variables listed ZBX_SOURCEIP= ZBX_ENABLEREMOTECOMMANDS=0 ZBX_LOGREMOTECOMMANDS=0 +ZBX_HOSTINTERFACE= # Available since 4.4.0 +ZBX_HOSTINTERFACEITEM= # Available since 4.4.0 ZBX_STARTAGENTS=3 ZBX_HOSTNAMEITEM=system.hostname ZBX_METADATA= From d8bdab14040ec334dd43a484d25c8545828eec0a Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Thu, 20 Feb 2020 18:22:58 +0200 Subject: [PATCH 2/2] Updated Alpine version to 3.11 --- agent/alpine/Dockerfile | 2 +- java-gateway/alpine/Dockerfile | 2 +- proxy-mysql/alpine/Dockerfile | 2 +- proxy-sqlite3/alpine/Dockerfile | 2 +- server-mysql/alpine/Dockerfile | 2 +- server-pgsql/alpine/Dockerfile | 2 +- snmptraps/alpine/Dockerfile | 2 +- web-apache-mysql/alpine/Dockerfile | 2 +- web-apache-pgsql/alpine/Dockerfile | 2 +- web-nginx-mysql/alpine/Dockerfile | 2 +- web-nginx-pgsql/alpine/Dockerfile | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/agent/alpine/Dockerfile b/agent/alpine/Dockerfile index 45d9ff5d9..5440270c7 100644 --- a/agent/alpine/Dockerfile +++ b/agent/alpine/Dockerfile @@ -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 " \ diff --git a/java-gateway/alpine/Dockerfile b/java-gateway/alpine/Dockerfile index 9e6acd213..aad09314a 100644 --- a/java-gateway/alpine/Dockerfile +++ b/java-gateway/alpine/Dockerfile @@ -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 " \ diff --git a/proxy-mysql/alpine/Dockerfile b/proxy-mysql/alpine/Dockerfile index 303b61c63..77e9f4b5f 100644 --- a/proxy-mysql/alpine/Dockerfile +++ b/proxy-mysql/alpine/Dockerfile @@ -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 " \ diff --git a/proxy-sqlite3/alpine/Dockerfile b/proxy-sqlite3/alpine/Dockerfile index 6d715414b..f1606f827 100644 --- a/proxy-sqlite3/alpine/Dockerfile +++ b/proxy-sqlite3/alpine/Dockerfile @@ -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 " \ diff --git a/server-mysql/alpine/Dockerfile b/server-mysql/alpine/Dockerfile index 02e2107e1..a2602100c 100644 --- a/server-mysql/alpine/Dockerfile +++ b/server-mysql/alpine/Dockerfile @@ -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 " \ diff --git a/server-pgsql/alpine/Dockerfile b/server-pgsql/alpine/Dockerfile index 5a156d2cf..6f9857f00 100644 --- a/server-pgsql/alpine/Dockerfile +++ b/server-pgsql/alpine/Dockerfile @@ -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 " \ diff --git a/snmptraps/alpine/Dockerfile b/snmptraps/alpine/Dockerfile index 8889e14c9..f9d95391b 100644 --- a/snmptraps/alpine/Dockerfile +++ b/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_DEV="--no-cache" diff --git a/web-apache-mysql/alpine/Dockerfile b/web-apache-mysql/alpine/Dockerfile index 4e0ecc3d7..db3fc984c 100644 --- a/web-apache-mysql/alpine/Dockerfile +++ b/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)" \ org.opencontainers.image.authors="Alexey Pustovalov " \ diff --git a/web-apache-pgsql/alpine/Dockerfile b/web-apache-pgsql/alpine/Dockerfile index c3ba11c98..9aa947569 100644 --- a/web-apache-pgsql/alpine/Dockerfile +++ b/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)" \ org.opencontainers.image.authors="Alexey Pustovalov " \ diff --git a/web-nginx-mysql/alpine/Dockerfile b/web-nginx-mysql/alpine/Dockerfile index 3c762ecd1..3bc486d52 100644 --- a/web-nginx-mysql/alpine/Dockerfile +++ b/web-nginx-mysql/alpine/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.10 +FROM alpine:3.11 LABEL maintainer="Alexey Pustovalov " ARG BUILD_DATE diff --git a/web-nginx-pgsql/alpine/Dockerfile b/web-nginx-pgsql/alpine/Dockerfile index 5176fb87a..cc5ce3db4 100644 --- a/web-nginx-pgsql/alpine/Dockerfile +++ b/web-nginx-pgsql/alpine/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.10 +FROM alpine:3.11 LABEL maintainer="Alexey Pustovalov " ARG BUILD_DATE