Skip to content

Commit c27686e

Browse files
committed
Support backwards compat
1 parent 8d1a58d commit c27686e

File tree

1 file changed

+8
-0
lines changed

1 file changed

+8
-0
lines changed

readthedocs/doc_builder/constants.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,14 @@
44
from __future__ import (
55
absolute_import, division, print_function, unicode_literals)
66

7+
import logging
78
import os
89
import re
910

1011
from django.conf import settings
1112

13+
log = logging.getLogger(__name__)
14+
1215
SPHINX_TEMPLATE_DIR = os.path.join(
1316
settings.SITE_ROOT,
1417
'readthedocs',
@@ -35,6 +38,11 @@
3538
DOCKER_IMAGE = getattr(settings, 'DOCKER_IMAGE', 'readthedocs/build:2.0')
3639
DOCKER_IMAGE_SETTINGS = getattr(settings, 'DOCKER_IMAGE_SETTINGS', {})
3740

41+
old_config = getattr(settings, 'DOCKER_BUILD_IMAGES', None)
42+
if old_config:
43+
log.warning('Old config detected, DOCKER_BUILD_IMAGES->DOCKER_IMAGE_SETTINGS')
44+
DOCKER_IMAGE_SETTINGS.update(old_config)
45+
3846
DOCKER_LIMITS = {'memory': '200m', 'time': 600}
3947
DOCKER_LIMITS.update(getattr(settings, 'DOCKER_LIMITS', {}))
4048

0 commit comments

Comments
 (0)