From 8bf855ef8a8598bebf28db25b150b13622a70c2b Mon Sep 17 00:00:00 2001 From: Jakob Ackermann Date: Wed, 12 Feb 2025 15:23:32 +0000 Subject: [PATCH] [web] tweak logging for CI containers (#23570) The default logger is "json-file", which writes json blobs and splits stdout and stderr. We do not need to split and also can save on extra serialization overhead in the docker daemon by switching the driver. - use the cheaper "local" driver for containers that we need logs from (test containers), the local driver streams stdout+stderr into a file - use the no-op "none" driver for support containers that we do need any logs from. GitOrigin-RevId: 55c7cb7c91860e192b6d54354f4550a0ee9a672c --- services/web/docker-compose.ci.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/services/web/docker-compose.ci.yml b/services/web/docker-compose.ci.yml index 35830c7568..a37e195452 100644 --- a/services/web/docker-compose.ci.yml +++ b/services/web/docker-compose.ci.yml @@ -10,6 +10,8 @@ services: context: ../.. dockerfile: services/web/Dockerfile image: ci/$PROJECT_NAME:$BRANCH_NAME-$BUILD_NUMBER + logging: + driver: local user: node command: npm run test:unit:app working_dir: /overleaf/services/web @@ -27,6 +29,8 @@ services: context: ../.. dockerfile: services/web/Dockerfile image: ci/$PROJECT_NAME:$BRANCH_NAME-$BUILD_NUMBER + logging: + driver: local working_dir: /overleaf/services/web env_file: docker-compose.common.env environment: @@ -47,6 +51,8 @@ services: context: ../.. dockerfile: services/web/Dockerfile image: ci/$PROJECT_NAME:$BRANCH_NAME-$BUILD_NUMBER + logging: + driver: local user: node working_dir: /overleaf/services/web command: npm run test:frontend @@ -55,6 +61,8 @@ services: test_frontend_ct: image: cypress/included:13.13.2 + logging: + driver: local working_dir: /overleaf/services/web environment: CYPRESS_SPEC_PATTERN: ${CYPRESS_SPEC_PATTERN:-} @@ -79,6 +87,8 @@ services: mongo: image: mongo:6.0.13 + logging: + driver: none command: --replSet overleaf volumes: - ./docker/mongodb-init-replica-set.js:/docker-entrypoint-initdb.d/mongodb-init-replica-set.js @@ -92,6 +102,8 @@ services: ldap: image: rroemhild/test-openldap:1.1 + logging: + driver: none # 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 @@ -102,6 +114,8 @@ services: saml: image: us-east1-docker.pkg.dev/overleaf-ops/ol-docker/saml-test + logging: + driver: none environment: SAML_BASE_URL_PATH: 'http://saml/simplesaml/' SAML_TEST_SP_ENTITY_ID: 'overleaf-test-saml'