Support backwards compat
parent
8d1a58db3b
commit
c27686e1f8
|
@ -4,11 +4,14 @@
|
|||
from __future__ import (
|
||||
absolute_import, division, print_function, unicode_literals)
|
||||
|
||||
import logging
|
||||
import os
|
||||
import re
|
||||
|
||||
from django.conf import settings
|
||||
|
||||
log = logging.getLogger(__name__)
|
||||
|
||||
SPHINX_TEMPLATE_DIR = os.path.join(
|
||||
settings.SITE_ROOT,
|
||||
'readthedocs',
|
||||
|
@ -35,6 +38,11 @@ DOCKER_VERSION = getattr(settings, 'DOCKER_VERSION', 'auto')
|
|||
DOCKER_IMAGE = getattr(settings, 'DOCKER_IMAGE', 'readthedocs/build:2.0')
|
||||
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.update(getattr(settings, 'DOCKER_LIMITS', {}))
|
||||
|
||||
|
|
Loading…
Reference in New Issue