From 897dd994baf43855b9e5ac9b42ff6c618fdd3b6b Mon Sep 17 00:00:00 2001
From: Malte <33528619+MalteHei@users.noreply.github.com>
Date: Thu, 9 Apr 2026 19:39:21 +0200
Subject: [PATCH] Pass arguments from entrypoint script (#4269)

* dbeaver/cloudbeaver#4268 fix order of arguments

This allows overriding the -web-config argument.

* dbeaver/cloudbeaver#4268 pass arguments to run-cloudbeaver-server.sh

---------

Co-authored-by: Daria Marutkina <125263541+dariamarutkina@users.noreply.github.com>
---
 deploy/scripts/launch-product.sh         | 6 +++---
 deploy/scripts/run-cloudbeaver-server.sh | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/deploy/scripts/launch-product.sh b/deploy/scripts/launch-product.sh
index 0a257ab874..96f7366158 100644
--- a/deploy/scripts/launch-product.sh
+++ b/deploy/scripts/launch-product.sh
@@ -13,7 +13,7 @@ if [ "$(id -u)" -eq 0 ]; then
 
     chown -R $DBEAVER_UID:$DBEAVER_GID $PWD/workspace
     # Execute run-cloudbeaver-server.sh as the dbeaver user with the JAVA_HOME and PATH environment variables
-    exec su "$TARGET_USER" -c "JAVA_HOME=$JAVA_HOME PATH=$PATH ./run-cloudbeaver-server.sh"
+    exec su "$TARGET_USER" -c "JAVA_HOME=$JAVA_HOME PATH=$PATH ./run-cloudbeaver-server.sh $*"
 else
-    exec ./run-cloudbeaver-server.sh
-fi
\ No newline at end of file
+    exec ./run-cloudbeaver-server.sh "$@"
+fi
diff --git a/deploy/scripts/run-cloudbeaver-server.sh b/deploy/scripts/run-cloudbeaver-server.sh
index 1db3dc26ca..918b84498e 100755
--- a/deploy/scripts/run-cloudbeaver-server.sh
+++ b/deploy/scripts/run-cloudbeaver-server.sh
@@ -35,7 +35,7 @@ exec java ${JAVA_OPTS} \
   --add-opens=java.sql/java.sql=ALL-UNNAMED \
   -jar ${launcherJar} \
   -product io.cloudbeaver.product.ce.product \
-  -web-config conf/cloudbeaver.conf \
   "$@" \
+  -web-config conf/cloudbeaver.conf \
   -nl en \
   -registryMultiLanguage