From 859920ff9e153ff6ce04e506bdd73086f582b296 Mon Sep 17 00:00:00 2001
From: Alexey Pustovalov <alexey.pustovalov@zabbix.com>
Date: Sun, 29 May 2022 02:51:20 +0300
Subject: [PATCH] Removed ServerPort parameter from Zabix proxy images

---
 Dockerfiles/proxy-mysql/alpine/docker-entrypoint.sh   | 1 -
 Dockerfiles/proxy-mysql/centos/docker-entrypoint.sh   | 1 -
 Dockerfiles/proxy-mysql/ol/docker-entrypoint.sh       | 1 -
 Dockerfiles/proxy-mysql/rhel/docker-entrypoint.sh     | 1 -
 Dockerfiles/proxy-mysql/ubuntu/docker-entrypoint.sh   | 1 -
 Dockerfiles/proxy-sqlite3/alpine/docker-entrypoint.sh | 1 -
 Dockerfiles/proxy-sqlite3/centos/docker-entrypoint.sh | 1 -
 Dockerfiles/proxy-sqlite3/ol/docker-entrypoint.sh     | 1 -
 Dockerfiles/proxy-sqlite3/rhel/docker-entrypoint.sh   | 1 -
 Dockerfiles/proxy-sqlite3/ubuntu/docker-entrypoint.sh | 1 -
 env_vars/.env_prx                                     | 2 +-
 11 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/Dockerfiles/proxy-mysql/alpine/docker-entrypoint.sh b/Dockerfiles/proxy-mysql/alpine/docker-entrypoint.sh
