EbookFoundation
/
readthedocs.org
mirror of https://github.com/EbookFoundation/readthedocs.org.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Support backwards compat

more-gsoc
Eric Holscher 2017-12-05 11:25:15 -08:00
parent 8d1a58db3b
commit c27686e1f8
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
readthedocs/doc_builder/constants.py
View File

@ -4,11 +4,14 @@
from __future__ import ( from __future__ import (
absolute_import, division, print_function, unicode_literals) absolute_import, division, print_function, unicode_literals)
import logging
import os import os
import re import re
from django.conf import settings from django.conf import settings
log = logging.getLogger(__name__)
SPHINX_TEMPLATE_DIR = os.path.join( SPHINX_TEMPLATE_DIR = os.path.join(
settings.SITE_ROOT, settings.SITE_ROOT,
'readthedocs', 'readthedocs',
@ -35,6 +38,11 @@ DOCKER_VERSION = getattr(settings, 'DOCKER_VERSION', 'auto')
DOCKER_IMAGE = getattr(settings, 'DOCKER_IMAGE', 'readthedocs/build:2.0') DOCKER_IMAGE = getattr(settings, 'DOCKER_IMAGE', 'readthedocs/build:2.0')
DOCKER_IMAGE_SETTINGS = getattr(settings, 'DOCKER_IMAGE_SETTINGS', {}) DOCKER_IMAGE_SETTINGS = getattr(settings, 'DOCKER_IMAGE_SETTINGS', {})
old_config = getattr(settings, 'DOCKER_BUILD_IMAGES', None)
if old_config:
log.warning('Old config detected, DOCKER_BUILD_IMAGES->DOCKER_IMAGE_SETTINGS')
DOCKER_IMAGE_SETTINGS.update(old_config)
DOCKER_LIMITS = {'memory': '200m', 'time': 600} DOCKER_LIMITS = {'memory': '200m', 'time': 600}
DOCKER_LIMITS.update(getattr(settings, 'DOCKER_LIMITS', {})) DOCKER_LIMITS.update(getattr(settings, 'DOCKER_LIMITS', {}))