From 645b3b1d2b74f2929a7c5d4e7ddcdefc7da09d4c Mon Sep 17 00:00:00 2001 From: InsanePrawn Date: Tue, 30 Aug 2022 16:01:05 +0200 Subject: [PATCH] wrapper/docker: create volume dirs ourselfes for better permissions and podman compat (backport of 79dcac82ce77d1ff0831ec6db5f647b24d4f795b) --- wrapper/docker.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/wrapper/docker.py b/wrapper/docker.py index 76aa2da..efce128 100644 --- a/wrapper/docker.py +++ b/wrapper/docker.py @@ -6,6 +6,8 @@ import sys from config import config from constants import CHROOT_PATHS +from exec.file import makedir + from .wrapper import BaseWrapper DOCKER_PATHS = CHROOT_PATHS.copy() @@ -65,8 +67,12 @@ class DockerWrapper(BaseWrapper): ssh_dir = os.path.join(pathlib.Path.home(), '.ssh') if not os.path.exists(ssh_dir): os.makedirs(ssh_dir, mode=0o700) + volumes = self.get_bind_mounts_default(wrapped_config) - volumes |= dict({config.get_path(vol_name): vol_dest for vol_name, vol_dest in DOCKER_PATHS.items()}) + for vol_name, vol_dest in DOCKER_PATHS.items(): + vol_src = config.get_path(vol_name) + makedir(vol_src) + volumes[vol_src] = vol_dest docker_cmd = [ 'docker', 'run',