index a07d0b714..23377d25c 100755
--- a/Dockerfiles/proxy-mysql/alpine/docker-entrypoint.sh
+++ b/Dockerfiles/proxy-mysql/alpine/docker-entrypoint.sh
@@ -311,7 +311,6 @@ update_zbx_config() {
 
     update_config_var $ZBX_CONFIG "ProxyMode" "${ZBX_PROXYMODE}"
     update_config_var $ZBX_CONFIG "Server" "${ZBX_SERVER_HOST}"
-    update_config_var $ZBX_CONFIG "ServerPort" "${ZBX_SERVER_PORT}"
     if [ -z "${ZBX_HOSTNAME}" ] && [ -n "${ZBX_HOSTNAMEITEM}" ]; then
         update_config_var $ZBX_CONFIG "Hostname" ""
         update_config_var $ZBX_CONFIG "HostnameItem" "${ZBX_HOSTNAMEITEM}"
diff --git a/Dockerfiles/proxy-mysql/centos/docker-entrypoint.sh b/Dockerfiles/proxy-mysql/centos/docker-entrypoint.sh
index 5f15ad5e3..8420b8edb 100755
--- a/Dockerfiles/proxy-mysql/centos/docker-entrypoint.sh
+++ b/Dockerfiles/proxy-mysql/centos/docker-entrypoint.sh
@@ -309,7 +309,6 @@ update_zbx_config() {
 
     update_config_var $ZBX_CONFIG "ProxyMode" "${ZBX_PROXYMODE}"
     update_config_var $ZBX_CONFIG "Server" "${ZBX_SERVER_HOST}"
-    update_config_var $ZBX_CONFIG "ServerPort" "${ZBX_SERVER_PORT}"
     if [ -z "${ZBX_HOSTNAME}" ] && [ -n "${ZBX_HOSTNAMEITEM}" ]; then
         update_config_var $ZBX_CONFIG "Hostname" ""
         update_config_var $ZBX_CONFIG "HostnameItem" "${ZBX_HOSTNAMEITEM}"
diff --git a/Dockerfiles/proxy-mysql/ol/docker-entrypoint.sh b/Dockerfiles/proxy-mysql/ol/docker-entrypoint.sh
index 5f15ad5e3..8420b8edb 100755
--- a/Dockerfiles/proxy-mysql/ol/docker-entrypoint.sh
+++ b/Dockerfiles/proxy-mysql/ol/docker-entrypoint.sh
@@ -309,7 +309,6 @@ update_zbx_config() {
 
     update_config_var $ZBX_CONFIG "ProxyMode" "${ZBX_PROXYMODE}"
     update_config_var $ZBX_CONFIG "Server" "${ZBX_SERVER_HOST}"
-    update_config_var $ZBX_CONFIG "ServerPort" "${ZBX_SERVER_PORT}"
     if [ -z "${ZBX_HOSTNAME}" ] && [ -n "${ZBX_HOSTNAMEITEM}" ]; then
         update_config_var $ZBX_CONFIG "Hostname" ""
         update_config_var $ZBX_CONFIG "HostnameItem" "${ZBX_HOSTNAMEITEM}"
diff --git a/Dockerfiles/proxy-mysql/rhel/docker-entrypoint.sh b/Dockerfiles/proxy-mysql/rhel/docker-entrypoint.sh
index 8e4dd3282..7bc5bd862 100755
--- a/Dockerfiles/proxy-mysql/rhel/docker-entrypoint.sh
+++ b/Dockerfiles/proxy-mysql/rhel/docker-entrypoint.sh
@@ -310,7 +310,6 @@ update_zbx_config() {
 
     update_config_var $ZBX_CONFIG "ProxyMode" "${ZBX_PROXYMODE}"
     update_config_var $ZBX_CONFIG "Server" "${ZBX_SERVER_HOST}"
-    update_config_var $ZBX_CONFIG "ServerPort" "${ZBX_SERVER_PORT}"
     if [ -z "${ZBX_HOSTNAME}" ] && [ -n "${ZBX_HOSTNAMEITEM}" ]; then
         update_config_var $ZBX_CONFIG "Hostname" ""
         update_config_var $ZBX_CONFIG "HostnameItem" "${ZBX_HOSTNAMEITEM}"
diff --git a/Dockerfiles/proxy-mysql/ubuntu/docker-entrypoint.sh b/Dockerfiles/proxy-mysql/ubuntu/docker-entrypoint.sh
index 716a4909c..1795d5830 100755
--- a/Dockerfiles/proxy-mysql/ubuntu/docker-entrypoint.sh
+++ b/Dockerfiles/proxy-mysql/ubuntu/docker-entrypoint.sh
@@ -308,7 +308,6 @@ update_zbx_config() {
 
     update_config_var $ZBX_CONFIG "ProxyMode" "${ZBX_PROXYMODE}"
     update_config_var $ZBX_CONFIG "Server" "${ZBX_SERVER_HOST}"
-    update_config_var $ZBX_CONFIG "ServerPort" "${ZBX_SERVER_PORT}"
     if [ -z "${ZBX_HOSTNAME}" ] && [ -n "${ZBX_HOSTNAMEITEM}" ]; then
         update_config_var $ZBX_CONFIG "Hostname" ""
         update_config_var $ZBX_CONFIG "HostnameItem" "${ZBX_HOSTNAMEITEM}"
diff --git a/Dockerfiles/proxy-sqlite3/alpine/docker-entrypoint.sh b/Dockerfiles/proxy-sqlite3/alpine/docker-entrypoint.sh
index cea31ed26..2a9029ca2 100755
--- a/Dockerfiles/proxy-sqlite3/alpine/docker-entrypoint.sh
+++ b/Dockerfiles/proxy-sqlite3/alpine/docker-entrypoint.sh
@@ -115,7 +115,6 @@ update_zbx_config() {
 
     update_config_var $ZBX_CONFIG "ProxyMode" "${ZBX_PROXYMODE}"
     update_config_var $ZBX_CONFIG "Server" "${ZBX_SERVER_HOST}"
-    update_config_var $ZBX_CONFIG "ServerPort" "${ZBX_SERVER_PORT}"
     if [ -z "${ZBX_HOSTNAME}" ] && [ -n "${ZBX_HOSTNAMEITEM}" ]; then
         update_config_var $ZBX_CONFIG "Hostname" ""
         update_config_var $ZBX_CONFIG "HostnameItem" "${ZBX_HOSTNAMEITEM}"
diff --git a/Dockerfiles/proxy-sqlite3/centos/docker-entrypoint.sh b/Dockerfiles/proxy-sqlite3/centos/docker-entrypoint.sh
index cea31ed26..2a9029ca2 100755
--- a/Dockerfiles/proxy-sqlite3/centos/docker-entrypoint.sh
+++ b/Dockerfiles/proxy-sqlite3/centos/docker-entrypoint.sh
@@ -115,7 +115,6 @@ update_zbx_config() {
 
     update_config_var $ZBX_CONFIG "ProxyMode" "${ZBX_PROXYMODE}"
     update_config_var $ZBX_CONFIG "Server" "${ZBX_SERVER_HOST}"
-    update_config_var $ZBX_CONFIG "ServerPort" "${ZBX_SERVER_PORT}"
     if [ -z "${ZBX_HOSTNAME}" ] && [ -n "${ZBX_HOSTNAMEITEM}" ]; then
         update_config_var $ZBX_CONFIG "Hostname" ""
         update_config_var $ZBX_CONFIG "HostnameItem" "${ZBX_HOSTNAMEITEM}"
diff --git a/Dockerfiles/proxy-sqlite3/ol/docker-entrypoint.sh b/Dockerfiles/proxy-sqlite3/ol/docker-entrypoint.sh
index cea31ed26..2a9029ca2 100755
--- a/Dockerfiles/proxy-sqlite3/ol/docker-entrypoint.sh
+++ b/Dockerfiles/proxy-sqlite3/ol/docker-entrypoint.sh
@@ -115,7 +115,6 @@ update_zbx_config() {
 
     update_config_var $ZBX_CONFIG "ProxyMode" "${ZBX_PROXYMODE}"
     update_config_var $ZBX_CONFIG "Server" "${ZBX_SERVER_HOST}"
-    update_config_var $ZBX_CONFIG "ServerPort" "${ZBX_SERVER_PORT}"
     if [ -z "${ZBX_HOSTNAME}" ] && [ -n "${ZBX_HOSTNAMEITEM}" ]; then
         update_config_var $ZBX_CONFIG "Hostname" ""
         update_config_var $ZBX_CONFIG "HostnameItem" "${ZBX_HOSTNAMEITEM}"
diff --git a/Dockerfiles/proxy-sqlite3/rhel/docker-entrypoint.sh b/Dockerfiles/proxy-sqlite3/rhel/docker-entrypoint.sh
index cea31ed26..2a9029ca2 100755
--- a/Dockerfiles/proxy-sqlite3/rhel/docker-entrypoint.sh
+++ b/Dockerfiles/proxy-sqlite3/rhel/docker-entrypoint.sh
@@ -115,7 +115,6 @@ update_zbx_config() {
 
     update_config_var $ZBX_CONFIG "ProxyMode" "${ZBX_PROXYMODE}"
     update_config_var $ZBX_CONFIG "Server" "${ZBX_SERVER_HOST}"
-    update_config_var $ZBX_CONFIG "ServerPort" "${ZBX_SERVER_PORT}"
     if [ -z "${ZBX_HOSTNAME}" ] && [ -n "${ZBX_HOSTNAMEITEM}" ]; then
         update_config_var $ZBX_CONFIG "Hostname" ""
         update_config_var $ZBX_CONFIG "HostnameItem" "${ZBX_HOSTNAMEITEM}"
diff --git a/Dockerfiles/proxy-sqlite3/ubuntu/docker-entrypoint.sh b/Dockerfiles/proxy-sqlite3/ubuntu/docker-entrypoint.sh
index 656192853..e4a17aa79 100755
--- a/Dockerfiles/proxy-sqlite3/ubuntu/docker-entrypoint.sh
+++ b/Dockerfiles/proxy-sqlite3/ubuntu/docker-entrypoint.sh
@@ -115,7 +115,6 @@ update_zbx_config() {
 
     update_config_var $ZBX_CONFIG "ProxyMode" "${ZBX_PROXYMODE}"
     update_config_var $ZBX_CONFIG "Server" "${ZBX_SERVER_HOST}"
-    update_config_var $ZBX_CONFIG "ServerPort" "${ZBX_SERVER_PORT}"
     if [ -z "${ZBX_HOSTNAME}" ] && [ -n "${ZBX_HOSTNAMEITEM}" ]; then
         update_config_var $ZBX_CONFIG "Hostname" ""
         update_config_var $ZBX_CONFIG "HostnameItem" "${ZBX_HOSTNAMEITEM}"
diff --git a/env_vars/.env_prx b/env_vars/.env_prx
index 2f9777f42..a8533a26a 100644
--- a/env_vars/.env_prx
+++ b/env_vars/.env_prx
@@ -1,6 +1,6 @@
 # ZBX_PROXYMODE=0
 # ZBX_SERVER_HOST=zabbix-server
-# ZBX_SERVER_PORT=10051
+# ZBX_SERVER_PORT=10051 # Deprecated since 6.0.0
 # ZBX_HOSTNAME=zabbix-proxy-$db_type
 # ZBX_ENABLEREMOTECOMMANDS=0 # Available since 3.4.0
 # ZBX_LOGREMOTECOMMANDS=0 # Available since 3.4.0