diff options
author | Benjamin Hipple <bhipple@protonmail.com> | 2021-03-11 14:56:39 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-03-11 14:56:39 -0500 |
commit | f707104092b2dc70b364297826fffeed4c3968cc (patch) | |
tree | 611257b90c23e824f019e5a623dc68cbb4d105dc /pkgs/build-support | |
parent | 54972fdaf581eb9c8f5a769a340f6483000d8a18 (diff) | |
parent | bf56388c92eeab2d44f8d64b545bb608f502efd4 (diff) |
Merge pull request #115791 from lbpdt/feature/docker-tools-nix-store-dir
dockerTools.buildLayeredImage: configurable store root
Diffstat (limited to 'pkgs/build-support')
-rw-r--r-- | pkgs/build-support/docker/default.nix | 4 | ||||
-rw-r--r-- | pkgs/build-support/docker/stream_layered_image.py | 10 |
2 files changed, 9 insertions, 5 deletions
diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index e9014a889540..e0231f514a25 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -841,12 +841,14 @@ rec { cat ${baseJson} | jq ' . + { + "store_dir": $store_dir, "store_layers": $store_layers, "customisation_layer", $customisation_layer, "repo_tag": $repo_tag, "created": $created } - ' --argjson store_layers "$store_layers" \ + ' --arg store_dir "${storeDir}" \ + --argjson store_layers "$store_layers" \ --arg customisation_layer ${customisationLayer} \ --arg repo_tag "$imageName:$imageTag" \ --arg created "$created" | diff --git a/pkgs/build-support/docker/stream_layered_image.py b/pkgs/build-support/docker/stream_layered_image.py index e35bd0b0e8c0..60d67442c169 100644 --- a/pkgs/build-support/docker/stream_layered_image.py +++ b/pkgs/build-support/docker/stream_layered_image.py @@ -130,12 +130,13 @@ class ExtractChecksum: LayerInfo = namedtuple("LayerInfo", ["size", "checksum", "path", "paths"]) -def add_layer_dir(tar, paths, mtime): +def add_layer_dir(tar, paths, store_dir, mtime): """ Appends given store paths to a TarFile object as a new layer. tar: 'tarfile.TarFile' object for the new layer to be added to. paths: List of store paths. + store_dir: the root directory of the nix store mtime: 'mtime' of the added files and the layer tarball. Should be an integer representing a POSIX time. @@ -143,9 +144,9 @@ def add_layer_dir(tar, paths, mtime): the layer added. """ - invalid_paths = [i for i in paths if not i.startswith("/nix/store/")] + invalid_paths = [i for i in paths if not i.startswith(store_dir)] assert len(invalid_paths) == 0, \ - "Expecting absolute store paths, but got: {invalid_paths}" + f"Expecting absolute paths from {store_dir}, but got: {invalid_paths}" # First, calculate the tarball checksum and the size. extract_checksum = ExtractChecksum() @@ -245,6 +246,7 @@ def main(): else datetime.fromisoformat(conf["created"]) ) mtime = int(created.timestamp()) + store_dir = conf["store_dir"] with tarfile.open(mode="w|", fileobj=sys.stdout.buffer) as tar: layers = [] @@ -253,7 +255,7 @@ def main(): "Creating layer", num, "from paths:", store_layer, file=sys.stderr) - info = add_layer_dir(tar, store_layer, mtime=mtime) + info = add_layer_dir(tar, store_layer, store_dir, mtime=mtime) layers.append(info) print("Creating the customisation layer...", file=sys.stderr) |