From 2cec2e61bcc18ef0b78db4572a282505d129d2b9 Mon Sep 17 00:00:00 2001 From: lexluo09 <39718951+lexluo09@users.noreply.github.com> Date: Wed, 17 Jul 2024 22:52:02 +0800 Subject: [PATCH] (improvement)(build) Reduce startup memory and add privileged in docker-compose (#1419) --- assembly/bin/supersonic-daemon.bat | 2 +- assembly/bin/supersonic-daemon.sh | 2 +- docker/docker-compose.yml | 4 ++++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/assembly/bin/supersonic-daemon.bat b/assembly/bin/supersonic-daemon.bat index 7b1c6bd59..988d568f1 100644 --- a/assembly/bin/supersonic-daemon.bat +++ b/assembly/bin/supersonic-daemon.bat @@ -54,7 +54,7 @@ if "%command%"=="restart" ( set "webDir=%baseDir%\webapp" set "logDir=%baseDir%\logs" set "classpath=%baseDir%;%webDir%;%libDir%\*;%confDir%" - set "java-command=-Dfile.encoding=UTF-8 -Duser.language=Zh -Duser.region=CN -Duser.timezone=GMT+08 -Dspring.profiles.active=%profile% -Xms1024m -Xmx2048m -cp %CLASSPATH% %MAIN_CLASS%" + set "java-command=-Dfile.encoding=UTF-8 -Duser.language=Zh -Duser.region=CN -Duser.timezone=GMT+08 -Dspring.profiles.active=%profile% -Xms1024m -Xmx1024m -cp %CLASSPATH% %MAIN_CLASS%" if not exist %logDir% mkdir %logDir% start /B java %java-command% >nul 2>&1 timeout /t 10 >nul diff --git a/assembly/bin/supersonic-daemon.sh b/assembly/bin/supersonic-daemon.sh index 116e43713..4fc711b16 100755 --- a/assembly/bin/supersonic-daemon.sh +++ b/assembly/bin/supersonic-daemon.sh @@ -59,7 +59,7 @@ function runJavaService { JAVA_HOME=$(ls /usr/jdk64/jdk* -d 2>/dev/null | xargs | awk '{print "'$local_app_name'"}') fi export PATH=$JAVA_HOME/bin:$PATH - command="-Dfile.encoding=UTF-8 -Duser.language=Zh -Duser.region=CN -Duser.timezone=GMT+08 -Dapp_name=${local_app_name} -Xms1024m -Xmx2048m $main_class" + command="-Dfile.encoding=UTF-8 -Duser.language=Zh -Duser.region=CN -Duser.timezone=GMT+08 -Dapp_name=${local_app_name} -Xms1024m -Xmx1024m $main_class" mkdir -p $javaRunDir/logs java -Dspring.profiles.active="$profile" $command >/dev/null 2>$javaRunDir/logs/error.log & diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 84302870d..7b168da72 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -2,6 +2,7 @@ services: chroma: image: chromadb/chroma:0.5.3 platform: linux/amd64 + privileged: true container_name: supersonic_chroma ports: - "8000:8000" @@ -21,6 +22,7 @@ services: mysql: image: mysql:8.0 + privileged: true platform: linux/amd64 container_name: supersonic_mysql environment: @@ -50,6 +52,7 @@ services: db_init: image: supersonicbi/supersonic:${SUPERSONIC_VERSION:-latest} + privileged: true platform: linux/amd64 container_name: supersonic_db_init depends_on: @@ -74,6 +77,7 @@ services: supersonic_standalone: image: supersonicbi/supersonic:${SUPERSONIC_VERSION:-latest} + privileged: true platform: linux/amd64 container_name: supersonic_standalone environment: