diff --git a/docker_compose/credit_tracker_config.env b/docker_compose/credit_tracker_config.env index e74c92a..eb46ca0 100644 --- a/docker_compose/credit_tracker_config.env +++ b/docker_compose/credit_tracker_config.env @@ -1,5 +1,6 @@ #commons APP_VERSION=2.0 +DB_VERSION=2.0 REGISTRY_URL=10.230.238.56:5000 JMX_MAIN_PORT=11001 JMX_MONITORING_PORT=11002 diff --git a/docker_compose/docker-compose.yml b/docker_compose/docker-compose.yml index 72e32b8..b7130ef 100644 --- a/docker_compose/docker-compose.yml +++ b/docker_compose/docker-compose.yml @@ -12,7 +12,10 @@ services: - "${HOST_PORT}:${SERVER_PORT}" environment: - APP_JAR=main + - XMX=4G + - XMS=1G - TZ=Europe/Moscow + - DB_VERSION=${DB_VERSION} - APM_SERVICE_NAME=${APM_SERVICE_NAME}-${APP_JAR} - APM_SERVER_URLS=${APM_SERVER_URLS} - APM_ENVIRONMENT=${APM_ENVIRONMENT} @@ -95,6 +98,9 @@ services: environment: - APP_JAR=monitoring - TZ=Europe/Moscow + - XMX=4G + - XMS=1G + - DB_VERSION=${DB_VERSION} - APM_SERVICE_NAME=${APM_SERVICE_NAME}-${APP_JAR} - APM_SERVER_URLS=${APM_SERVER_URLS} - APM_ENVIRONMENT=${APM_ENVIRONMENT} diff --git a/start-credit-tracker.sh b/start-credit-tracker.sh index 8fdf72b..5e19f28 100644 --- a/start-credit-tracker.sh +++ b/start-credit-tracker.sh @@ -3,11 +3,13 @@ export APP_JMX_PORT="${JMX_PORT:-11001}" export APP_JMX_HOSTNAME="${JMX_HOSTNAME:-localhost}" export APP_JAR_FILE="${APP_JAR}" +export XMX="${XMX}" +export XMS="${XMS}" echo "Запуск Credit Tracker" exec java \ - -Xmx8G \ - -Xms4G \ + -Xmx${XMX} \ + -Xms${XMS} \ -javaagent:/opt/app/elastic-apm-agent.jar \ -XX:+UseZGC \ -Delastic.apm.service_name="${APM_SERVICE_NAME}" \