diff --git a/common b/common index 042949ff113..28d921144b8 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 042949ff11321a9d044efdf41b0620089aac1981 +Subproject commit 28d921144b85162f8ecee295c55e2acb7887474f diff --git a/docker-compose.override.yml b/docker-compose.override.yml index 2945c30c519..e09a3da6287 100644 --- a/docker-compose.override.yml +++ b/docker-compose.override.yml @@ -59,7 +59,7 @@ services: - DJANGO_SETTINGS_MODULE=readthedocs.settings.celery_docker - CELERY_APP_NAME=readthedocs - build: + build-default: &build image: community_server:latest volumes: - ${PWD}:/usr/src/app/checkouts/readthedocs.org @@ -68,6 +68,9 @@ services: - DJANGO_SETTINGS_MODULE=readthedocs.settings.build_docker - CELERY_APP_NAME=readthedocs + build-large: + <<: *build + storage: # https://github.com/Azure/Azurite # Pin the version of Azurite as there are sometimes backwards incompatible changes diff --git a/readthedocs/settings/docker_compose.py b/readthedocs/settings/docker_compose.py index 2af30c22aaa..3807a57693b 100644 --- a/readthedocs/settings/docker_compose.py +++ b/readthedocs/settings/docker_compose.py @@ -10,7 +10,7 @@ class DockerBaseSettings(CommunityDevSettings): DOCKER_ENABLE = True RTD_DOCKER_COMPOSE = True - RTD_DOCKER_COMPOSE_VOLUME = 'community_build-user-builds' + RTD_DOCKER_COMPOSE_VOLUME = 'community_' + os.environ.get('BUILD_USER_BUILDS_VOLUME') RTD_DOCKER_USER = f'{os.geteuid()}:{os.getegid()}' DOCKER_LIMITS = {'memory': '1g', 'time': 900} USE_SUBDOMAIN = True