From 7616584e2bd2d0035b29b0bfc2a4b1f326451d5b Mon Sep 17 00:00:00 2001
From: Alexey Pustovalov <alexey.pustovalov@zabbix.com>
Date: Thu, 29 Dec 2022 23:56:38 +0900
Subject: [PATCH] Add option for execute only DB scripts on proxy and server

---
 .../proxy-mysql/alpine/docker-entrypoint.sh     | 17 +++++++++++++----
 .../proxy-mysql/centos/docker-entrypoint.sh     | 17 +++++++++++++----
 Dockerfiles/proxy-mysql/ol/docker-entrypoint.sh | 17 +++++++++++++----
 .../proxy-mysql/rhel/docker-entrypoint.sh       | 17 +++++++++++++----
 .../proxy-mysql/ubuntu/docker-entrypoint.sh     | 17 +++++++++++++----
 .../server-mysql/alpine/docker-entrypoint.sh    | 17 +++++++++++++----
 .../server-mysql/centos/docker-entrypoint.sh    | 17 +++++++++++++----
 .../server-mysql/ol/docker-entrypoint.sh        | 17 +++++++++++++----
 .../server-mysql/rhel/docker-entrypoint.sh      | 17 +++++++++++++----
 .../server-mysql/ubuntu/docker-entrypoint.sh    | 17 +++++++++++++----
 .../server-pgsql/alpine/docker-entrypoint.sh    | 15 ++++++++++++---
 .../server-pgsql/centos/docker-entrypoint.sh    | 15 ++++++++++++---
 .../server-pgsql/ol/docker-entrypoint.sh        | 15 ++++++++++++---
 .../server-pgsql/ubuntu/docker-entrypoint.sh    | 15 ++++++++++++---
 14 files changed, 178 insertions(+), 52 deletions(-)

diff --git a/Dockerfiles/proxy-mysql/alpine/docker-entrypoint.sh b/Dockerfiles/proxy-mysql/alpine/docker-entrypoint.sh
index 973912dfe..290da63d2 100755
--- a/Dockerfiles/proxy-mysql/alpine/docker-entrypoint.sh
+++ b/Dockerfiles/proxy-mysql/alpine/docker-entrypoint.sh
@@ -478,15 +478,20 @@ update_zbx_config() {
     fi
 }
 
