From e81adffedb05e91a158f79799586ec8992739a80 Mon Sep 17 00:00:00 2001 From: Santos Gallegos Date: Tue, 18 May 2021 11:31:30 -0500 Subject: [PATCH 1/3] Docker: set cwd explicitly --- readthedocs/projects/tasks.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/readthedocs/projects/tasks.py b/readthedocs/projects/tasks.py index 459f2cab047..2cac778d304 100644 --- a/readthedocs/projects/tasks.py +++ b/readthedocs/projects/tasks.py @@ -1198,11 +1198,13 @@ def install_system_dependencies(self): self.build_env.run( 'apt-get', 'update', '--assume-yes', '--quiet', user=settings.RTD_DOCKER_SUPER_USER, + cwd='$HOME', ) # put ``--`` to end all command arguments. self.build_env.run( 'apt-get', 'install', '--assume-yes', '--quiet', '--', *packages, user=settings.RTD_DOCKER_SUPER_USER, + cwd='$HOME', ) def build_docs(self): From 397981f8270218f2372a07bd5c4414a131c4c822 Mon Sep 17 00:00:00 2001 From: Santos Gallegos Date: Tue, 18 May 2021 12:06:01 -0500 Subject: [PATCH 2/3] Make $HOME the default cwd --- readthedocs/doc_builder/environments.py | 2 +- readthedocs/projects/tasks.py | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/readthedocs/doc_builder/environments.py b/readthedocs/doc_builder/environments.py index 87ee2ee279d..43f4c36526e 100644 --- a/readthedocs/doc_builder/environments.py +++ b/readthedocs/doc_builder/environments.py @@ -102,7 +102,7 @@ def __init__( ): self.command = command self.shell = shell - self.cwd = cwd or os.getcwd() + self.cwd = cwd or '$HOME' self.user = user or settings.RTD_DOCKER_USER self.environment = environment.copy() if environment else {} if 'PATH' in self.environment: diff --git a/readthedocs/projects/tasks.py b/readthedocs/projects/tasks.py index 2cac778d304..459f2cab047 100644 --- a/readthedocs/projects/tasks.py +++ b/readthedocs/projects/tasks.py @@ -1198,13 +1198,11 @@ def install_system_dependencies(self): self.build_env.run( 'apt-get', 'update', '--assume-yes', '--quiet', user=settings.RTD_DOCKER_SUPER_USER, - cwd='$HOME', ) # put ``--`` to end all command arguments. self.build_env.run( 'apt-get', 'install', '--assume-yes', '--quiet', '--', *packages, user=settings.RTD_DOCKER_SUPER_USER, - cwd='$HOME', ) def build_docs(self): From 25588a261212040a2ae76b06c542693369b40205 Mon Sep 17 00:00:00 2001 From: Santos Gallegos Date: Tue, 18 May 2021 12:33:51 -0500 Subject: [PATCH 3/3] Fix tests --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 2545d59fdcd..8752e5cc8c7 100644 --- a/tox.ini +++ b/tox.ini @@ -11,7 +11,7 @@ setenv = LANG=en_US.UTF-8 LC_ALL=en_US.UTF-8 DJANGO_SETTINGS_SKIP_LOCAL=True -passenv = CI TRAVIS TRAVIS_* +passenv = CI TRAVIS TRAVIS_* HOME deps = -r{toxinidir}/requirements/testing.txt changedir = {toxinidir}/readthedocs basepython =