Build: use a setting to define the Docker image for the clone step (#…

…10555) * Build: use a setting to define the Docker image for the clone step It also updates the image to use Ubuntu 22.04 LTS. * Update readthedocs/settings/base.py Co-authored-by: Eric Holscher <25510+ericholscher@users.noreply.github.com> --------- Co-authored-by: Eric Holscher <25510+ericholscher@users.noreply.github.com>
readthedocs · Jul 24, 2023 · 28274b4 · 28274b4
1 parent de8f94d
commit 28274b4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/readthedocs/doc_builder/director.py b/readthedocs/doc_builder/director.py
@@ -135,9 +135,7 @@ def create_vcs_environment(self):
             version=self.data.version,
             build=self.data.build,
             environment=self.get_vcs_env_vars(),
-            # Force the ``container_image`` to use one that has the latest
-            # ca-certificate package which is compatible with Lets Encrypt
-            container_image=settings.RTD_DOCKER_BUILD_SETTINGS["os"]["ubuntu-20.04"],
+            container_image=settings.RTD_DOCKER_CLONE_IMAGE,
             api_client=self.data.api_client,
         )
 

diff --git a/readthedocs/settings/base.py b/readthedocs/settings/base.py
@@ -674,6 +674,9 @@ def TEMPLATES(self):
     }
     # Always point to the latest stable release.
     RTD_DOCKER_BUILD_SETTINGS['tools']['python']['3'] = RTD_DOCKER_BUILD_SETTINGS['tools']['python']['3.11']
+    # This is used for the image used to clone the users repo,
+    # since we can't read their config file image choice before cloning
+    RTD_DOCKER_CLONE_IMAGE = RTD_DOCKER_BUILD_SETTINGS["os"]["ubuntu-22.04"],
 
     def _get_docker_memory_limit(self):
         try: