From 5aff895c42d88469a69784a3a030cd6810faac31 Mon Sep 17 00:00:00 2001
From: dotneft <dotneft@gmail.com>
Date: Wed, 31 Aug 2016 08:42:24 -0700
Subject: [PATCH] 3.2.0beta2

---
 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                      | 28 ----------------------------
 web-apache-mysql/alpine/Dockerfile |  2 +-
 web-apache-mysql/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 +-
 19 files changed, 18 insertions(+), 46 deletions(-)
 delete mode 100755 update_ver.sh

diff --git a/agent/alpine/Dockerfile b/agent/alpine/Dockerfile
index f90118b36c..e1b9dd73ab 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}.0beta1
+ARG ZBX_VERSION=${MAJOR_VERSION}.0beta2
 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 da6d3a53b0..880515b46c 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}.0beta1
+ARG ZBX_VERSION=${MAJOR_VERSION}.0beta2
 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 9de7b4965b..7b0d57b050 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}.0beta1
+ARG ZBX_VERSION=${MAJOR_VERSION}.0beta2
 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 496f14fe64..9d9941eadb 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}.0beta1
+ARG ZBX_VERSION=${MAJOR_VERSION}.0beta2
 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 071a4cb8aa..bca2a81c59 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}.0beta1
+ARG ZBX_VERSION=${MAJOR_VERSION}.0beta2
 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 40d58b01dd..65ddead4cd 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}.0beta1
+ARG ZBX_VERSION=${MAJOR_VERSION}.0beta2
 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 27e9b98b5d..d165a21296 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}.0beta1
+ARG ZBX_VERSION=${MAJOR_VERSION}.0beta2
 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 7efcb9d016..06cd334a7a 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}.0beta1
+ARG ZBX_VERSION=${MAJOR_VERSION}.0beta2
 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 b188f062c2..6768110b85 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}.0beta1
+ARG ZBX_VERSION=${MAJOR_VERSION}.0beta2
 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 e325cc4ae1..6e19d63c99 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}.0beta1
+ARG ZBX_VERSION=${MAJOR_VERSION}.0beta2
 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 e24ff63cb1..500f09492b 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}.0beta1
+ARG ZBX_VERSION=${MAJOR_VERSION}.0beta2
 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 176f867ae0..72bd834a20 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}.0beta1
+ARG ZBX_VERSION=${MAJOR_VERSION}.0beta2
 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 b8c2f22d9b..0000000000
--- a/update_ver.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/bash
-
-set -e
-
-new_version=$1
-
-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 4c8e0ba009..2f44deb387 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}.0beta1
+ARG ZBX_VERSION=${MAJOR_VERSION}.0beta2
 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 6761085a6e..0d41de6238 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}.0beta1
+ARG ZBX_VERSION=${MAJOR_VERSION}.0beta2
 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 53618a1e47..0159c21127 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}.0beta1
+ARG ZBX_VERSION=${MAJOR_VERSION}.0beta2
 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 a3e79e2497..d606f545d8 100644
--- a/web-nginx-mysql/ubuntu/Dockerfile
+++ b/web-nginx-mysql/ubuntu/Dockerfile
@@ -42,7 +42,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}.0beta1
+ARG ZBX_VERSION=${MAJOR_VERSION}.0beta2
 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 fbaeef40a0..a6a8b251da 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}.0beta1
+ARG ZBX_VERSION=${MAJOR_VERSION}.0beta2
 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 7be281103e..af5b2ff2ad 100644
--- a/web-nginx-pgsql/ubuntu/Dockerfile
+++ b/web-nginx-pgsql/ubuntu/Dockerfile
@@ -42,7 +42,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}.0beta1
+ARG ZBX_VERSION=${MAJOR_VERSION}.0beta2
 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
 ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE}