diff --git a/docker-compose.opensearch.base.yml b/docker-compose.opensearch.base.yml index 947efbc783..503c0aebbf 100644 --- a/docker-compose.opensearch.base.yml +++ b/docker-compose.opensearch.base.yml @@ -4,7 +4,7 @@ services: environment: - "cluster.name=opensearch-cluster" - "bootstrap.memory_lock=true" # along with the memlock settings below, disables swapping - - "_JAVA_OPTIONS=-XX:UseSVE=0" # disables SVE (Scalable Vector Extension) for ARM64 + - "_JAVA_OPTIONS=${JAVA_OPTIONS:-}" # Load _JAVA_OPTIONS from env, fallback to empty string - "OPENSEARCH_JAVA_OPTS=-Xms1024m -Xmx1024m" # Set min and max JVM heap sizes to at least 50% of system RAM - "DISABLE_INSTALL_DEMO_CONFIG=true" # disables execution of install_demo_configuration.sh bundled with security plugin, which installs demo certificates and security configurations to OpenSearch - "DISABLE_SECURITY_PLUGIN=true" # disables security plugin entirely in OpenSearch by setting plugins.security.disabled: true in opensearch.yml diff --git a/env/backend.local.example.env b/env/backend.local.example.env index 4df2d8cff5..4cc276bd43 100644 --- a/env/backend.local.example.env +++ b/env/backend.local.example.env @@ -43,3 +43,7 @@ SOCIAL_AUTH_OL_OIDC_KEY=apisix # This is not a secret. This is for the Keycloak container, only for local use. SOCIAL_AUTH_OL_OIDC_SECRET=HckCZXToXfaetbBx0Fo3xbjnC468oMi4 # pragma: allowlist-secret USERINFO_URL=http://kc.ol.local:8066/realms/ol-local/protocol/openid-connect/userinfo + +# _JAVA_OPTIONS for Opensearch container are not consistent between different CPU architectures e.g ARM and x86. +# Here, anyone can set options like -XX:UseSVE=0 based on their CPU. +JAVA_OPTIONS=