Skip to content

Small minor fixes for the Docker adapter and the container tests #81

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

Open
ronald-jaepel wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Small minor fixes for the Docker adapter and the container tests #81

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 2 additions & 2 deletions cadetrdm/container/dockerAdapter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions tests/test_container_docker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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

Expand Down
2 changes: 1 addition & 1 deletion tests/test_container_podman.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down