From e565c01abb691ac64a010436a3e1a90156f043a4 Mon Sep 17 00:00:00 2001 From: Manuel Kaufmann Date: Fri, 21 Jul 2023 12:21:19 +0200 Subject: [PATCH 1/2] Build: use a setting to define the Docker image for the clone step It also updates the image to use Ubuntu 22.04 LTS. --- readthedocs/doc_builder/director.py | 4 +--- readthedocs/settings/base.py | 1 + 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/readthedocs/doc_builder/director.py b/readthedocs/doc_builder/director.py index 5241175f3a3..e94b391b957 100644 --- 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 index cea0550f8d3..8e0442c287d 100644 --- a/readthedocs/settings/base.py +++ b/readthedocs/settings/base.py @@ -674,6 +674,7 @@ 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'] + RTD_DOCKER_CLONE_IMAGE = RTD_DOCKER_BUILD_SETTINGS["os"]["ubuntu-22.04"], def _get_docker_memory_limit(self): try: From 35ab1c84756eb5e6822a1f9ec5784990baff65a1 Mon Sep 17 00:00:00 2001 From: Manuel Kaufmann Date: Fri, 21 Jul 2023 18:28:24 +0200 Subject: [PATCH 2/2] Update readthedocs/settings/base.py Co-authored-by: Eric Holscher <25510+ericholscher@users.noreply.github.com> --- readthedocs/settings/base.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/readthedocs/settings/base.py b/readthedocs/settings/base.py index 8e0442c287d..13009f654ac 100644 --- a/readthedocs/settings/base.py +++ b/readthedocs/settings/base.py @@ -674,6 +674,8 @@ 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):