From dbbb8e76ab25a21f5e214dbad4cdb53d46e92420 Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Mon, 14 Oct 2024 23:16:34 +0200 Subject: [PATCH] :sparkles: Allow override java opts for build scripts --- exporter/scripts/build | 2 +- manage.sh | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/exporter/scripts/build b/exporter/scripts/build index 004460584..7ad0aecf5 100755 --- a/exporter/scripts/build +++ b/exporter/scripts/build @@ -10,7 +10,7 @@ rm -rf target export NODE_ENV=production; # Build the application -clojure -J-Xms100M -J-Xmx1000M -J-XX:+UseSerialGC -M:dev:shadow-cljs release main; +clojure -M:dev:shadow-cljs release main; # Remove source rm -rf target/app; diff --git a/manage.sh b/manage.sh index aa1580d48..942aec241 100755 --- a/manage.sh +++ b/manage.sh @@ -7,6 +7,9 @@ export DEVENV_PNAME="penpotdev"; export CURRENT_USER_ID=$(id -u); export CURRENT_BRANCH=$(git rev-parse --abbrev-ref HEAD); +# Set default java options +export JAVA_OPTS=${JAVA_OPTS:-"-Xmx1000m -Xms50m"}; + set -e function print-current-version { @@ -95,10 +98,12 @@ function run-devenv-shell { if [[ ! $(docker ps -f "name=penpot-devenv-main" -q) ]]; then start-devenv fi - docker exec -ti penpot-devenv-main sudo -EH -u penpot bash + docker exec -ti \ + -e JAVA_OPTS="$JAVA_OPTS" \ + -e EXTERNAL_UID=$CURRENT_USER_ID \ + penpot-devenv-main sudo -EH -u penpot bash; } - function build { echo ">> build start: $1" local version=$(print-current-version); @@ -111,6 +116,7 @@ function build { -e EXTERNAL_UID=$CURRENT_USER_ID \ -e BUILD_STORYBOOK=$BUILD_STORYBOOK \ -e SHADOWCLJS_EXTRA_PARAMS=$SHADOWCLJS_EXTRA_PARAMS \ + -e JAVA_OPTS="$JAVA_OPTS" \ -w /home/penpot/penpot/$1 \ $DEVENV_IMGNAME:latest sudo -EH -u penpot ./scripts/build $version