Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 24, 2023
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e565c01
Build: use a setting to define the Docker image for the clone step
humitos Jul 21, 2023
35ab1c8
Update readthedocs/settings/base.py
humitos Jul 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions readthedocs/doc_builder/director.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
)

Expand Down
3 changes: 3 additions & 0 deletions readthedocs/settings/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down