Merge pull request #5116 from stsewd/remove-dead-code-config-module

Remove dead code from config module
readthedocs · Jan 17, 2019 · d196fc7 · d196fc7
2 parents f06271b + dceae9a
commit d196fc7
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 7 deletions.
diff --git a/readthedocs/config/config.py b/readthedocs/config/config.py
@@ -405,12 +405,6 @@ def validate_build(self):
             self.env_config.update(
                 DOCKER_IMAGE_SETTINGS[build['image']]
             )
-        # Update docker settings from user config
-        if 'DOCKER_IMAGE_SETTINGS' in self.env_config and \
-                build['image'] in self.env_config['DOCKER_IMAGE_SETTINGS']:
-            self.env_config.update(
-                self.env_config['DOCKER_IMAGE_SETTINGS'][build['image']]
-            )
 
         # Allow to override specific project
         config_image = self.defaults.get('build_image')

diff --git a/readthedocs/doc_builder/config.py b/readthedocs/doc_builder/config.py
@@ -59,7 +59,6 @@ def load_yaml_config(version):
     img_settings = DOCKER_IMAGE_SETTINGS.get(img_name, None)
     if img_settings:
         env_config.update(img_settings)
-        env_config['DOCKER_IMAGE_SETTINGS'] = img_settings
 
     try:
         config = load_config(