From 56e2b2eeff861bc20ce958fc5563e9622fcfad95 Mon Sep 17 00:00:00 2001 From: root Date: Thu, 10 May 2018 17:03:31 -0700 Subject: [PATCH] Zabbix trunk for snmptraps image --- snmptraps/alpine/Dockerfile | 4 ++-- snmptraps/centos/Dockerfile | 4 ++-- snmptraps/ubuntu/Dockerfile | 4 ++-- zabbix-appliance/rhel/Dockerfile | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/snmptraps/alpine/Dockerfile b/snmptraps/alpine/Dockerfile index 185c72ac2..568f5dd73 100644 --- a/snmptraps/alpine/Dockerfile +++ b/snmptraps/alpine/Dockerfile @@ -18,9 +18,9 @@ LABEL org.label-schema.name="zabbix-snmptraps-alpine" \ org.label-schema.schema-version="1.0" \ org.label-schema.license="GPL 2.0" -ARG MAJOR_VERSION=master +ARG MAJOR_VERSION=4.0 ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ +ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ diff --git a/snmptraps/centos/Dockerfile b/snmptraps/centos/Dockerfile index b6fe68ef1..3fcb5ac6d 100644 --- a/snmptraps/centos/Dockerfile +++ b/snmptraps/centos/Dockerfile @@ -18,9 +18,9 @@ LABEL org.label-schema.name="zabbix-snmptraps-centos" \ org.label-schema.schema-version="1.0" \ org.label-schema.license="GPL 2.0" -ARG MAJOR_VERSION=master +ARG MAJOR_VERSION=4.0 ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ +ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ diff --git a/snmptraps/ubuntu/Dockerfile b/snmptraps/ubuntu/Dockerfile index 485d56aa0..ab1fe83c2 100644 --- a/snmptraps/ubuntu/Dockerfile +++ b/snmptraps/ubuntu/Dockerfile @@ -19,9 +19,9 @@ LABEL org.label-schema.name="zabbix-snmptraps-ubuntu" \ org.label-schema.schema-version="1.0" \ org.label-schema.license="GPL 2.0" -ARG MAJOR_VERSION=master +ARG MAJOR_VERSION=4.0 ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ +ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ diff --git a/zabbix-appliance/rhel/Dockerfile b/zabbix-appliance/rhel/Dockerfile index af41de925..07ae702d1 100644 --- a/zabbix-appliance/rhel/Dockerfile +++ b/zabbix-appliance/rhel/Dockerfile @@ -11,11 +11,11 @@ ENV TERM=xterm MIBDIRS=/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL \ ARG BUILD_DATE ARG VCS_REF -ARG MAJOR_VERSION=master +ARG MAJOR_VERSION=4.0 ARG RELEASE= -ARG ZBX_VERSION=${MAJOR_VERSION}.${RELEASE} +ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ +ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} LABEL name="zabbix/zabbix-appliance" \