From 33b3d67753103e4e71bf47762380ddd244f9cc57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Alby?= Date: Tue, 15 Feb 2022 14:37:13 +0100 Subject: [PATCH] Merge pull request #6758 from overleaf/jpa-cut-ldap-memory-usage [web] cut memory usage of ldap container GitOrigin-RevId: 26bbab4f6f84ecaab7d92869259fdaafa72559c0 --- services/web/docker-compose.ci.yml | 7 +++++++ services/web/docker-compose.yml | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/services/web/docker-compose.ci.yml b/services/web/docker-compose.ci.yml index fc20b12810..2373ffa96e 100644 --- a/services/web/docker-compose.ci.yml +++ b/services/web/docker-compose.ci.yml @@ -79,6 +79,13 @@ services: ldap: restart: always image: rroemhild/test-openldap:1.1 + # Workaround large memory allocation (using the max-open-files-limit as socket buffer scale). + # REF: https://github.com/moby/moby/issues/8231#issuecomment-63877553 + # REF: https://github.com/moby/moby/issues/8231#issuecomment-63871343 + command: + - 'bash' + - '-c' + - 'ulimit -n 1024 && exec bash /run.sh' saml: restart: always diff --git a/services/web/docker-compose.yml b/services/web/docker-compose.yml index b6e9d7709b..2b0c7aa286 100644 --- a/services/web/docker-compose.yml +++ b/services/web/docker-compose.yml @@ -83,6 +83,13 @@ services: ldap: restart: always image: rroemhild/test-openldap:1.1 + # Workaround large memory allocation (using the max-open-files-limit as socket buffer scale). + # REF: https://github.com/moby/moby/issues/8231#issuecomment-63877553 + # REF: https://github.com/moby/moby/issues/8231#issuecomment-63871343 + command: + - 'bash' + - '-c' + - 'ulimit -n 1024 && exec bash /run.sh' saml: restart: always