From 98a93119f45ee8ae266f16c25c9eef2e7fba941a Mon Sep 17 00:00:00 2001
From: Alexey Pustovalov <alexey.pustovalov@zabbix.com>
Date: Wed, 17 Nov 2021 01:45:24 +0100
Subject: [PATCH] Removed duplicated default values for Zabbix server port in
 web images

(cherry picked from commit 1ca8cb2a9edf6d419a01f275e51b084849ba6697)
---
 Dockerfiles/web-apache-mysql/alpine/docker-entrypoint.sh | 2 +-
 Dockerfiles/web-apache-mysql/centos/docker-entrypoint.sh | 2 +-
 Dockerfiles/web-apache-mysql/ol/docker-entrypoint.sh     | 2 +-
 Dockerfiles/web-apache-mysql/ubuntu/docker-entrypoint.sh | 2 +-
 Dockerfiles/web-apache-pgsql/alpine/docker-entrypoint.sh | 2 +-
 Dockerfiles/web-apache-pgsql/centos/docker-entrypoint.sh | 2 +-
 Dockerfiles/web-apache-pgsql/ol/docker-entrypoint.sh     | 2 +-
 Dockerfiles/web-apache-pgsql/ubuntu/docker-entrypoint.sh | 2 +-
 Dockerfiles/web-nginx-mysql/alpine/docker-entrypoint.sh  | 2 +-
 Dockerfiles/web-nginx-mysql/centos/docker-entrypoint.sh  | 2 +-
 Dockerfiles/web-nginx-mysql/ol/docker-entrypoint.sh      | 2 +-
 Dockerfiles/web-nginx-mysql/rhel/docker-entrypoint.sh    | 2 +-
 Dockerfiles/web-nginx-mysql/ubuntu/docker-entrypoint.sh  | 2 +-
 Dockerfiles/web-nginx-pgsql/alpine/docker-entrypoint.sh  | 2 +-
 Dockerfiles/web-nginx-pgsql/centos/docker-entrypoint.sh  | 2 +-
 Dockerfiles/web-nginx-pgsql/ol/docker-entrypoint.sh      | 2 +-
 Dockerfiles/web-nginx-pgsql/ubuntu/docker-entrypoint.sh  | 2 +-
 17 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/Dockerfiles/web-apache-mysql/alpine/docker-entrypoint.sh b/Dockerfiles/web-apache-mysql/alpine/docker-entrypoint.sh
index a2f1adc57..ddf7ee745 100755
--- a/Dockerfiles/web-apache-mysql/alpine/docker-entrypoint.sh
+++ b/Dockerfiles/web-apache-mysql/alpine/docker-entrypoint.sh
@@ -190,7 +190,7 @@ prepare_zbx_web_config() {
     export DB_SERVER_USER=${DB_SERVER_ZBX_USER}
     export DB_SERVER_PASS=${DB_SERVER_ZBX_PASS}
     export ZBX_SERVER_HOST=${ZBX_SERVER_HOST}
-    export ZBX_SERVER_PORT=${ZBX_SERVER_PORT:-"10051"}
+    export ZBX_SERVER_PORT=${ZBX_SERVER_PORT}
     export ZBX_SERVER_NAME=${ZBX_SERVER_NAME}
 
     : ${ZBX_DB_ENCRYPTION:="false"}
diff --git a/Dockerfiles/web-apache-mysql/centos/docker-entrypoint.sh b/Dockerfiles/web-apache-mysql/centos/docker-entrypoint.sh
index 9f290ce87..216081d8a 100755
--- a/Dockerfiles/web-apache-mysql/centos/docker-entrypoint.sh
+++ b/Dockerfiles/web-apache-mysql/centos/docker-entrypoint.sh
@@ -199,7 +199,7 @@ prepare_zbx_web_config() {
     export DB_SERVER_USER=${DB_SERVER_ZBX_USER}
     export DB_SERVER_PASS=${DB_SERVER_ZBX_PASS}
     export ZBX_SERVER_HOST=${ZBX_SERVER_HOST}
-    export ZBX_SERVER_PORT=${ZBX_SERVER_PORT:-"10051"}
+    export ZBX_SERVER_PORT=${ZBX_SERVER_PORT}
     export ZBX_SERVER_NAME=${ZBX_SERVER_NAME}
 
     : ${ZBX_DB_ENCRYPTION:="false"}
diff --git a/Dockerfiles/web-apache-mysql/ol/docker-entrypoint.sh b/Dockerfiles/web-apache-mysql/ol/docker-entrypoint.sh
index 9f290ce87..216081d8a 100755
--- a/Dockerfiles/web-apache-mysql/ol/docker-entrypoint.sh
+++ b/Dockerfiles/web-apache-mysql/ol/docker-entrypoint.sh
@@ -199,7 +199,7 @@ prepare_zbx_web_config() {
     export DB_SERVER_USER=${DB_SERVER_ZBX_USER}
     export DB_SERVER_PASS=${DB_SERVER_ZBX_PASS}
     export ZBX_SERVER_HOST=${ZBX_SERVER_HOST}
-    export ZBX_SERVER_PORT=${ZBX_SERVER_PORT:-"10051"}
+    export ZBX_SERVER_PORT=${ZBX_SERVER_PORT}
     export ZBX_SERVER_NAME=${ZBX_SERVER_NAME}
 
     : ${ZBX_DB_ENCRYPTION:="false"}
diff --git a/Dockerfiles/web-apache-mysql/ubuntu/docker-entrypoint.sh b/Dockerfiles/web-apache-mysql/ubuntu/docker-entrypoint.sh
index c51d51557..9e49a90b4 100755
--- a/Dockerfiles/web-apache-mysql/ubuntu/docker-entrypoint.sh
+++ b/Dockerfiles/web-apache-mysql/ubuntu/docker-entrypoint.sh
@@ -190,7 +190,7 @@ prepare_zbx_web_config() {
     export DB_SERVER_USER=${DB_SERVER_ZBX_USER}
     export DB_SERVER_PASS=${DB_SERVER_ZBX_PASS}
     export ZBX_SERVER_HOST=${ZBX_SERVER_HOST}
-    export ZBX_SERVER_PORT=${ZBX_SERVER_PORT:-"10051"}
+    export ZBX_SERVER_PORT=${ZBX_SERVER_PORT}
     export ZBX_SERVER_NAME=${ZBX_SERVER_NAME}
 
     : ${ZBX_DB_ENCRYPTION:="false"}
diff --git a/Dockerfiles/web-apache-pgsql/alpine/docker-entrypoint.sh b/Dockerfiles/web-apache-pgsql/alpine/docker-entrypoint.sh
index ae5d2eae5..7e9b5e0cf 100755
--- a/Dockerfiles/web-apache-pgsql/alpine/docker-entrypoint.sh
+++ b/Dockerfiles/web-apache-pgsql/alpine/docker-entrypoint.sh
@@ -176,7 +176,7 @@ prepare_zbx_web_config() {
     export DB_SERVER_USER=${DB_SERVER_ZBX_USER}
     export DB_SERVER_PASS=${DB_SERVER_ZBX_PASS}
     export ZBX_SERVER_HOST=${ZBX_SERVER_HOST}
-    export ZBX_SERVER_PORT=${ZBX_SERVER_PORT:-"10051"}
+    export ZBX_SERVER_PORT=${ZBX_SERVER_PORT}
     export ZBX_SERVER_NAME=${ZBX_SERVER_NAME}
 
     : ${ZBX_DB_ENCRYPTION:="false"}
diff --git a/Dockerfiles/web-apache-pgsql/centos/docker-entrypoint.sh b/Dockerfiles/web-apache-pgsql/centos/docker-entrypoint.sh
index 51fad5fd1..01a2ed4f3 100755
--- a/Dockerfiles/web-apache-pgsql/centos/docker-entrypoint.sh
+++ b/Dockerfiles/web-apache-pgsql/centos/docker-entrypoint.sh
@@ -185,7 +185,7 @@ prepare_zbx_web_config() {
     export DB_SERVER_USER=${DB_SERVER_ZBX_USER}
     export DB_SERVER_PASS=${DB_SERVER_ZBX_PASS}
     export ZBX_SERVER_HOST=${ZBX_SERVER_HOST}
-    export ZBX_SERVER_PORT=${ZBX_SERVER_PORT:-"10051"}
+    export ZBX_SERVER_PORT=${ZBX_SERVER_PORT}
     export ZBX_SERVER_NAME=${ZBX_SERVER_NAME}
 
     : ${ZBX_DB_ENCRYPTION:="false"}
diff --git a/Dockerfiles/web-apache-pgsql/ol/docker-entrypoint.sh b/Dockerfiles/web-apache-pgsql/ol/docker-entrypoint.sh
index 51fad5fd1..01a2ed4f3 100755
--- a/Dockerfiles/web-apache-pgsql/ol/docker-entrypoint.sh
+++ b/Dockerfiles/web-apache-pgsql/ol/docker-entrypoint.sh
@@ -185,7 +185,7 @@ prepare_zbx_web_config() {
     export DB_SERVER_USER=${DB_SERVER_ZBX_USER}
     export DB_SERVER_PASS=${DB_SERVER_ZBX_PASS}
     export ZBX_SERVER_HOST=${ZBX_SERVER_HOST}
-    export ZBX_SERVER_PORT=${ZBX_SERVER_PORT:-"10051"}
+    export ZBX_SERVER_PORT=${ZBX_SERVER_PORT}
     export ZBX_SERVER_NAME=${ZBX_SERVER_NAME}
 
     : ${ZBX_DB_ENCRYPTION:="false"}
diff --git a/Dockerfiles/web-apache-pgsql/ubuntu/docker-entrypoint.sh b/Dockerfiles/web-apache-pgsql/ubuntu/docker-entrypoint.sh
index a2847a558..b57b64772 100755
--- a/Dockerfiles/web-apache-pgsql/ubuntu/docker-entrypoint.sh
+++ b/Dockerfiles/web-apache-pgsql/ubuntu/docker-entrypoint.sh
@@ -180,7 +180,7 @@ prepare_zbx_web_config() {
     export DB_SERVER_USER=${DB_SERVER_ZBX_USER}
     export DB_SERVER_PASS=${DB_SERVER_ZBX_PASS}
     export ZBX_SERVER_HOST=${ZBX_SERVER_HOST}
-    export ZBX_SERVER_PORT=${ZBX_SERVER_PORT:-"10051"}
+    export ZBX_SERVER_PORT=${ZBX_SERVER_PORT}
     export ZBX_SERVER_NAME=${ZBX_SERVER_NAME}
 
     : ${ZBX_DB_ENCRYPTION:="false"}
diff --git a/Dockerfiles/web-nginx-mysql/alpine/docker-entrypoint.sh b/Dockerfiles/web-nginx-mysql/alpine/docker-entrypoint.sh
index feefeeabe..dae6e35b1 100755
--- a/Dockerfiles/web-nginx-mysql/alpine/docker-entrypoint.sh
+++ b/Dockerfiles/web-nginx-mysql/alpine/docker-entrypoint.sh
@@ -200,7 +200,7 @@ prepare_zbx_web_config() {
     export DB_SERVER_USER=${DB_SERVER_ZBX_USER}
     export DB_SERVER_PASS=${DB_SERVER_ZBX_PASS}
     export ZBX_SERVER_HOST=${ZBX_SERVER_HOST}
-    export ZBX_SERVER_PORT=${ZBX_SERVER_PORT:-"10051"}
+    export ZBX_SERVER_PORT=${ZBX_SERVER_PORT}
     export ZBX_SERVER_NAME=${ZBX_SERVER_NAME}
 
     : ${ZBX_DB_ENCRYPTION:="false"}
diff --git a/Dockerfiles/web-nginx-mysql/centos/docker-entrypoint.sh b/Dockerfiles/web-nginx-mysql/centos/docker-entrypoint.sh
index bcb768143..44afb8845 100755
--- a/Dockerfiles/web-nginx-mysql/centos/docker-entrypoint.sh
+++ b/Dockerfiles/web-nginx-mysql/centos/docker-entrypoint.sh
@@ -200,7 +200,7 @@ prepare_zbx_web_config() {
     export DB_SERVER_USER=${DB_SERVER_ZBX_USER}
     export DB_SERVER_PASS=${DB_SERVER_ZBX_PASS}
     export ZBX_SERVER_HOST=${ZBX_SERVER_HOST}
-    export ZBX_SERVER_PORT=${ZBX_SERVER_PORT:-"10051"}
+    export ZBX_SERVER_PORT=${ZBX_SERVER_PORT}
     export ZBX_SERVER_NAME=${ZBX_SERVER_NAME}
 
     : ${ZBX_DB_ENCRYPTION:="false"}
diff --git a/Dockerfiles/web-nginx-mysql/ol/docker-entrypoint.sh b/Dockerfiles/web-nginx-mysql/ol/docker-entrypoint.sh
index bcb768143..44afb8845 100755
--- a/Dockerfiles/web-nginx-mysql/ol/docker-entrypoint.sh
+++ b/Dockerfiles/web-nginx-mysql/ol/docker-entrypoint.sh
@@ -200,7 +200,7 @@ prepare_zbx_web_config() {
     export DB_SERVER_USER=${DB_SERVER_ZBX_USER}
     export DB_SERVER_PASS=${DB_SERVER_ZBX_PASS}
     export ZBX_SERVER_HOST=${ZBX_SERVER_HOST}
-    export ZBX_SERVER_PORT=${ZBX_SERVER_PORT:-"10051"}
+    export ZBX_SERVER_PORT=${ZBX_SERVER_PORT}
     export ZBX_SERVER_NAME=${ZBX_SERVER_NAME}
 
     : ${ZBX_DB_ENCRYPTION:="false"}
diff --git a/Dockerfiles/web-nginx-mysql/rhel/docker-entrypoint.sh b/Dockerfiles/web-nginx-mysql/rhel/docker-entrypoint.sh
index f4587f6f9..dc437248a 100755
--- a/Dockerfiles/web-nginx-mysql/rhel/docker-entrypoint.sh
+++ b/Dockerfiles/web-nginx-mysql/rhel/docker-entrypoint.sh
@@ -200,7 +200,7 @@ prepare_zbx_web_config() {
     export DB_SERVER_USER=${DB_SERVER_ZBX_USER}
     export DB_SERVER_PASS=${DB_SERVER_ZBX_PASS}
     export ZBX_SERVER_HOST=${ZBX_SERVER_HOST}
-    export ZBX_SERVER_PORT=${ZBX_SERVER_PORT:-"10051"}
+    export ZBX_SERVER_PORT=${ZBX_SERVER_PORT}
     export ZBX_SERVER_NAME=${ZBX_SERVER_NAME}
 
     : ${ZBX_DB_ENCRYPTION:="false"}
diff --git a/Dockerfiles/web-nginx-mysql/ubuntu/docker-entrypoint.sh b/Dockerfiles/web-nginx-mysql/ubuntu/docker-entrypoint.sh
index bdafc8d9c..298af5f3b 100755
--- a/Dockerfiles/web-nginx-mysql/ubuntu/docker-entrypoint.sh
+++ b/Dockerfiles/web-nginx-mysql/ubuntu/docker-entrypoint.sh
@@ -200,7 +200,7 @@ prepare_zbx_web_config() {
     export DB_SERVER_USER=${DB_SERVER_ZBX_USER}
     export DB_SERVER_PASS=${DB_SERVER_ZBX_PASS}
     export ZBX_SERVER_HOST=${ZBX_SERVER_HOST}
-    export ZBX_SERVER_PORT=${ZBX_SERVER_PORT:-"10051"}
+    export ZBX_SERVER_PORT=${ZBX_SERVER_PORT}
     export ZBX_SERVER_NAME=${ZBX_SERVER_NAME}
 
     : ${ZBX_DB_ENCRYPTION:="false"}
diff --git a/Dockerfiles/web-nginx-pgsql/alpine/docker-entrypoint.sh b/Dockerfiles/web-nginx-pgsql/alpine/docker-entrypoint.sh
index 76c2e6ec6..c1d43b4e2 100755
--- a/Dockerfiles/web-nginx-pgsql/alpine/docker-entrypoint.sh
+++ b/Dockerfiles/web-nginx-pgsql/alpine/docker-entrypoint.sh
@@ -186,7 +186,7 @@ prepare_zbx_web_config() {
     export DB_SERVER_USER=${DB_SERVER_ZBX_USER}
     export DB_SERVER_PASS=${DB_SERVER_ZBX_PASS}
     export ZBX_SERVER_HOST=${ZBX_SERVER_HOST}
-    export ZBX_SERVER_PORT=${ZBX_SERVER_PORT:-"10051"}
+    export ZBX_SERVER_PORT=${ZBX_SERVER_PORT}
     export ZBX_SERVER_NAME=${ZBX_SERVER_NAME}
 
     : ${ZBX_DB_ENCRYPTION:="false"}
diff --git a/Dockerfiles/web-nginx-pgsql/centos/docker-entrypoint.sh b/Dockerfiles/web-nginx-pgsql/centos/docker-entrypoint.sh
index d1a376aa6..597d1db6a 100755
--- a/Dockerfiles/web-nginx-pgsql/centos/docker-entrypoint.sh
+++ b/Dockerfiles/web-nginx-pgsql/centos/docker-entrypoint.sh
@@ -186,7 +186,7 @@ prepare_zbx_web_config() {
     export DB_SERVER_USER=${DB_SERVER_ZBX_USER}
     export DB_SERVER_PASS=${DB_SERVER_ZBX_PASS}
     export ZBX_SERVER_HOST=${ZBX_SERVER_HOST}
-    export ZBX_SERVER_PORT=${ZBX_SERVER_PORT:-"10051"}
+    export ZBX_SERVER_PORT=${ZBX_SERVER_PORT}
     export ZBX_SERVER_NAME=${ZBX_SERVER_NAME}
 
     : ${ZBX_DB_ENCRYPTION:="false"}
diff --git a/Dockerfiles/web-nginx-pgsql/ol/docker-entrypoint.sh b/Dockerfiles/web-nginx-pgsql/ol/docker-entrypoint.sh
index d1a376aa6..597d1db6a 100755
--- a/Dockerfiles/web-nginx-pgsql/ol/docker-entrypoint.sh
+++ b/Dockerfiles/web-nginx-pgsql/ol/docker-entrypoint.sh
@@ -186,7 +186,7 @@ prepare_zbx_web_config() {
     export DB_SERVER_USER=${DB_SERVER_ZBX_USER}
     export DB_SERVER_PASS=${DB_SERVER_ZBX_PASS}
     export ZBX_SERVER_HOST=${ZBX_SERVER_HOST}
-    export ZBX_SERVER_PORT=${ZBX_SERVER_PORT:-"10051"}
+    export ZBX_SERVER_PORT=${ZBX_SERVER_PORT}
     export ZBX_SERVER_NAME=${ZBX_SERVER_NAME}
 
     : ${ZBX_DB_ENCRYPTION:="false"}
diff --git a/Dockerfiles/web-nginx-pgsql/ubuntu/docker-entrypoint.sh b/Dockerfiles/web-nginx-pgsql/ubuntu/docker-entrypoint.sh
index a3e9be67e..958e4f348 100755
--- a/Dockerfiles/web-nginx-pgsql/ubuntu/docker-entrypoint.sh
+++ b/Dockerfiles/web-nginx-pgsql/ubuntu/docker-entrypoint.sh
@@ -186,7 +186,7 @@ prepare_zbx_web_config() {
     export DB_SERVER_USER=${DB_SERVER_ZBX_USER}
     export DB_SERVER_PASS=${DB_SERVER_ZBX_PASS}
     export ZBX_SERVER_HOST=${ZBX_SERVER_HOST}
-    export ZBX_SERVER_PORT=${ZBX_SERVER_PORT:-"10051"}
+    export ZBX_SERVER_PORT=${ZBX_SERVER_PORT}
     export ZBX_SERVER_NAME=${ZBX_SERVER_NAME}
 
     : ${ZBX_DB_ENCRYPTION:="false"}