From 5db7d710ae5bb333171669d9427264fe6dce6c42 Mon Sep 17 00:00:00 2001 From: "r.jaepel" Date: Sun, 22 Jun 2025 17:36:05 +0200 Subject: [PATCH 1/2] Add images for docker tests --- tests/test_container_docker.py | 2 ++ tests/test_container_podman.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/test_container_docker.py b/tests/test_container_docker.py index 8624200..96ee07c 100644 --- a/tests/test_container_docker.py +++ b/tests/test_container_docker.py @@ -38,6 +38,7 @@ def test_run_dockered(): case = Case(project_repo=rdm_example, options=options, environment=matching_environment) docker_adapter = DockerAdapter() + docker_adapter.pull_image("ghcr.io/cadet/cadet-suite:Core-v5.0.4-docker02-Python-1.1.0-Process-0.10.1") has_run_study = case.run_study(container_adapter=docker_adapter, force=True) assert has_run_study @@ -50,6 +51,7 @@ def test_run_dockered(): case = Case(project_repo=rdm_example, options=options, environment=matching_environment) docker_adapter = DockerAdapter() + docker_adapter.pull_image("ghcr.io/cadet/cadet-suite:Core-v5.0.4-docker02-Python-1.1.0-Process-0.10.1") has_run_study = case.run_study(container_adapter=docker_adapter, force=True) assert not has_run_study diff --git a/tests/test_container_podman.py b/tests/test_container_podman.py index 31d3afc..7d766b2 100644 --- a/tests/test_container_podman.py +++ b/tests/test_container_podman.py @@ -5,7 +5,7 @@ from cadetrdm import Options, Environment, Case, ProjectRepo from cadetrdm.container import PodmanAdapter -IMAGE_NAME = "ghcr.io/ronald-jaepel/cadet-rdm-jupyter:latest" +IMAGE_NAME = "ghcr.io/cadet/cadet-suite:Core-v5.0.4-docker02-Python-1.1.0-Process-0.10.1" @pytest.mark.container From 7393ca1f5600a9f773cb24a89e2bc81eafb22c45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ronald=20J=C3=A4pel?= Date: Wed, 25 Feb 2026 15:38:48 +0100 Subject: [PATCH 2/2] Fix: update run method in DockerAdapter --- cadetrdm/container/dockerAdapter.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cadetrdm/container/dockerAdapter.py b/cadetrdm/container/dockerAdapter.py index 6faeea2..8eb4c7b 100644 --- a/cadetrdm/container/dockerAdapter.py +++ b/cadetrdm/container/dockerAdapter.py @@ -82,9 +82,9 @@ def _run_command(self, full_command, image, mounts=None): for host_path, container_path in mounts.items(): volumes[host_path.absolute().as_posix()] = {'bind': container_path, 'mode': 'ro'} - container = self.client.containers.run_yml( + container = self.client.containers.run( image=image, - command=full_command, + command=f"bash -c '{full_command}'", volumes=volumes, detach=True, remove=False