From 19ec605772574877843f74b5221ea09b8cb45532 Mon Sep 17 00:00:00 2001 From: sarayourfriend <24264157+sarayourfriend@users.noreply.github.com> Date: Fri, 14 Apr 2023 15:27:13 +1000 Subject: [PATCH] Add default overrides and unambiguous way of disabling them --- docker-compose.overrides.yml | 4 ++++ justfile | 4 ++++ 2 files changed, 8 insertions(+) create mode 100644 docker-compose.overrides.yml diff --git a/docker-compose.overrides.yml b/docker-compose.overrides.yml new file mode 100644 index 00000000000..ceabac165d6 --- /dev/null +++ b/docker-compose.overrides.yml @@ -0,0 +1,4 @@ +services: + es: + # Memory limit for ES, as it tends to be a memory hoarder + mem_limit: 4294967296 diff --git a/justfile b/justfile index 9bb87d65b71..666ecec13c8 100644 --- a/justfile +++ b/justfile @@ -7,6 +7,7 @@ set dotenv-load := false IS_PROD := env_var_or_default("PROD", "") IS_CI := env_var_or_default("CI", "") DC_USER := env_var_or_default("DC_USER", "opener") +ENABLE_DC_OVERRIDES := env_var_or_default("OPENVERSE_ENABLE_DC_OVERRIDES", "true") # Show all available recipes, also recurses inside nested justfiles @_default: @@ -103,6 +104,9 @@ env: DOCKER_FILE := "-f " + ( if IS_PROD == "true" { "ingestion_server/docker-compose.yml" } else { "docker-compose.yml" } +) + ( + if ENABLE_DC_OVERRIDES == "true" { " -f docker-compose.overrides.yml" } + else { "" } ) # Run `docker-compose` configured with the correct files and environment