From 31340521c78cd64c5e34450e6047113c13b6a0bf Mon Sep 17 00:00:00 2001
From: root <root@centos-linux.shared>
Date: Sun, 13 Jan 2019 03:20:50 +0200
Subject: [PATCH] Added possibility to modify Zabbix Agent port number

---
 agent/alpine/docker-entrypoint.sh            | 2 +-
 agent/centos/docker-entrypoint.sh            | 2 +-
 agent/ubuntu/docker-entrypoint.sh            | 2 +-
 java-gateway/alpine/docker-entrypoint.sh     | 2 +-
 java-gateway/centos/docker-entrypoint.sh     | 2 +-
 java-gateway/ubuntu/docker-entrypoint.sh     | 2 +-
 proxy-mysql/alpine/docker-entrypoint.sh      | 2 +-
 proxy-mysql/centos/docker-entrypoint.sh      | 2 +-
 proxy-mysql/ubuntu/docker-entrypoint.sh      | 2 +-
 proxy-sqlite3/alpine/docker-entrypoint.sh    | 2 +-
 proxy-sqlite3/centos/docker-entrypoint.sh    | 2 +-
 proxy-sqlite3/ubuntu/docker-entrypoint.sh    | 2 +-
 server-mysql/alpine/docker-entrypoint.sh     | 2 +-
 server-mysql/centos/docker-entrypoint.sh     | 2 +-
 server-mysql/ubuntu/docker-entrypoint.sh     | 2 +-
 server-pgsql/alpine/docker-entrypoint.sh     | 2 +-
 server-pgsql/centos/docker-entrypoint.sh     | 2 +-
 server-pgsql/ubuntu/docker-entrypoint.sh     | 2 +-
 web-apache-mysql/alpine/docker-entrypoint.sh | 2 +-
 web-apache-mysql/centos/docker-entrypoint.sh | 2 +-
 web-apache-mysql/ubuntu/docker-entrypoint.sh | 2 +-
 web-apache-pgsql/alpine/docker-entrypoint.sh | 2 +-
 web-apache-pgsql/centos/docker-entrypoint.sh | 2 +-
 web-apache-pgsql/ubuntu/docker-entrypoint.sh | 2 +-
 web-nginx-mysql/alpine/docker-entrypoint.sh  | 2 +-
 web-nginx-mysql/centos/docker-entrypoint.sh  | 2 +-
 web-nginx-mysql/ubuntu/docker-entrypoint.sh  | 2 +-
 web-nginx-pgsql/alpine/docker-entrypoint.sh  | 2 +-
 web-nginx-pgsql/centos/docker-entrypoint.sh  | 2 +-
 web-nginx-pgsql/ubuntu/docker-entrypoint.sh  | 2 +-
 zabbix-appliance/alpine/docker-entrypoint.sh | 2 +-
 zabbix-appliance/centos/docker-entrypoint.sh | 2 +-
 zabbix-appliance/rhel/docker-entrypoint.sh   | 2 +-
 zabbix-appliance/ubuntu/docker-entrypoint.sh | 2 +-
 34 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/agent/alpine/docker-entrypoint.sh b/agent/alpine/docker-entrypoint.sh
