From fabd7b1e51ada47084f3d7e8fa3473e5e4d2757c Mon Sep 17 00:00:00 2001 From: dotneft Date: Wed, 3 Aug 2016 05:38:00 -0700 Subject: [PATCH] Initial structure --- agent/alpine/Dockerfile | 4 ++-- agent/ubuntu/Dockerfile | 4 ++-- java-gateway/alpine/Dockerfile | 4 ++-- java-gateway/ubuntu/Dockerfile | 4 ++-- proxy-mysql/alpine/Dockerfile | 4 ++-- proxy-mysql/ubuntu/Dockerfile | 4 ++-- proxy-sqlite3/alpine/Dockerfile | 4 ++-- proxy-sqlite3/ubuntu/Dockerfile | 4 ++-- server-mysql/alpine/Dockerfile | 4 ++-- server-mysql/ubuntu/Dockerfile | 4 ++-- server-pgsql/alpine/Dockerfile | 4 ++-- server-pgsql/ubuntu/Dockerfile | 4 ++-- web-apache-mysql/alpine/Dockerfile | 4 ++-- web-apache-mysql/ubuntu/Dockerfile | 4 ++-- web-nginx-mysql/alpine/Dockerfile | 4 ++-- web-nginx-mysql/ubuntu/Dockerfile | 4 ++-- web-nginx-pgsql/alpine/Dockerfile | 4 ++-- web-nginx-pgsql/ubuntu/Dockerfile | 4 ++-- 18 files changed, 36 insertions(+), 36 deletions(-) diff --git a/agent/alpine/Dockerfile b/agent/alpine/Dockerfile index 8726d7626..d92eb056c 100644 --- a/agent/alpine/Dockerfile +++ b/agent/alpine/Dockerfile @@ -25,8 +25,8 @@ RUN addgroup zabbix && \ libssl1.0 && \ rm -rf /var/cache/apk/* -ARG MAJOR_VERSION=master -ARG ZBX_VERSION=${MAJOR_VERSION} +ARG MAJOR_VERSION=3.0 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} diff --git a/agent/ubuntu/Dockerfile b/agent/ubuntu/Dockerfile index 1ed8fb4f8..e929c5fe0 100644 --- a/agent/ubuntu/Dockerfile +++ b/agent/ubuntu/Dockerfile @@ -30,8 +30,8 @@ RUN DISTRIB_CODENAME=$(/bin/bash -c 'source /etc/lsb-release && echo $DISTRIB_CO apt-get ${APT_FLAGS_COMMON} clean && \ rm -rf /var/lib/apt/lists/* -ARG MAJOR_VERSION=master -ARG ZBX_VERSION=${MAJOR_VERSION} +ARG MAJOR_VERSION=3.0 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} diff --git a/java-gateway/alpine/Dockerfile b/java-gateway/alpine/Dockerfile index 7c9862e34..b2824d6cd 100644 --- a/java-gateway/alpine/Dockerfile +++ b/java-gateway/alpine/Dockerfile @@ -21,8 +21,8 @@ RUN addgroup zabbix && \ openjdk8-jre-base && \ rm -rf /var/cache/apk/* -ARG MAJOR_VERSION=master -ARG ZBX_VERSION=${MAJOR_VERSION} +ARG MAJOR_VERSION=3.0 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} diff --git a/java-gateway/ubuntu/Dockerfile b/java-gateway/ubuntu/Dockerfile index 1b7bc60ee..0e07039a6 100644 --- a/java-gateway/ubuntu/Dockerfile +++ b/java-gateway/ubuntu/Dockerfile @@ -27,8 +27,8 @@ RUN DISTRIB_CODENAME=$(/bin/bash -c 'source /etc/lsb-release && echo $DISTRIB_CO apt-get ${APT_FLAGS_COMMON} clean && \ rm -rf /var/lib/apt/lists/* -ARG MAJOR_VERSION=master -ARG ZBX_VERSION=${MAJOR_VERSION} +ARG MAJOR_VERSION=3.0 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} diff --git a/proxy-mysql/alpine/Dockerfile b/proxy-mysql/alpine/Dockerfile index b6faa5a99..f811cfe7b 100644 --- a/proxy-mysql/alpine/Dockerfile +++ b/proxy-mysql/alpine/Dockerfile @@ -43,8 +43,8 @@ RUN addgroup zabbix && \ libssh2 && \ rm -rf /var/cache/apk/* -ARG MAJOR_VERSION=master -ARG ZBX_VERSION=${MAJOR_VERSION} +ARG MAJOR_VERSION=3.0 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} diff --git a/proxy-mysql/ubuntu/Dockerfile b/proxy-mysql/ubuntu/Dockerfile index c628063e9..22ac2fd86 100644 --- a/proxy-mysql/ubuntu/Dockerfile +++ b/proxy-mysql/ubuntu/Dockerfile @@ -48,8 +48,8 @@ RUN locale-gen $LC_ALL && \ apt-get ${APT_FLAGS_COMMON} clean && \ rm -rf /var/lib/apt/lists/* -ARG MAJOR_VERSION=master -ARG ZBX_VERSION=${MAJOR_VERSION} +ARG MAJOR_VERSION=3.0 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} diff --git a/proxy-sqlite3/alpine/Dockerfile b/proxy-sqlite3/alpine/Dockerfile index cc460f2b4..e57339d55 100644 --- a/proxy-sqlite3/alpine/Dockerfile +++ b/proxy-sqlite3/alpine/Dockerfile @@ -39,8 +39,8 @@ RUN addgroup zabbix && \ libssh2 && \ rm -rf /var/cache/apk/* -ARG MAJOR_VERSION=master -ARG ZBX_VERSION=${MAJOR_VERSION} +ARG MAJOR_VERSION=3.0 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} diff --git a/proxy-sqlite3/ubuntu/Dockerfile b/proxy-sqlite3/ubuntu/Dockerfile index e2a75789d..4cbf19524 100644 --- a/proxy-sqlite3/ubuntu/Dockerfile +++ b/proxy-sqlite3/ubuntu/Dockerfile @@ -46,8 +46,8 @@ RUN locale-gen $LC_ALL && \ apt-get ${APT_FLAGS_COMMON} clean && \ rm -rf /var/lib/apt/lists/* -ARG MAJOR_VERSION=master -ARG ZBX_VERSION=${MAJOR_VERSION} +ARG MAJOR_VERSION=3.0 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} diff --git a/server-mysql/alpine/Dockerfile b/server-mysql/alpine/Dockerfile index 76dc13f0b..9aef9b3bf 100644 --- a/server-mysql/alpine/Dockerfile +++ b/server-mysql/alpine/Dockerfile @@ -44,8 +44,8 @@ RUN addgroup zabbix && \ libssh2 && \ rm -rf /var/cache/apk/* -ARG MAJOR_VERSION=master -ARG ZBX_VERSION=${MAJOR_VERSION} +ARG MAJOR_VERSION=3.0 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} diff --git a/server-mysql/ubuntu/Dockerfile b/server-mysql/ubuntu/Dockerfile index 967c3cc55..ceb4ae3d6 100644 --- a/server-mysql/ubuntu/Dockerfile +++ b/server-mysql/ubuntu/Dockerfile @@ -49,8 +49,8 @@ RUN locale-gen $LC_ALL && \ apt-get ${APT_FLAGS_COMMON} clean && \ rm -rf /var/lib/apt/lists/* -ARG MAJOR_VERSION=master -ARG ZBX_VERSION=${MAJOR_VERSION} +ARG MAJOR_VERSION=3.0 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} diff --git a/server-pgsql/alpine/Dockerfile b/server-pgsql/alpine/Dockerfile index 104b1ec0f..26331b9ec 100644 --- a/server-pgsql/alpine/Dockerfile +++ b/server-pgsql/alpine/Dockerfile @@ -44,8 +44,8 @@ RUN addgroup zabbix && \ libssh2 && \ rm -rf /var/cache/apk/* -ARG MAJOR_VERSION=master -ARG ZBX_VERSION=${MAJOR_VERSION} +ARG MAJOR_VERSION=3.0 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} diff --git a/server-pgsql/ubuntu/Dockerfile b/server-pgsql/ubuntu/Dockerfile index d3b38ecef..2113c818b 100644 --- a/server-pgsql/ubuntu/Dockerfile +++ b/server-pgsql/ubuntu/Dockerfile @@ -49,8 +49,8 @@ RUN locale-gen $LC_ALL && \ apt-get ${APT_FLAGS_COMMON} clean && \ rm -rf /var/lib/apt/lists/* -ARG MAJOR_VERSION=master -ARG ZBX_VERSION=${MAJOR_VERSION} +ARG MAJOR_VERSION=3.0 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} diff --git a/web-apache-mysql/alpine/Dockerfile b/web-apache-mysql/alpine/Dockerfile index 7131381a8..a302fdfb2 100644 --- a/web-apache-mysql/alpine/Dockerfile +++ b/web-apache-mysql/alpine/Dockerfile @@ -37,8 +37,8 @@ RUN addgroup zabbix && \ ttf-dejavu && \ rm -rf /var/cache/apk/* -ARG MAJOR_VERSION=master -ARG ZBX_VERSION=${MAJOR_VERSION} +ARG MAJOR_VERSION=3.0 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} diff --git a/web-apache-mysql/ubuntu/Dockerfile b/web-apache-mysql/ubuntu/Dockerfile index 5a5fd70e1..57d013243 100644 --- a/web-apache-mysql/ubuntu/Dockerfile +++ b/web-apache-mysql/ubuntu/Dockerfile @@ -36,8 +36,8 @@ RUN DISTRIB_CODENAME=$(/bin/bash -c 'source /etc/lsb-release && echo $DISTRIB_CO apt-get ${APT_FLAGS_COMMON} clean && \ rm -rf /var/lib/apt/lists/* -ARG MAJOR_VERSION=master -ARG ZBX_VERSION=${MAJOR_VERSION} +ARG MAJOR_VERSION=3.0 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} diff --git a/web-nginx-mysql/alpine/Dockerfile b/web-nginx-mysql/alpine/Dockerfile index 3b0bcb004..70ae4e250 100644 --- a/web-nginx-mysql/alpine/Dockerfile +++ b/web-nginx-mysql/alpine/Dockerfile @@ -36,8 +36,8 @@ RUN addgroup zabbix && \ ttf-dejavu && \ rm -rf /var/cache/apk/* -ARG MAJOR_VERSION=master -ARG ZBX_VERSION=${MAJOR_VERSION} +ARG MAJOR_VERSION=3.0 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} diff --git a/web-nginx-mysql/ubuntu/Dockerfile b/web-nginx-mysql/ubuntu/Dockerfile index df5595a57..c90c5e173 100644 --- a/web-nginx-mysql/ubuntu/Dockerfile +++ b/web-nginx-mysql/ubuntu/Dockerfile @@ -41,8 +41,8 @@ RUN DISTRIB_CODENAME=$(/bin/bash -c 'source /etc/lsb-release && echo $DISTRIB_CO apt-get ${APT_FLAGS_COMMON} clean && \ rm -rf /var/lib/apt/lists/* -ARG MAJOR_VERSION=master -ARG ZBX_VERSION=${MAJOR_VERSION} +ARG MAJOR_VERSION=3.0 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} diff --git a/web-nginx-pgsql/alpine/Dockerfile b/web-nginx-pgsql/alpine/Dockerfile index 9415d2643..ddff5c48a 100644 --- a/web-nginx-pgsql/alpine/Dockerfile +++ b/web-nginx-pgsql/alpine/Dockerfile @@ -35,8 +35,8 @@ RUN addgroup zabbix && \ ttf-dejavu && \ rm -rf /var/cache/apk/* -ARG MAJOR_VERSION=master -ARG ZBX_VERSION=${MAJOR_VERSION} +ARG MAJOR_VERSION=3.0 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} diff --git a/web-nginx-pgsql/ubuntu/Dockerfile b/web-nginx-pgsql/ubuntu/Dockerfile index e963af471..0f1db0888 100644 --- a/web-nginx-pgsql/ubuntu/Dockerfile +++ b/web-nginx-pgsql/ubuntu/Dockerfile @@ -41,8 +41,8 @@ RUN DISTRIB_CODENAME=$(/bin/bash -c 'source /etc/lsb-release && echo $DISTRIB_CO apt-get ${APT_FLAGS_COMMON} clean && \ rm -rf /var/lib/apt/lists/* -ARG MAJOR_VERSION=master -ARG ZBX_VERSION=${MAJOR_VERSION} +ARG MAJOR_VERSION=3.0 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE}