From bacd6da7122d32df0675ebbf96974aa3478fe7e8 Mon Sep 17 00:00:00 2001
From: dotneft <alexey.pustovalov@zabbix.com>
Date: Thu, 27 Apr 2017 05:12:16 -0700
Subject: [PATCH] 3.2.5 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, 20 insertions(+), 56 deletions(-)
 delete mode 100755 update_ver.sh

diff --git a/agent/alpine/Dockerfile b/agent/alpine/Dockerfile
index 7c1b62fb1..44a7c2ba3 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}.4
+ARG ZBX_VERSION=${MAJOR_VERSION}.5
 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 f2904b004..5c3c4adff 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}.4
+ARG ZBX_VERSION=${MAJOR_VERSION}.5
 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 c7a404427..2bbed5c8e 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}.4
+ARG ZBX_VERSION=${MAJOR_VERSION}.5
 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 e4c70662b..8c5fd7901 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}.4
+ARG ZBX_VERSION=${MAJOR_VERSION}.5
 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 ec352f72f..d1a52fef6 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}.4
+ARG ZBX_VERSION=${MAJOR_VERSION}.5
 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 853be281f..536ca4a56 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}.4
+ARG ZBX_VERSION=${MAJOR_VERSION}.5
 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 7e853982a..5722b81b8 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}.4
+ARG ZBX_VERSION=${MAJOR_VERSION}.5
 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 ea988b595..6779a6b08 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}.4
+ARG ZBX_VERSION=${MAJOR_VERSION}.5
 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 02275621b..3f0c71d17 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}.4
+ARG ZBX_VERSION=${MAJOR_VERSION}.5
 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 e864c05ea..2b002d847 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}.4
+ARG ZBX_VERSION=${MAJOR_VERSION}.5
 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 896f0e1d6..dbbb3b953 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}.4
+ARG ZBX_VERSION=${MAJOR_VERSION}.5
 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 c0f044c8e..8512fc468 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}.4
+ARG ZBX_VERSION=${MAJOR_VERSION}.5
 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
deleted file mode 100755
index 58fc85c04..000000000
--- a/update_ver.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/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 157d785c9..5c1111f6a 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}.4
+ARG ZBX_VERSION=${MAJOR_VERSION}.5
 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 85bfb75f0..bb42c66a9 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}.4
+ARG ZBX_VERSION=${MAJOR_VERSION}.5
 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 2d0bcd738..2d2a353ef 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}.4
+ARG ZBX_VERSION=${MAJOR_VERSION}.5
 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 48487af1e..f8b7fb7f1 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}.4
+ARG ZBX_VERSION=${MAJOR_VERSION}.5
 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 a30da62a2..0663566fa 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}.4
+ARG ZBX_VERSION=${MAJOR_VERSION}.5
 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 f7bc480ea..1968d7a40 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}.4
+ARG ZBX_VERSION=${MAJOR_VERSION}.5
 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 b4e444652..dda700bf9 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}.4
+ARG ZBX_VERSION=${MAJOR_VERSION}.5
 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 a40699ff0..772374e70 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}.4
+ARG ZBX_VERSION=${MAJOR_VERSION}.5
 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
 ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE}