Clean up setting names

Author: ericholscher

readthedocs/doc_builder/config.py

@@ -8,7 +8,7 @@
 from readthedocs_build.config import load as load_config
 from readthedocs_build.config import BuildConfig, ConfigError, InvalidConfig
 
-from .constants import DOCKER_BUILD_IMAGES, DOCKER_IMAGE
+from .constants import DOCKER_IMAGE_SETTINGS, DOCKER_IMAGE
 
 
 class ConfigWrapper(object):
@@ -138,14 +138,16 @@ def load_yaml_config(version):
     # Get build image to set up the python version validation. Pass in the
     # build image python limitations to the loaded config so that the versions
     # can be rejected at validation
-    build_image = DOCKER_BUILD_IMAGES.get(
-        version.project.container_image,
-        DOCKER_BUILD_IMAGES.get(DOCKER_IMAGE, None),
-    )
-    if build_image:
-        env_config = {
-            'python': build_image['python'],
+
+    img_name = version.project.container_image or DOCKER_IMAGE
+    env_config = {
+        'build': {
+            'image': img_name,
         }
+    }
+    img_settings = DOCKER_IMAGE_SETTINGS.get(img_name, None)
+    if img_settings:
+        env_config.update(img_settings)
 
     try:
         sphinx_env_config = env_config.copy()

readthedocs/doc_builder/constants.py

@@ -33,7 +33,8 @@
 )
 DOCKER_VERSION = getattr(settings, 'DOCKER_VERSION', 'auto')
 DOCKER_IMAGE = getattr(settings, 'DOCKER_IMAGE', 'readthedocs/build:2.0')
-DOCKER_BUILD_IMAGES = getattr(settings, 'DOCKER_BUILD_IMAGES', {})
+DOCKER_IMAGE_SETTINGS = getattr(settings, 'DOCKER_IMAGE_SETTINGS', {})
+
 DOCKER_LIMITS = {'memory': '200m', 'time': 600}
 DOCKER_LIMITS.update(getattr(settings, 'DOCKER_LIMITS', {}))
 

requirements/pip.txt

@@ -12,7 +12,7 @@ six==1.10.0
 future==0.16.0
 #readthedocs-build==2.0.8
 # For testing
-git+https://github.com/rtfd/readthedocs-build.git@d93c81c#egg=readthedocs_build
+git+https://github.com/rtfd/readthedocs-build.git@73a184a#egg=readthedocs_build
 
 django-tastypie==0.13.0
 django-haystack==2.6.0