File tree Expand file tree Collapse file tree 1 file changed +8
-0
lines changed Expand file tree Collapse file tree 1 file changed +8
-0
lines changed Original file line number Diff line number Diff line change 4
4
from __future__ import (
5
5
absolute_import , division , print_function , unicode_literals )
6
6
7
+ import logging
7
8
import os
8
9
import re
9
10
10
11
from django .conf import settings
11
12
13
+ log = logging .getLogger (__name__ )
14
+
12
15
SPHINX_TEMPLATE_DIR = os .path .join (
13
16
settings .SITE_ROOT ,
14
17
'readthedocs' ,
35
38
DOCKER_IMAGE = getattr (settings , 'DOCKER_IMAGE' , 'readthedocs/build:2.0' )
36
39
DOCKER_IMAGE_SETTINGS = getattr (settings , 'DOCKER_IMAGE_SETTINGS' , {})
37
40
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
+
38
46
DOCKER_LIMITS = {'memory' : '200m' , 'time' : 600 }
39
47
DOCKER_LIMITS .update (getattr (settings , 'DOCKER_LIMITS' , {}))
40
48
You can’t perform that action at this time.
0 commit comments