diff --git a/hatch.toml b/hatch.toml index e8d1365..7c4997b 100644 --- a/hatch.toml +++ b/hatch.toml @@ -31,3 +31,6 @@ build = "hatch build" [envs.codebuild.env-vars] PIP_INDEX_URL="" + +[envs.container.env-vars] + diff --git a/src/openjd/sessions/_session.py b/src/openjd/sessions/_session.py index a9d7b52..3cb6bd7 100644 --- a/src/openjd/sessions/_session.py +++ b/src/openjd/sessions/_session.py @@ -373,7 +373,7 @@ def cleanup(self) -> None: if os_name == "posix": subprocess = LoggingSubprocess( logger=self._logger, - args=["rm", "-rf", str(self.working_directory)], + args=["rm", "-rf", f"{str(self.working_directory)}/*"], user=self._user, ) # Note: Blocking call until the process has exited diff --git a/testing_containers/ldap_sudo_environment/run_tests.sh b/testing_containers/ldap_sudo_environment/run_tests.sh index f679718..c1dff9f 100644 --- a/testing_containers/ldap_sudo_environment/run_tests.sh +++ b/testing_containers/ldap_sudo_environment/run_tests.sh @@ -11,5 +11,5 @@ cd code python -m venv .venv source .venv/bin/activate pip install hatch -# Use the codebuild env so that PIP_INDEX_URL isn't set in the hatch config files. -hatch run codebuild:test +# Use the container env so that PIP_INDEX_URL isn't set in the hatch config files. +hatch run container:test diff --git a/testing_containers/localuser_sudo_environment/run_tests.sh b/testing_containers/localuser_sudo_environment/run_tests.sh index f679718..c1dff9f 100755 --- a/testing_containers/localuser_sudo_environment/run_tests.sh +++ b/testing_containers/localuser_sudo_environment/run_tests.sh @@ -11,5 +11,5 @@ cd code python -m venv .venv source .venv/bin/activate pip install hatch -# Use the codebuild env so that PIP_INDEX_URL isn't set in the hatch config files. -hatch run codebuild:test +# Use the container env so that PIP_INDEX_URL isn't set in the hatch config files. +hatch run container:test