From 3b514b2c646d7602812f2553f1affa5e11e66de0 Mon Sep 17 00:00:00 2001 From: dotneft Date: Sat, 11 Mar 2017 13:27:55 -0800 Subject: [PATCH] 3.2.4 release --- agent/alpine/Dockerfile | 2 +- agent/ubuntu/Dockerfile | 2 +- java-gateway/alpine/Dockerfile | 2 +- java-gateway/ubuntu/Dockerfile | 2 +- proxy-mysql/alpine/Dockerfile | 2 +- proxy-mysql/ubuntu/Dockerfile | 2 +- proxy-sqlite3/alpine/Dockerfile | 2 +- proxy-sqlite3/ubuntu/Dockerfile | 2 +- server-mysql/alpine/Dockerfile | 2 +- server-mysql/ubuntu/Dockerfile | 2 +- server-pgsql/alpine/Dockerfile | 2 +- server-pgsql/ubuntu/Dockerfile | 2 +- update_ver.sh | 36 ++++++++++++++++++++++++++++++ web-apache-mysql/alpine/Dockerfile | 2 +- web-apache-mysql/ubuntu/Dockerfile | 2 +- web-apache-pgsql/alpine/Dockerfile | 2 +- web-apache-pgsql/ubuntu/Dockerfile | 2 +- web-nginx-mysql/alpine/Dockerfile | 2 +- web-nginx-mysql/ubuntu/Dockerfile | 2 +- web-nginx-pgsql/alpine/Dockerfile | 2 +- web-nginx-pgsql/ubuntu/Dockerfile | 2 +- 21 files changed, 56 insertions(+), 20 deletions(-) create mode 100755 update_ver.sh diff --git a/agent/alpine/Dockerfile b/agent/alpine/Dockerfile index d83856d4e..d3912af38 100644 --- a/agent/alpine/Dockerfile +++ b/agent/alpine/Dockerfile @@ -26,7 +26,7 @@ RUN addgroup zabbix && \ rm -rf /var/cache/apk/* ARG MAJOR_VERSION=3.2 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +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 14fd79cee..f2904b004 100644 --- a/agent/ubuntu/Dockerfile +++ b/agent/ubuntu/Dockerfile @@ -31,7 +31,7 @@ RUN DISTRIB_CODENAME=$(/bin/bash -c 'source /etc/lsb-release && echo $DISTRIB_CO rm -rf /var/lib/apt/lists/* ARG MAJOR_VERSION=3.2 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +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 e6aeef571..d25da4fac 100644 --- a/java-gateway/alpine/Dockerfile +++ b/java-gateway/alpine/Dockerfile @@ -22,7 +22,7 @@ RUN addgroup zabbix && \ rm -rf /var/cache/apk/* ARG MAJOR_VERSION=3.2 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +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 0e63bdb85..e4c70662b 100644 --- a/java-gateway/ubuntu/Dockerfile +++ b/java-gateway/ubuntu/Dockerfile @@ -28,7 +28,7 @@ RUN DISTRIB_CODENAME=$(/bin/bash -c 'source /etc/lsb-release && echo $DISTRIB_CO rm -rf /var/lib/apt/lists/* ARG MAJOR_VERSION=3.2 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +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 f7325c3ef..01ec27837 100644 --- a/proxy-mysql/alpine/Dockerfile +++ b/proxy-mysql/alpine/Dockerfile @@ -44,7 +44,7 @@ RUN addgroup zabbix && \ rm -rf /var/cache/apk/* ARG MAJOR_VERSION=3.2 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +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 3d8ebf990..853be281f 100644 --- a/proxy-mysql/ubuntu/Dockerfile +++ b/proxy-mysql/ubuntu/Dockerfile @@ -49,7 +49,7 @@ RUN locale-gen $LC_ALL && \ rm -rf /var/lib/apt/lists/* ARG MAJOR_VERSION=3.2 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +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 9e1b24a74..e82fe3e7e 100644 --- a/proxy-sqlite3/alpine/Dockerfile +++ b/proxy-sqlite3/alpine/Dockerfile @@ -40,7 +40,7 @@ RUN addgroup zabbix && \ rm -rf /var/cache/apk/* ARG MAJOR_VERSION=3.2 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +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 f50e5a846..ea988b595 100644 --- a/proxy-sqlite3/ubuntu/Dockerfile +++ b/proxy-sqlite3/ubuntu/Dockerfile @@ -47,7 +47,7 @@ RUN locale-gen $LC_ALL && \ rm -rf /var/lib/apt/lists/* ARG MAJOR_VERSION=3.2 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +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 59ae2c1e4..cc8c5e289 100644 --- a/server-mysql/alpine/Dockerfile +++ b/server-mysql/alpine/Dockerfile @@ -45,7 +45,7 @@ RUN addgroup zabbix && \ rm -rf /var/cache/apk/* ARG MAJOR_VERSION=3.2 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +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 fc91e3c79..e864c05ea 100644 --- a/server-mysql/ubuntu/Dockerfile +++ b/server-mysql/ubuntu/Dockerfile @@ -50,7 +50,7 @@ RUN locale-gen $LC_ALL && \ rm -rf /var/lib/apt/lists/* ARG MAJOR_VERSION=3.2 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +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 c6d7d6f2f..02dc93d8e 100644 --- a/server-pgsql/alpine/Dockerfile +++ b/server-pgsql/alpine/Dockerfile @@ -45,7 +45,7 @@ RUN addgroup zabbix && \ rm -rf /var/cache/apk/* ARG MAJOR_VERSION=3.2 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +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 bad2d0ead..c0f044c8e 100644 --- a/server-pgsql/ubuntu/Dockerfile +++ b/server-pgsql/ubuntu/Dockerfile @@ -50,7 +50,7 @@ RUN locale-gen $LC_ALL && \ rm -rf /var/lib/apt/lists/* ARG MAJOR_VERSION=3.2 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +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/update_ver.sh b/update_ver.sh new file mode 100755 index 000000000..58fc85c04 --- /dev/null +++ b/update_ver.sh @@ -0,0 +1,36 @@ +#!/bin/bash + +set -e + +new_version=$1 +is_trunk=${2:-"false"} + +if [[ $new_version =~ ^[0-9]*\.[0-9]*.*$ ]] && [ "$is_trunk" == "true" ]; then + echo "** Switching to trunk" +elif [[ ! $new_version =~ ^[0-9]*\.[0-9]*\.[0-9]*.*$ ]] && [ "$new_version" != "master" ]; then + echo "Incorrect syntax of the version" + exit 1 +fi + +major_version=$(echo $new_version | cut -d'.' -f 1,2) +minor_version=$(echo $new_version | cut -d'.' -f 3) + +echo "Using $major_version.$minor_version version of Zabbix" + +find ./ -type d | while read DIR; do + if [ -d "$DIR" ] && [ -f "$DIR/run_zabbix_component.sh" ] && [ -f "$DIR/Dockerfile" ]; then + echo "** Updating $DIR/Dockerfile" + if [ "$is_trunk" == "true" ]; then + sed -i -e "/^ARG MAJOR_VERSION=/s/=.*/=$major_version/" $DIR/Dockerfile + sed -i -e "/^ARG ZBX_VERSION=/s/=.*/=\${MAJOR_VERSION}/" $DIR/Dockerfile + sed -i -e "/^ARG ZBX_SOURCES=/s/=.*/=svn:\/\/svn.zabbix.com\/trunk\//" $DIR/Dockerfile + else + sed -i -e "/^ARG MAJOR_VERSION=/s/=.*/=$major_version/" $DIR/Dockerfile + [ "$new_version" == "master" ] || sed -i -e "/^ARG ZBX_VERSION=/s/=.*/=\${MAJOR_VERSION}.$minor_version/" $DIR/Dockerfile + [ "$new_version" == "master" ] && sed -i -e "/^ARG ZBX_VERSION=/s/=.*/=\${MAJOR_VERSION}/" $DIR/Dockerfile + sed -i -e "/^ARG ZBX_SOURCES=/s/=.*/=svn:\/\/svn.zabbix.com\/tags\/\${ZBX_VERSION}\//" $DIR/Dockerfile + fi + fi +done + +exit 0 diff --git a/web-apache-mysql/alpine/Dockerfile b/web-apache-mysql/alpine/Dockerfile index f0d771167..730ddbb1d 100644 --- a/web-apache-mysql/alpine/Dockerfile +++ b/web-apache-mysql/alpine/Dockerfile @@ -38,7 +38,7 @@ RUN addgroup zabbix && \ rm -rf /var/cache/apk/* ARG MAJOR_VERSION=3.2 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +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 dff99532d..85bfb75f0 100644 --- a/web-apache-mysql/ubuntu/Dockerfile +++ b/web-apache-mysql/ubuntu/Dockerfile @@ -37,7 +37,7 @@ RUN DISTRIB_CODENAME=$(/bin/bash -c 'source /etc/lsb-release && echo $DISTRIB_CO rm -rf /var/lib/apt/lists/* ARG MAJOR_VERSION=3.2 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +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-pgsql/alpine/Dockerfile b/web-apache-pgsql/alpine/Dockerfile index c94775d7c..8abcc6b82 100644 --- a/web-apache-pgsql/alpine/Dockerfile +++ b/web-apache-pgsql/alpine/Dockerfile @@ -37,7 +37,7 @@ RUN addgroup zabbix && \ rm -rf /var/cache/apk/* ARG MAJOR_VERSION=3.2 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +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-pgsql/ubuntu/Dockerfile b/web-apache-pgsql/ubuntu/Dockerfile index c8ec5457d..48487af1e 100644 --- a/web-apache-pgsql/ubuntu/Dockerfile +++ b/web-apache-pgsql/ubuntu/Dockerfile @@ -37,7 +37,7 @@ RUN DISTRIB_CODENAME=$(/bin/bash -c 'source /etc/lsb-release && echo $DISTRIB_CO rm -rf /var/lib/apt/lists/* ARG MAJOR_VERSION=3.2 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +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 36a25edae..d79264d78 100644 --- a/web-nginx-mysql/alpine/Dockerfile +++ b/web-nginx-mysql/alpine/Dockerfile @@ -37,7 +37,7 @@ RUN addgroup zabbix && \ rm -rf /var/cache/apk/* ARG MAJOR_VERSION=3.2 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +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 3a7c170e9..f7bc480ea 100644 --- a/web-nginx-mysql/ubuntu/Dockerfile +++ b/web-nginx-mysql/ubuntu/Dockerfile @@ -44,7 +44,7 @@ RUN DISTRIB_CODENAME=$(/bin/bash -c 'source /etc/lsb-release && echo $DISTRIB_CO rm -rf /var/lib/apt/lists/* ARG MAJOR_VERSION=3.2 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +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 54a830d75..bfc61b34c 100644 --- a/web-nginx-pgsql/alpine/Dockerfile +++ b/web-nginx-pgsql/alpine/Dockerfile @@ -36,7 +36,7 @@ RUN addgroup zabbix && \ rm -rf /var/cache/apk/* ARG MAJOR_VERSION=3.2 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +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 3d89b5b4d..a40699ff0 100644 --- a/web-nginx-pgsql/ubuntu/Dockerfile +++ b/web-nginx-pgsql/ubuntu/Dockerfile @@ -44,7 +44,7 @@ RUN DISTRIB_CODENAME=$(/bin/bash -c 'source /etc/lsb-release && echo $DISTRIB_CO rm -rf /var/lib/apt/lists/* ARG MAJOR_VERSION=3.2 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +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}