index 04e6f43a8..26e565718 100755
--- a/agent/alpine/docker-entrypoint.sh
+++ b/agent/alpine/docker-entrypoint.sh
@@ -907,7 +907,7 @@ prepare_zbx_agent_config() {
         update_config_var $ZBX_AGENT_CONFIG "Server"
     fi
 
-    update_config_var $ZBX_AGENT_CONFIG "ListenPort"
+    update_config_var $ZBX_AGENT_CONFIG "ListenPort" "${ZBX_LISTENPORT}"
     update_config_var $ZBX_AGENT_CONFIG "ListenIP" "${ZBX_LISTENIP}"
     update_config_var $ZBX_AGENT_CONFIG "StartAgents" "${ZBX_STARTAGENTS}"
 
diff --git a/agent/centos/docker-entrypoint.sh b/agent/centos/docker-entrypoint.sh
index 04e6f43a8..26e565718 100755
--- a/agent/centos/docker-entrypoint.sh
+++ b/agent/centos/docker-entrypoint.sh
@@ -907,7 +907,7 @@ prepare_zbx_agent_config() {
         update_config_var $ZBX_AGENT_CONFIG "Server"
     fi
 
-    update_config_var $ZBX_AGENT_CONFIG "ListenPort"
+    update_config_var $ZBX_AGENT_CONFIG "ListenPort" "${ZBX_LISTENPORT}"
     update_config_var $ZBX_AGENT_CONFIG "ListenIP" "${ZBX_LISTENIP}"
     update_config_var $ZBX_AGENT_CONFIG "StartAgents" "${ZBX_STARTAGENTS}"
 
diff --git a/agent/ubuntu/docker-entrypoint.sh b/agent/ubuntu/docker-entrypoint.sh
index 04e6f43a8..26e565718 100755
--- a/agent/ubuntu/docker-entrypoint.sh
+++ b/agent/ubuntu/docker-entrypoint.sh
@@ -907,7 +907,7 @@ prepare_zbx_agent_config() {
         update_config_var $ZBX_AGENT_CONFIG "Server"
     fi
 
-    update_config_var $ZBX_AGENT_CONFIG "ListenPort"
+    update_config_var $ZBX_AGENT_CONFIG "ListenPort" "${ZBX_LISTENPORT}"
     update_config_var $ZBX_AGENT_CONFIG "ListenIP" "${ZBX_LISTENIP}"
     update_config_var $ZBX_AGENT_CONFIG "StartAgents" "${ZBX_STARTAGENTS}"
 
diff --git a/java-gateway/alpine/docker-entrypoint.sh b/java-gateway/alpine/docker-entrypoint.sh
index 04e6f43a8..26e565718 100755
--- a/java-gateway/alpine/docker-entrypoint.sh
+++ b/java-gateway/alpine/docker-entrypoint.sh
@@ -907,7 +907,7 @@ prepare_zbx_agent_config() {
         update_config_var $ZBX_AGENT_CONFIG "Server"
     fi
 
-    update_config_var $ZBX_AGENT_CONFIG "ListenPort"
+    update_config_var $ZBX_AGENT_CONFIG "ListenPort" "${ZBX_LISTENPORT}"
     update_config_var $ZBX_AGENT_CONFIG "ListenIP" "${ZBX_LISTENIP}"
     update_config_var $ZBX_AGENT_CONFIG "StartAgents" "${ZBX_STARTAGENTS}"
 
diff --git a/java-gateway/centos/docker-entrypoint.sh b/java-gateway/centos/docker-entrypoint.sh
index 04e6f43a8..26e565718 100755
--- a/java-gateway/centos/docker-entrypoint.sh
+++ b/java-gateway/centos/docker-entrypoint.sh
@@ -907,7 +907,7 @@ prepare_zbx_agent_config() {
         update_config_var $ZBX_AGENT_CONFIG "Server"
     fi
 
-    update_config_var $ZBX_AGENT_CONFIG "ListenPort"
+    update_config_var $ZBX_AGENT_CONFIG "ListenPort" "${ZBX_LISTENPORT}"
     update_config_var $ZBX_AGENT_CONFIG "ListenIP" "${ZBX_LISTENIP}"
     update_config_var $ZBX_AGENT_CONFIG "StartAgents" "${ZBX_STARTAGENTS}"
 
diff --git a/java-gateway/ubuntu/docker-entrypoint.sh b/java-gateway/ubuntu/docker-entrypoint.sh
index 04e6f43a8..26e565718 100755
--- a/java-gateway/ubuntu/docker-entrypoint.sh
+++ b/java-gateway/ubuntu/docker-entrypoint.sh
@@ -907,7 +907,7 @@ prepare_zbx_agent_config() {
         update_config_var $ZBX_AGENT_CONFIG "Server"
     fi
 
-    update_config_var $ZBX_AGENT_CONFIG "ListenPort"
+    update_config_var $ZBX_AGENT_CONFIG "ListenPort" "${ZBX_LISTENPORT}"
     update_config_var $ZBX_AGENT_CONFIG "ListenIP" "${ZBX_LISTENIP}"
     update_config_var $ZBX_AGENT_CONFIG "StartAgents" "${ZBX_STARTAGENTS}"
 
diff --git a/proxy-mysql/alpine/docker-entrypoint.sh b/proxy-mysql/alpine/docker-entrypoint.sh
index 04e6f43a8..26e565718 100755
--- a/proxy-mysql/alpine/docker-entrypoint.sh
+++ b/proxy-mysql/alpine/docker-entrypoint.sh
@@ -907,7 +907,7 @@ prepare_zbx_agent_config() {
         update_config_var $ZBX_AGENT_CONFIG "Server"
     fi
 
-    update_config_var $ZBX_AGENT_CONFIG "ListenPort"
+    update_config_var $ZBX_AGENT_CONFIG "ListenPort" "${ZBX_LISTENPORT}"
     update_config_var $ZBX_AGENT_CONFIG "ListenIP" "${ZBX_LISTENIP}"
     update_config_var $ZBX_AGENT_CONFIG "StartAgents" "${ZBX_STARTAGENTS}"
 
diff --git a/proxy-mysql/centos/docker-entrypoint.sh b/proxy-mysql/centos/docker-entrypoint.sh
index 04e6f43a8..26e565718 100755
--- a/proxy-mysql/centos/docker-entrypoint.sh
+++ b/proxy-mysql/centos/docker-entrypoint.sh
@@ -907,7 +907,7 @@ prepare_zbx_agent_config() {
         update_config_var $ZBX_AGENT_CONFIG "Server"
     fi
 
-    update_config_var $ZBX_AGENT_CONFIG "ListenPort"
+    update_config_var $ZBX_AGENT_CONFIG "ListenPort" "${ZBX_LISTENPORT}"
     update_config_var $ZBX_AGENT_CONFIG "ListenIP" "${ZBX_LISTENIP}"
     update_config_var $ZBX_AGENT_CONFIG "StartAgents" "${ZBX_STARTAGENTS}"
 
diff --git a/proxy-mysql/ubuntu/docker-entrypoint.sh b/proxy-mysql/ubuntu/docker-entrypoint.sh
index 04e6f43a8..26e565718 100755
--- a/proxy-mysql/ubuntu/docker-entrypoint.sh
+++ b/proxy-mysql/ubuntu/docker-entrypoint.sh
@@ -907,7 +907,7 @@ prepare_zbx_agent_config() {
         update_config_var $ZBX_AGENT_CONFIG "Server"
     fi
 
-    update_config_var $ZBX_AGENT_CONFIG "ListenPort"
+    update_config_var $ZBX_AGENT_CONFIG "ListenPort" "${ZBX_LISTENPORT}"
     update_config_var $ZBX_AGENT_CONFIG "ListenIP" "${ZBX_LISTENIP}"
     update_config_var $ZBX_AGENT_CONFIG "StartAgents" "${ZBX_STARTAGENTS}"
 
diff --git a/proxy-sqlite3/alpine/docker-entrypoint.sh b/proxy-sqlite3/alpine/docker-entrypoint.sh
index 04e6f43a8..26e565718 100755
--- a/proxy-sqlite3/alpine/docker-entrypoint.sh
+++ b/proxy-sqlite3/alpine/docker-entrypoint.sh
@@ -907,7 +907,7 @@ prepare_zbx_agent_config() {
         update_config_var $ZBX_AGENT_CONFIG "Server"
     fi
 
-    update_config_var $ZBX_AGENT_CONFIG "ListenPort"
+    update_config_var $ZBX_AGENT_CONFIG "ListenPort" "${ZBX_LISTENPORT}"
     update_config_var $ZBX_AGENT_CONFIG "ListenIP" "${ZBX_LISTENIP}"
     update_config_var $ZBX_AGENT_CONFIG "StartAgents" "${ZBX_STARTAGENTS}"
 
diff --git a/proxy-sqlite3/centos/docker-entrypoint.sh b/proxy-sqlite3/centos/docker-entrypoint.sh
index 04e6f43a8..26e565718 100755
--- a/proxy-sqlite3/centos/docker-entrypoint.sh
+++ b/proxy-sqlite3/centos/docker-entrypoint.sh
@@ -907,7 +907,7 @@ prepare_zbx_agent_config() {
         update_config_var $ZBX_AGENT_CONFIG "Server"
     fi
 
-    update_config_var $ZBX_AGENT_CONFIG "ListenPort"
+    update_config_var $ZBX_AGENT_CONFIG "ListenPort" "${ZBX_LISTENPORT}"
     update_config_var $ZBX_AGENT_CONFIG "ListenIP" "${ZBX_LISTENIP}"
     update_config_var $ZBX_AGENT_CONFIG "StartAgents" "${ZBX_STARTAGENTS}"
 
diff --git a/proxy-sqlite3/ubuntu/docker-entrypoint.sh b/proxy-sqlite3/ubuntu/docker-entrypoint.sh
index 04e6f43a8..26e565718 100755
--- a/proxy-sqlite3/ubuntu/docker-entrypoint.sh
+++ b/proxy-sqlite3/ubuntu/docker-entrypoint.sh
@@ -907,7 +907,7 @@ prepare_zbx_agent_config() {
         update_config_var $ZBX_AGENT_CONFIG "Server"
     fi
 
-    update_config_var $ZBX_AGENT_CONFIG "ListenPort"
+    update_config_var $ZBX_AGENT_CONFIG "ListenPort" "${ZBX_LISTENPORT}"
     update_config_var $ZBX_AGENT_CONFIG "ListenIP" "${ZBX_LISTENIP}"
     update_config_var $ZBX_AGENT_CONFIG "StartAgents" "${ZBX_STARTAGENTS}"
 
diff --git a/server-mysql/alpine/docker-entrypoint.sh b/server-mysql/alpine/docker-entrypoint.sh
index 04e6f43a8..26e565718 100755
--- a/server-mysql/alpine/docker-entrypoint.sh
+++ b/server-mysql/alpine/docker-entrypoint.sh
@@ -907,7 +907,7 @@ prepare_zbx_agent_config() {
         update_config_var $ZBX_AGENT_CONFIG "Server"
     fi
 
-    update_config_var $ZBX_AGENT_CONFIG "ListenPort"
+    update_config_var $ZBX_AGENT_CONFIG "ListenPort" "${ZBX_LISTENPORT}"
     update_config_var $ZBX_AGENT_CONFIG "ListenIP" "${ZBX_LISTENIP}"
     update_config_var $ZBX_AGENT_CONFIG "StartAgents" "${ZBX_STARTAGENTS}"
 
diff --git a/server-mysql/centos/docker-entrypoint.sh b/server-mysql/centos/docker-entrypoint.sh
index 04e6f43a8..26e565718 100755
--- a/server-mysql/centos/docker-entrypoint.sh
+++ b/server-mysql/centos/docker-entrypoint.sh
@@ -907,7 +907,7 @@ prepare_zbx_agent_config() {
         update_config_var $ZBX_AGENT_CONFIG "Server"
     fi
 
-    update_config_var $ZBX_AGENT_CONFIG "ListenPort"
+    update_config_var $ZBX_AGENT_CONFIG "ListenPort" "${ZBX_LISTENPORT}"
     update_config_var $ZBX_AGENT_CONFIG "ListenIP" "${ZBX_LISTENIP}"
     update_config_var $ZBX_AGENT_CONFIG "StartAgents" "${ZBX_STARTAGENTS}"
 
diff --git a/server-mysql/ubuntu/docker-entrypoint.sh b/server-mysql/ubuntu/docker-entrypoint.sh
index 04e6f43a8..26e565718 100755
--- a/server-mysql/ubuntu/docker-entrypoint.sh
+++ b/server-mysql/ubuntu/docker-entrypoint.sh
@@ -907,7 +907,7 @@ prepare_zbx_agent_config() {
         update_config_var $ZBX_AGENT_CONFIG "Server"
     fi
 
-    update_config_var $ZBX_AGENT_CONFIG "ListenPort"
+    update_config_var $ZBX_AGENT_CONFIG "ListenPort" "${ZBX_LISTENPORT}"
     update_config_var $ZBX_AGENT_CONFIG "ListenIP" "${ZBX_LISTENIP}"
     update_config_var $ZBX_AGENT_CONFIG "StartAgents" "${ZBX_STARTAGENTS}"
 
diff --git a/server-pgsql/alpine/docker-entrypoint.sh b/server-pgsql/alpine/docker-entrypoint.sh
index 04e6f43a8..26e565718 100755
--- a/server-pgsql/alpine/docker-entrypoint.sh
+++ b/server-pgsql/alpine/docker-entrypoint.sh
@@ -907,7 +907,7 @@ prepare_zbx_agent_config() {
         update_config_var $ZBX_AGENT_CONFIG "Server"
     fi
 
-    update_config_var $ZBX_AGENT_CONFIG "ListenPort"
+    update_config_var $ZBX_AGENT_CONFIG "ListenPort" "${ZBX_LISTENPORT}"
     update_config_var $ZBX_AGENT_CONFIG "ListenIP" "${ZBX_LISTENIP}"
     update_config_var $ZBX_AGENT_CONFIG "StartAgents" "${ZBX_STARTAGENTS}"
 
diff --git a/server-pgsql/centos/docker-entrypoint.sh b/server-pgsql/centos/docker-entrypoint.sh
index 04e6f43a8..26e565718 100755
--- a/server-pgsql/centos/docker-entrypoint.sh
+++ b/server-pgsql/centos/docker-entrypoint.sh
@@ -907,7 +907,7 @@ prepare_zbx_agent_config() {
         update_config_var $ZBX_AGENT_CONFIG "Server"
     fi
 
-    update_config_var $ZBX_AGENT_CONFIG "ListenPort"
+    update_config_var $ZBX_AGENT_CONFIG "ListenPort" "${ZBX_LISTENPORT}"
     update_config_var $ZBX_AGENT_CONFIG "ListenIP" "${ZBX_LISTENIP}"
     update_config_var $ZBX_AGENT_CONFIG "StartAgents" "${ZBX_STARTAGENTS}"
 
diff --git a/server-pgsql/ubuntu/docker-entrypoint.sh b/server-pgsql/ubuntu/docker-entrypoint.sh
index 04e6f43a8..26e565718 100755
--- a/server-pgsql/ubuntu/docker-entrypoint.sh
+++ b/server-pgsql/ubuntu/docker-entrypoint.sh
@@ -907,7 +907,7 @@ prepare_zbx_agent_config() {
         update_config_var $ZBX_AGENT_CONFIG "Server"
     fi
 
-    update_config_var $ZBX_AGENT_CONFIG "ListenPort"
+    update_config_var $ZBX_AGENT_CONFIG "ListenPort" "${ZBX_LISTENPORT}"
     update_config_var $ZBX_AGENT_CONFIG "ListenIP" "${ZBX_LISTENIP}"
     update_config_var $ZBX_AGENT_CONFIG "StartAgents" "${ZBX_STARTAGENTS}"
 
diff --git a/web-apache-mysql/alpine/docker-entrypoint.sh b/web-apache-mysql/alpine/docker-entrypoint.sh
index 04e6f43a8..26e565718 100755
--- a/web-apache-mysql/alpine/docker-entrypoint.sh
+++ b/web-apache-mysql/alpine/docker-entrypoint.sh
@@ -907,7 +907,7 @@ prepare_zbx_agent_config() {
         update_config_var $ZBX_AGENT_CONFIG "Server"
     fi
 
-    update_config_var $ZBX_AGENT_CONFIG "ListenPort"
+    update_config_var $ZBX_AGENT_CONFIG "ListenPort" "${ZBX_LISTENPORT}"
     update_config_var $ZBX_AGENT_CONFIG "ListenIP" "${ZBX_LISTENIP}"
     update_config_var $ZBX_AGENT_CONFIG "StartAgents" "${ZBX_STARTAGENTS}"
 
diff --git a/web-apache-mysql/centos/docker-entrypoint.sh b/web-apache-mysql/centos/docker-entrypoint.sh
index 04e6f43a8..26e565718 100755
--- a/web-apache-mysql/centos/docker-entrypoint.sh
+++ b/web-apache-mysql/centos/docker-entrypoint.sh
@@ -907,7 +907,7 @@ prepare_zbx_agent_config() {
         update_config_var $ZBX_AGENT_CONFIG "Server"
     fi
 
-    update_config_var $ZBX_AGENT_CONFIG "ListenPort"
+    update_config_var $ZBX_AGENT_CONFIG "ListenPort" "${ZBX_LISTENPORT}"
     update_config_var $ZBX_AGENT_CONFIG "ListenIP" "${ZBX_LISTENIP}"
     update_config_var $ZBX_AGENT_CONFIG "StartAgents" "${ZBX_STARTAGENTS}"
 
diff --git a/web-apache-mysql/ubuntu/docker-entrypoint.sh b/web-apache-mysql/ubuntu/docker-entrypoint.sh
index 04e6f43a8..26e565718 100755
--- a/web-apache-mysql/ubuntu/docker-entrypoint.sh
+++ b/web-apache-mysql/ubuntu/docker-entrypoint.sh
@@ -907,7 +907,7 @@ prepare_zbx_agent_config() {
         update_config_var $ZBX_AGENT_CONFIG "Server"
     fi
 
-    update_config_var $ZBX_AGENT_CONFIG "ListenPort"
+    update_config_var $ZBX_AGENT_CONFIG "ListenPort" "${ZBX_LISTENPORT}"
     update_config_var $ZBX_AGENT_CONFIG "ListenIP" "${ZBX_LISTENIP}"
     update_config_var $ZBX_AGENT_CONFIG "StartAgents" "${ZBX_STARTAGENTS}"
 
diff --git a/web-apache-pgsql/alpine/docker-entrypoint.sh b/web-apache-pgsql/alpine/docker-entrypoint.sh
index 04e6f43a8..26e565718 100755
--- a/web-apache-pgsql/alpine/docker-entrypoint.sh
+++ b/web-apache-pgsql/alpine/docker-entrypoint.sh
@@ -907,7 +907,7 @@ prepare_zbx_agent_config() {
         update_config_var $ZBX_AGENT_CONFIG "Server"
     fi
 
-    update_config_var $ZBX_AGENT_CONFIG "ListenPort"
+    update_config_var $ZBX_AGENT_CONFIG "ListenPort" "${ZBX_LISTENPORT}"
     update_config_var $ZBX_AGENT_CONFIG "ListenIP" "${ZBX_LISTENIP}"
     update_config_var $ZBX_AGENT_CONFIG "StartAgents" "${ZBX_STARTAGENTS}"
 
diff --git a/web-apache-pgsql/centos/docker-entrypoint.sh b/web-apache-pgsql/centos/docker-entrypoint.sh
index 04e6f43a8..26e565718 100755
--- a/web-apache-pgsql/centos/docker-entrypoint.sh
+++ b/web-apache-pgsql/centos/docker-entrypoint.sh
@@ -907,7 +907,7 @@ prepare_zbx_agent_config() {
         update_config_var $ZBX_AGENT_CONFIG "Server"
     fi
 
-    update_config_var $ZBX_AGENT_CONFIG "ListenPort"
+    update_config_var $ZBX_AGENT_CONFIG "ListenPort" "${ZBX_LISTENPORT}"
     update_config_var $ZBX_AGENT_CONFIG "ListenIP" "${ZBX_LISTENIP}"
     update_config_var $ZBX_AGENT_CONFIG "StartAgents" "${ZBX_STARTAGENTS}"
 
diff --git a/web-apache-pgsql/ubuntu/docker-entrypoint.sh b/web-apache-pgsql/ubuntu/docker-entrypoint.sh
index 04e6f43a8..26e565718 100755
--- a/web-apache-pgsql/ubuntu/docker-entrypoint.sh
+++ b/web-apache-pgsql/ubuntu/docker-entrypoint.sh
@@ -907,7 +907,7 @@ prepare_zbx_agent_config() {
         update_config_var $ZBX_AGENT_CONFIG "Server"
     fi
 
-    update_config_var $ZBX_AGENT_CONFIG "ListenPort"
+    update_config_var $ZBX_AGENT_CONFIG "ListenPort" "${ZBX_LISTENPORT}"
     update_config_var $ZBX_AGENT_CONFIG "ListenIP" "${ZBX_LISTENIP}"
     update_config_var $ZBX_AGENT_CONFIG "StartAgents" "${ZBX_STARTAGENTS}"
 
diff --git a/web-nginx-mysql/alpine/docker-entrypoint.sh b/web-nginx-mysql/alpine/docker-entrypoint.sh
index 04e6f43a8..26e565718 100755
--- a/web-nginx-mysql/alpine/docker-entrypoint.sh
+++ b/web-nginx-mysql/alpine/docker-entrypoint.sh
@@ -907,7 +907,7 @@ prepare_zbx_agent_config() {
         update_config_var $ZBX_AGENT_CONFIG "Server"
     fi
 
-    update_config_var $ZBX_AGENT_CONFIG "ListenPort"
+    update_config_var $ZBX_AGENT_CONFIG "ListenPort" "${ZBX_LISTENPORT}"
     update_config_var $ZBX_AGENT_CONFIG "ListenIP" "${ZBX_LISTENIP}"
     update_config_var $ZBX_AGENT_CONFIG "StartAgents" "${ZBX_STARTAGENTS}"
 
diff --git a/web-nginx-mysql/centos/docker-entrypoint.sh b/web-nginx-mysql/centos/docker-entrypoint.sh
index 04e6f43a8..26e565718 100755
--- a/web-nginx-mysql/centos/docker-entrypoint.sh
+++ b/web-nginx-mysql/centos/docker-entrypoint.sh
@@ -907,7 +907,7 @@ prepare_zbx_agent_config() {
         update_config_var $ZBX_AGENT_CONFIG "Server"
     fi
 
-    update_config_var $ZBX_AGENT_CONFIG "ListenPort"
+    update_config_var $ZBX_AGENT_CONFIG "ListenPort" "${ZBX_LISTENPORT}"
     update_config_var $ZBX_AGENT_CONFIG "ListenIP" "${ZBX_LISTENIP}"
     update_config_var $ZBX_AGENT_CONFIG "StartAgents" "${ZBX_STARTAGENTS}"
 
diff --git a/web-nginx-mysql/ubuntu/docker-entrypoint.sh b/web-nginx-mysql/ubuntu/docker-entrypoint.sh
index 04e6f43a8..26e565718 100755
--- a/web-nginx-mysql/ubuntu/docker-entrypoint.sh
+++ b/web-nginx-mysql/ubuntu/docker-entrypoint.sh
@@ -907,7 +907,7 @@ prepare_zbx_agent_config() {
         update_config_var $ZBX_AGENT_CONFIG "Server"
     fi
 
-    update_config_var $ZBX_AGENT_CONFIG "ListenPort"
+    update_config_var $ZBX_AGENT_CONFIG "ListenPort" "${ZBX_LISTENPORT}"
     update_config_var $ZBX_AGENT_CONFIG "ListenIP" "${ZBX_LISTENIP}"
     update_config_var $ZBX_AGENT_CONFIG "StartAgents" "${ZBX_STARTAGENTS}"
 
diff --git a/web-nginx-pgsql/alpine/docker-entrypoint.sh b/web-nginx-pgsql/alpine/docker-entrypoint.sh
index 04e6f43a8..26e565718 100755
--- a/web-nginx-pgsql/alpine/docker-entrypoint.sh
+++ b/web-nginx-pgsql/alpine/docker-entrypoint.sh
@@ -907,7 +907,7 @@ prepare_zbx_agent_config() {
         update_config_var $ZBX_AGENT_CONFIG "Server"
     fi
 
-    update_config_var $ZBX_AGENT_CONFIG "ListenPort"
+    update_config_var $ZBX_AGENT_CONFIG "ListenPort" "${ZBX_LISTENPORT}"
     update_config_var $ZBX_AGENT_CONFIG "ListenIP" "${ZBX_LISTENIP}"
     update_config_var $ZBX_AGENT_CONFIG "StartAgents" "${ZBX_STARTAGENTS}"
 
diff --git a/web-nginx-pgsql/centos/docker-entrypoint.sh b/web-nginx-pgsql/centos/docker-entrypoint.sh
index 04e6f43a8..26e565718 100755
--- a/web-nginx-pgsql/centos/docker-entrypoint.sh
+++ b/web-nginx-pgsql/centos/docker-entrypoint.sh
@@ -907,7 +907,7 @@ prepare_zbx_agent_config() {
         update_config_var $ZBX_AGENT_CONFIG "Server"
     fi
 
-    update_config_var $ZBX_AGENT_CONFIG "ListenPort"
+    update_config_var $ZBX_AGENT_CONFIG "ListenPort" "${ZBX_LISTENPORT}"
     update_config_var $ZBX_AGENT_CONFIG "ListenIP" "${ZBX_LISTENIP}"
     update_config_var $ZBX_AGENT_CONFIG "StartAgents" "${ZBX_STARTAGENTS}"
 
diff --git a/web-nginx-pgsql/ubuntu/docker-entrypoint.sh b/web-nginx-pgsql/ubuntu/docker-entrypoint.sh
index 04e6f43a8..26e565718 100755
--- a/web-nginx-pgsql/ubuntu/docker-entrypoint.sh
+++ b/web-nginx-pgsql/ubuntu/docker-entrypoint.sh
@@ -907,7 +907,7 @@ prepare_zbx_agent_config() {
         update_config_var $ZBX_AGENT_CONFIG "Server"
     fi
 
-    update_config_var $ZBX_AGENT_CONFIG "ListenPort"
+    update_config_var $ZBX_AGENT_CONFIG "ListenPort" "${ZBX_LISTENPORT}"
     update_config_var $ZBX_AGENT_CONFIG "ListenIP" "${ZBX_LISTENIP}"
     update_config_var $ZBX_AGENT_CONFIG "StartAgents" "${ZBX_STARTAGENTS}"
 
diff --git a/zabbix-appliance/alpine/docker-entrypoint.sh b/zabbix-appliance/alpine/docker-entrypoint.sh
index 04e6f43a8..26e565718 100755
--- a/zabbix-appliance/alpine/docker-entrypoint.sh
+++ b/zabbix-appliance/alpine/docker-entrypoint.sh
@@ -907,7 +907,7 @@ prepare_zbx_agent_config() {
         update_config_var $ZBX_AGENT_CONFIG "Server"
     fi
 
-    update_config_var $ZBX_AGENT_CONFIG "ListenPort"
+    update_config_var $ZBX_AGENT_CONFIG "ListenPort" "${ZBX_LISTENPORT}"
     update_config_var $ZBX_AGENT_CONFIG "ListenIP" "${ZBX_LISTENIP}"
     update_config_var $ZBX_AGENT_CONFIG "StartAgents" "${ZBX_STARTAGENTS}"
 
diff --git a/zabbix-appliance/centos/docker-entrypoint.sh b/zabbix-appliance/centos/docker-entrypoint.sh
index 04e6f43a8..26e565718 100755
--- a/zabbix-appliance/centos/docker-entrypoint.sh
+++ b/zabbix-appliance/centos/docker-entrypoint.sh
@@ -907,7 +907,7 @@ prepare_zbx_agent_config() {
         update_config_var $ZBX_AGENT_CONFIG "Server"
     fi
 
-    update_config_var $ZBX_AGENT_CONFIG "ListenPort"
+    update_config_var $ZBX_AGENT_CONFIG "ListenPort" "${ZBX_LISTENPORT}"
     update_config_var $ZBX_AGENT_CONFIG "ListenIP" "${ZBX_LISTENIP}"
     update_config_var $ZBX_AGENT_CONFIG "StartAgents" "${ZBX_STARTAGENTS}"
 
diff --git a/zabbix-appliance/rhel/docker-entrypoint.sh b/zabbix-appliance/rhel/docker-entrypoint.sh
index 04e6f43a8..26e565718 100755
--- a/zabbix-appliance/rhel/docker-entrypoint.sh
+++ b/zabbix-appliance/rhel/docker-entrypoint.sh
@@ -907,7 +907,7 @@ prepare_zbx_agent_config() {
         update_config_var $ZBX_AGENT_CONFIG "Server"
     fi
 
-    update_config_var $ZBX_AGENT_CONFIG "ListenPort"
+    update_config_var $ZBX_AGENT_CONFIG "ListenPort" "${ZBX_LISTENPORT}"
     update_config_var $ZBX_AGENT_CONFIG "ListenIP" "${ZBX_LISTENIP}"
     update_config_var $ZBX_AGENT_CONFIG "StartAgents" "${ZBX_STARTAGENTS}"
 
diff --git a/zabbix-appliance/ubuntu/docker-entrypoint.sh b/zabbix-appliance/ubuntu/docker-entrypoint.sh
index 04e6f43a8..26e565718 100755
--- a/zabbix-appliance/ubuntu/docker-entrypoint.sh
+++ b/zabbix-appliance/ubuntu/docker-entrypoint.sh
@@ -907,7 +907,7 @@ prepare_zbx_agent_config() {
         update_config_var $ZBX_AGENT_CONFIG "Server"
     fi
 
-    update_config_var $ZBX_AGENT_CONFIG "ListenPort"
+    update_config_var $ZBX_AGENT_CONFIG "ListenPort" "${ZBX_LISTENPORT}"
     update_config_var $ZBX_AGENT_CONFIG "ListenIP" "${ZBX_LISTENIP}"
     update_config_var $ZBX_AGENT_CONFIG "StartAgents" "${ZBX_STARTAGENTS}"