diff --git a/base.yml b/base.yml index c3b71bb21..92c23eeb8 100644 --- a/base.yml +++ b/base.yml @@ -22,8 +22,6 @@ services: resources: limits: memory: 1g - cap_add: - - IPC_LOCK ulimits: memlock: soft: -1 diff --git a/django/core/settings/defaults.py b/django/core/settings/defaults.py index 158401dbf..1c374939d 100644 --- a/django/core/settings/defaults.py +++ b/django/core/settings/defaults.py @@ -210,7 +210,7 @@ def is_test(self): "URLS": ["http://elasticsearch:9200"], "ATOMIC_REBUILD": True, "AUTO_UPDATE": True, - "TIMEOUT": 10, + "TIMEOUT": 30, "OPTIONS": { "max_retries": 2, },