From ec3c5876de0407f3e5c017350fb92a7b28b9250f Mon Sep 17 00:00:00 2001 From: Greg Miller Date: Tue, 21 Jan 2025 17:55:33 +0100 Subject: [PATCH 1/2] dbeaver/dbeaver-devops#1630 Added cp from root dir to dbeaver home --- deploy/scripts/launch-product.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/deploy/scripts/launch-product.sh b/deploy/scripts/launch-product.sh index b890ba00e9..3b9645d844 100644 --- a/deploy/scripts/launch-product.sh +++ b/deploy/scripts/launch-product.sh @@ -11,6 +11,8 @@ if [ "$(id -u)" -eq 0 ]; then TARGET_UID=${TARGET_UID:-$DBEAVER_UID} TARGET_GID=${TARGET_GID:-$DBEAVER_GID} + cp -r /root/.* /root/* /home/dbeaver/ + chown -R $DBEAVER_UID:$DBEAVER_GID /home/dbeaver/ chown -R $DBEAVER_UID:$DBEAVER_GID $PWD # Execute run-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-server.sh" From 7d0997fdf7c260a0c7d39adafe6882cd3cce9c9f Mon Sep 17 00:00:00 2001 From: Greg Miller Date: Tue, 21 Jan 2025 18:27:04 +0100 Subject: [PATCH 2/2] dbeaver/dbeaver-devops#1630 Hide error in cp --- deploy/scripts/launch-product.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/scripts/launch-product.sh b/deploy/scripts/launch-product.sh index 3b9645d844..5571e7ae19 100644 --- a/deploy/scripts/launch-product.sh +++ b/deploy/scripts/launch-product.sh @@ -11,7 +11,7 @@ if [ "$(id -u)" -eq 0 ]; then TARGET_UID=${TARGET_UID:-$DBEAVER_UID} TARGET_GID=${TARGET_GID:-$DBEAVER_GID} - cp -r /root/.* /root/* /home/dbeaver/ + cp -r /root/.* /root/* /home/dbeaver/ 2>/dev/null || true chown -R $DBEAVER_UID:$DBEAVER_GID /home/dbeaver/ chown -R $DBEAVER_UID:$DBEAVER_GID $PWD # Execute run-server.sh as the dbeaver user with the JAVA_HOME and PATH environment variables