-prepare_proxy() {
-    echo "Preparing Zabbix proxy"
+prepare_db() {
+    echo "** Preparing database"
 
     check_variables_mysql
     check_db_connect_mysql
     create_db_user_mysql
     create_db_database_mysql
     create_db_schema_mysql
+}
 
+prepare_proxy() {
+    echo "** Preparing Zabbix proxy"
+
+    prepare_db
     update_zbx_config
 }
 
@@ -494,12 +499,16 @@ prepare_proxy() {
 
 if [ "${1#-}" != "$1" ]; then
     set -- /usr/sbin/zabbix_proxy "$@"
-    fi
+fi
 
 if [ "$1" == '/usr/sbin/zabbix_proxy' ]; then
     prepare_proxy
 fi
 
-exec "$@"
+if [ "$1" == "init_db_only" ]; then
+    prepare_db
+else
+    exec "$@"
+fi
 
 #################################################
diff --git a/Dockerfiles/proxy-mysql/centos/docker-entrypoint.sh b/Dockerfiles/proxy-mysql/centos/docker-entrypoint.sh
index d2c3f0ce8..4a699cf64 100755
--- a/Dockerfiles/proxy-mysql/centos/docker-entrypoint.sh
+++ b/Dockerfiles/proxy-mysql/centos/docker-entrypoint.sh
@@ -475,15 +475,20 @@ update_zbx_config() {
     fi
 }
 
-prepare_proxy() {
-    echo "Preparing Zabbix proxy"
+prepare_db() {
+    echo "** Preparing database"
 
     check_variables_mysql
     check_db_connect_mysql
     create_db_user_mysql
     create_db_database_mysql
     create_db_schema_mysql
+}
 
+prepare_proxy() {
+    echo "** Preparing Zabbix proxy"
+
+    prepare_db
     update_zbx_config
 }
 
@@ -491,12 +496,16 @@ prepare_proxy() {
 
 if [ "${1#-}" != "$1" ]; then
     set -- /usr/sbin/zabbix_proxy "$@"
-    fi
+fi
 
 if [ "$1" == '/usr/sbin/zabbix_proxy' ]; then
     prepare_proxy
 fi
 
-exec "$@"
+if [ "$1" == "init_db_only" ]; then
+    prepare_db
+else
+    exec "$@"
+fi
 
 #################################################
diff --git a/Dockerfiles/proxy-mysql/ol/docker-entrypoint.sh b/Dockerfiles/proxy-mysql/ol/docker-entrypoint.sh
index d2c3f0ce8..4a699cf64 100755
--- a/Dockerfiles/proxy-mysql/ol/docker-entrypoint.sh
+++ b/Dockerfiles/proxy-mysql/ol/docker-entrypoint.sh
@@ -475,15 +475,20 @@ update_zbx_config() {
     fi
 }
 
-prepare_proxy() {
-    echo "Preparing Zabbix proxy"
+prepare_db() {
+    echo "** Preparing database"
 
     check_variables_mysql
     check_db_connect_mysql
     create_db_user_mysql
     create_db_database_mysql
     create_db_schema_mysql
+}
 
+prepare_proxy() {
+    echo "** Preparing Zabbix proxy"
+
+    prepare_db
     update_zbx_config
 }
 
@@ -491,12 +496,16 @@ prepare_proxy() {
 
 if [ "${1#-}" != "$1" ]; then
     set -- /usr/sbin/zabbix_proxy "$@"
-    fi
+fi
 
 if [ "$1" == '/usr/sbin/zabbix_proxy' ]; then
     prepare_proxy
 fi
 
-exec "$@"
+if [ "$1" == "init_db_only" ]; then
+    prepare_db
+else
+    exec "$@"
+fi
 
 #################################################
diff --git a/Dockerfiles/proxy-mysql/rhel/docker-entrypoint.sh b/Dockerfiles/proxy-mysql/rhel/docker-entrypoint.sh
index d2c3f0ce8..4a699cf64 100755
--- a/Dockerfiles/proxy-mysql/rhel/docker-entrypoint.sh
+++ b/Dockerfiles/proxy-mysql/rhel/docker-entrypoint.sh
@@ -475,15 +475,20 @@ update_zbx_config() {
     fi
 }
 
-prepare_proxy() {
-    echo "Preparing Zabbix proxy"
+prepare_db() {
+    echo "** Preparing database"
 
     check_variables_mysql
     check_db_connect_mysql
     create_db_user_mysql
     create_db_database_mysql
     create_db_schema_mysql
+}
 
+prepare_proxy() {
+    echo "** Preparing Zabbix proxy"
+
+    prepare_db
     update_zbx_config
 }
 
@@ -491,12 +496,16 @@ prepare_proxy() {
 
 if [ "${1#-}" != "$1" ]; then
     set -- /usr/sbin/zabbix_proxy "$@"
-    fi
+fi
 
 if [ "$1" == '/usr/sbin/zabbix_proxy' ]; then
     prepare_proxy
 fi
 
-exec "$@"
+if [ "$1" == "init_db_only" ]; then
+    prepare_db
+else
+    exec "$@"
+fi
 
 #################################################
diff --git a/Dockerfiles/proxy-mysql/ubuntu/docker-entrypoint.sh b/Dockerfiles/proxy-mysql/ubuntu/docker-entrypoint.sh
index 642b800b8..4314c91fb 100755
--- a/Dockerfiles/proxy-mysql/ubuntu/docker-entrypoint.sh
+++ b/Dockerfiles/proxy-mysql/ubuntu/docker-entrypoint.sh
@@ -475,15 +475,20 @@ update_zbx_config() {
     fi
 }
 
-prepare_proxy() {
-    echo "Preparing Zabbix proxy"
+prepare_db() {
+    echo "** Preparing database"
 
     check_variables_mysql
     check_db_connect_mysql
     create_db_user_mysql
     create_db_database_mysql
     create_db_schema_mysql
+}
 
+prepare_proxy() {
+    echo "** Preparing Zabbix proxy"
+
+    prepare_db
     update_zbx_config
 }
 
@@ -491,12 +496,16 @@ prepare_proxy() {
 
 if [ "${1#-}" != "$1" ]; then
     set -- /usr/sbin/zabbix_proxy "$@"
-    fi
+fi
 
 if [ "$1" == '/usr/sbin/zabbix_proxy' ]; then
     prepare_proxy
 fi
 
-exec "$@"
+if [ "$1" == "init_db_only" ]; then
+    prepare_db
+else
+    exec "$@"
+fi
 
 #################################################
diff --git a/Dockerfiles/server-mysql/alpine/docker-entrypoint.sh b/Dockerfiles/server-mysql/alpine/docker-entrypoint.sh
index 300909efc..6e8002d59 100755
--- a/Dockerfiles/server-mysql/alpine/docker-entrypoint.sh
+++ b/Dockerfiles/server-mysql/alpine/docker-entrypoint.sh
@@ -519,15 +519,20 @@ update_zbx_config() {
     fi
 }
 
-prepare_server() {
-    echo "** Preparing Zabbix server"
+prepare_db() {
+    echo "** Preparing database"
 
     check_variables_mysql
     check_db_connect_mysql
     create_db_user_mysql
     create_db_database_mysql
     create_db_schema_mysql
+}
 
+prepare_server() {
+    echo "** Preparing Zabbix server"
+
+    prepare_db
     update_zbx_config
 }
 
@@ -535,12 +540,16 @@ prepare_server() {
 
 if [ "${1#-}" != "$1" ]; then
     set -- /usr/sbin/zabbix_server "$@"
-    fi
+fi
 
 if [ "$1" == '/usr/sbin/zabbix_server' ]; then
     prepare_server
 fi
 
-exec "$@"
+if [ "$1" == "init_db_only" ]; then
+    prepare_db
+else
+    exec "$@"
+fi
 
 #################################################
diff --git a/Dockerfiles/server-mysql/centos/docker-entrypoint.sh b/Dockerfiles/server-mysql/centos/docker-entrypoint.sh
index 19707e580..2d8d01fdb 100755
--- a/Dockerfiles/server-mysql/centos/docker-entrypoint.sh
+++ b/Dockerfiles/server-mysql/centos/docker-entrypoint.sh
@@ -516,15 +516,20 @@ update_zbx_config() {
     fi
 }
 
-prepare_server() {
-    echo "** Preparing Zabbix server"
+prepare_db() {
+    echo "** Preparing database"
 
     check_variables_mysql
     check_db_connect_mysql
     create_db_user_mysql
     create_db_database_mysql
     create_db_schema_mysql
+}
 
+prepare_server() {
+    echo "** Preparing Zabbix server"
+
+    prepare_db
     update_zbx_config
 }
 
@@ -532,12 +537,16 @@ prepare_server() {
 
 if [ "${1#-}" != "$1" ]; then
     set -- /usr/sbin/zabbix_server "$@"
-    fi
+fi
 
 if [ "$1" == '/usr/sbin/zabbix_server' ]; then
     prepare_server
 fi
 
-exec "$@"
+if [ "$1" == "init_db_only" ]; then
+    prepare_db
+else
+    exec "$@"
+fi
 
 #################################################
diff --git a/Dockerfiles/server-mysql/ol/docker-entrypoint.sh b/Dockerfiles/server-mysql/ol/docker-entrypoint.sh
index 19707e580..2d8d01fdb 100755
--- a/Dockerfiles/server-mysql/ol/docker-entrypoint.sh
+++ b/Dockerfiles/server-mysql/ol/docker-entrypoint.sh
@@ -516,15 +516,20 @@ update_zbx_config() {
     fi
 }
 
-prepare_server() {
-    echo "** Preparing Zabbix server"
+prepare_db() {
+    echo "** Preparing database"
 
     check_variables_mysql
     check_db_connect_mysql
     create_db_user_mysql
     create_db_database_mysql
     create_db_schema_mysql
+}
 
+prepare_server() {
+    echo "** Preparing Zabbix server"
+
+    prepare_db
     update_zbx_config
 }
 
@@ -532,12 +537,16 @@ prepare_server() {
 
 if [ "${1#-}" != "$1" ]; then
     set -- /usr/sbin/zabbix_server "$@"
-    fi
+fi
 
 if [ "$1" == '/usr/sbin/zabbix_server' ]; then
     prepare_server
 fi
 
-exec "$@"
+if [ "$1" == "init_db_only" ]; then
+    prepare_db
+else
+    exec "$@"
+fi
 
 #################################################
diff --git a/Dockerfiles/server-mysql/rhel/docker-entrypoint.sh b/Dockerfiles/server-mysql/rhel/docker-entrypoint.sh
index 19707e580..2d8d01fdb 100755
--- a/Dockerfiles/server-mysql/rhel/docker-entrypoint.sh
+++ b/Dockerfiles/server-mysql/rhel/docker-entrypoint.sh
@@ -516,15 +516,20 @@ update_zbx_config() {
     fi
 }
 
-prepare_server() {
-    echo "** Preparing Zabbix server"
+prepare_db() {
+    echo "** Preparing database"
 
     check_variables_mysql
     check_db_connect_mysql
     create_db_user_mysql
     create_db_database_mysql
     create_db_schema_mysql
+}
 
+prepare_server() {
+    echo "** Preparing Zabbix server"
+
+    prepare_db
     update_zbx_config
 }
 
@@ -532,12 +537,16 @@ prepare_server() {
 
 if [ "${1#-}" != "$1" ]; then
     set -- /usr/sbin/zabbix_server "$@"
-    fi
+fi
 
 if [ "$1" == '/usr/sbin/zabbix_server' ]; then
     prepare_server
 fi
 
-exec "$@"
+if [ "$1" == "init_db_only" ]; then
+    prepare_db
+else
+    exec "$@"
+fi
 
 #################################################
diff --git a/Dockerfiles/server-mysql/ubuntu/docker-entrypoint.sh b/Dockerfiles/server-mysql/ubuntu/docker-entrypoint.sh
index 772a7e75d..ab2bd8d50 100755
--- a/Dockerfiles/server-mysql/ubuntu/docker-entrypoint.sh
+++ b/Dockerfiles/server-mysql/ubuntu/docker-entrypoint.sh
@@ -516,15 +516,20 @@ update_zbx_config() {
     fi
 }
 
-prepare_server() {
-    echo "** Preparing Zabbix server"
+prepare_db() {
+    echo "** Preparing database"
 
     check_variables_mysql
     check_db_connect_mysql
     create_db_user_mysql
     create_db_database_mysql
     create_db_schema_mysql
+}
 
+prepare_server() {
+    echo "** Preparing Zabbix server"
+
+    prepare_db
     update_zbx_config
 }
 
@@ -532,12 +537,16 @@ prepare_server() {
 
 if [ "${1#-}" != "$1" ]; then
     set -- /usr/sbin/zabbix_server "$@"
-    fi
+fi
 
 if [ "$1" == '/usr/sbin/zabbix_server' ]; then
     prepare_server
 fi
 
-exec "$@"
+if [ "$1" == "init_db_only" ]; then
+    prepare_db
+else
+    exec "$@"
+fi
 
 #################################################
diff --git a/Dockerfiles/server-pgsql/alpine/docker-entrypoint.sh b/Dockerfiles/server-pgsql/alpine/docker-entrypoint.sh
index 8fe65c29d..e5b50be9e 100755
--- a/Dockerfiles/server-pgsql/alpine/docker-entrypoint.sh
+++ b/Dockerfiles/server-pgsql/alpine/docker-entrypoint.sh
@@ -553,14 +553,19 @@ update_zbx_config() {
     fi
 }
 
-prepare_server() {
-    echo "** Preparing Zabbix server"
+prepare_db() {
+    echo "** Preparing database"
 
     check_variables_postgresql
     check_db_connect_postgresql
     create_db_database_postgresql
     create_db_schema_postgresql
+}
 
+prepare_server() {
+    echo "** Preparing Zabbix server"
+
+    prepare_db
     update_zbx_config
 }
 
@@ -574,6 +579,10 @@ if [ "$1" == '/usr/sbin/zabbix_server' ]; then
     prepare_server
 fi
 
-exec "$@"
+if [ "$1" == "init_db_only" ]; then
+    prepare_db
+else
+    exec "$@"
+fi
 
 #################################################
diff --git a/Dockerfiles/server-pgsql/centos/docker-entrypoint.sh b/Dockerfiles/server-pgsql/centos/docker-entrypoint.sh
index 8fe65c29d..e5b50be9e 100755
--- a/Dockerfiles/server-pgsql/centos/docker-entrypoint.sh
+++ b/Dockerfiles/server-pgsql/centos/docker-entrypoint.sh
@@ -553,14 +553,19 @@ update_zbx_config() {
     fi
 }
 
-prepare_server() {
-    echo "** Preparing Zabbix server"
+prepare_db() {
+    echo "** Preparing database"
 
     check_variables_postgresql
     check_db_connect_postgresql
     create_db_database_postgresql
     create_db_schema_postgresql
+}
 
+prepare_server() {
+    echo "** Preparing Zabbix server"
+
+    prepare_db
     update_zbx_config
 }
 
@@ -574,6 +579,10 @@ if [ "$1" == '/usr/sbin/zabbix_server' ]; then
     prepare_server
 fi
 
-exec "$@"
+if [ "$1" == "init_db_only" ]; then
+    prepare_db
+else
+    exec "$@"
+fi
 
 #################################################
diff --git a/Dockerfiles/server-pgsql/ol/docker-entrypoint.sh b/Dockerfiles/server-pgsql/ol/docker-entrypoint.sh
index 8fe65c29d..e5b50be9e 100755
--- a/Dockerfiles/server-pgsql/ol/docker-entrypoint.sh
+++ b/Dockerfiles/server-pgsql/ol/docker-entrypoint.sh
@@ -553,14 +553,19 @@ update_zbx_config() {
     fi
 }
 
-prepare_server() {
-    echo "** Preparing Zabbix server"
+prepare_db() {
+    echo "** Preparing database"
 
     check_variables_postgresql
     check_db_connect_postgresql
     create_db_database_postgresql
     create_db_schema_postgresql
+}
 
+prepare_server() {
+    echo "** Preparing Zabbix server"
+
+    prepare_db
     update_zbx_config
 }
 
@@ -574,6 +579,10 @@ if [ "$1" == '/usr/sbin/zabbix_server' ]; then
     prepare_server
 fi
 
-exec "$@"
+if [ "$1" == "init_db_only" ]; then
+    prepare_db
+else
+    exec "$@"
+fi
 
 #################################################
diff --git a/Dockerfiles/server-pgsql/ubuntu/docker-entrypoint.sh b/Dockerfiles/server-pgsql/ubuntu/docker-entrypoint.sh
index ecfcc9793..7ef2db469 100755
--- a/Dockerfiles/server-pgsql/ubuntu/docker-entrypoint.sh
+++ b/Dockerfiles/server-pgsql/ubuntu/docker-entrypoint.sh
@@ -553,14 +553,19 @@ update_zbx_config() {
     fi
 }
 
-prepare_server() {
-    echo "** Preparing Zabbix server"
+prepare_db() {
+    echo "** Preparing database"
 
     check_variables_postgresql
     check_db_connect_postgresql
     create_db_database_postgresql
     create_db_schema_postgresql
+}
 
+prepare_server() {
+    echo "** Preparing Zabbix server"
+
+    prepare_db
     update_zbx_config
 }
 
@@ -574,6 +579,10 @@ if [ "$1" == '/usr/sbin/zabbix_server' ]; then
     prepare_server
 fi
 
-exec "$@"
+if [ "$1" == "init_db_only" ]; then
+    prepare_db
+else
+    exec "$@"
+fi
 
 #################################################