Skip to content

Use 2 builders with celery concurrency at 1 #7124

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Use 2 builders with celery concurrency at 1 #7124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion common
Open in desktop
Submodule common updated 4 files
+27 −3 dockerfiles/docker-compose.yml
+3 −10 dockerfiles/entrypoints/build.sh
+2 −9 dockerfiles/entrypoints/celery.sh
+2 −0 dockerfiles/entrypoints/common.sh
5 changes: 4 additions & 1 deletion docker-compose.override.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion readthedocs/settings/docker_compose.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down