From 035e197f6432170fadbfb5e8488c9e90656b1b60 Mon Sep 17 00:00:00 2001 From: InsanePrawn Date: Mon, 29 Aug 2022 19:52:12 +0200 Subject: [PATCH] wrapper: add WRAPPER_PATHS to point ccache and rust to predictable locations --- wrapper/docker.py | 5 ++--- wrapper/wrapper.py | 7 ++++++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/wrapper/docker.py b/wrapper/docker.py index 69f0c3e..804f718 100644 --- a/wrapper/docker.py +++ b/wrapper/docker.py @@ -5,10 +5,9 @@ import subprocess import sys from config import config -from constants import CHROOT_PATHS -from .wrapper import BaseWrapper +from .wrapper import BaseWrapper, WRAPPER_PATHS -DOCKER_PATHS = CHROOT_PATHS.copy() +DOCKER_PATHS = WRAPPER_PATHS.copy() def docker_volumes_args(volume_mappings: dict[str, str]) -> list[str]: diff --git a/wrapper/wrapper.py b/wrapper/wrapper.py index 5a0adb3..06d0d23 100644 --- a/wrapper/wrapper.py +++ b/wrapper/wrapper.py @@ -9,6 +9,11 @@ from config import config from config.state import dump_file as dump_config_file from constants import CHROOT_PATHS +WRAPPER_PATHS = CHROOT_PATHS | { + 'ccache': '/ccache', + 'rust': '/rust', +} + class Wrapper(Protocol): """Wrappers wrap kupferbootstrap in some form of isolation from the host OS, i.e. docker or chroots""" @@ -63,7 +68,7 @@ class BaseWrapper(Wrapper): def generate_wrapper_config( self, target_path: str = '/tmp/kupferbootstrap', - paths: dict[str, str] = CHROOT_PATHS, + paths: dict[str, str] = WRAPPER_PATHS, config_overrides: dict[str, dict] = {}, ) -> str: wrapped_config = f'{target_path.rstrip("/")}/{self.identifier}_wrapped.toml'