mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(build-image): Remove implicit import of entire package set

Browse source 
Explicitly refer to where things come from, and also don't import
dockerTools as it is no longer used for anything.
This commit is contained in:
Vincent Ambo 2019-09-01 23:55:34 +01:00 committed by Vincent Ambo
parent 92270fcbe4
commit ce8635833b
1 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
tools/nixery/build-image/build-image.nix
View file

@ -39,14 +39,11 @@
...
}:
# Since this is essentially a re-wrapping of some of the functionality that is
# implemented in the dockerTools, we need all of its components in our top-level
# namespace.
with builtins;
with pkgs;
with dockerTools;
let
inherit (pkgs) lib runCommand writeText;
tarLayer = "application/vnd.docker.image.rootfs.diff.tar";
baseName = baseNameOf name;
@ -150,7 +147,7 @@ let
groupedLayers));
# Create a symlink forest into all top-level store paths.
contentsEnv = symlinkJoin {
contentsEnv = pkgs.symlinkJoin {
name = "bulk-layers";
paths = allContents.contents;
};
@ -172,7 +169,7 @@ let
# This computes both an MD5 and a SHA256 hash of each layer, which are used
# for different purposes. See the registry server implementation for details.
allLayersJson = runCommand "fs-layer-list.json" {
buildInputs = [ coreutils findutils jq openssl ];
buildInputs = with pkgs; [ coreutils jq openssl ];
} ''
cat ${bulkLayers} | sort -t/ -k5 -n > layer-list
echo ${customisationLayer} >> layer-list
@ -204,7 +201,7 @@ let
};
configJson = writeText "${baseName}-config.json" (toJSON config);
configMetadata = fromJSON (readFile (runCommand "config-meta" {
buildInputs = [ jq openssl ];
buildInputs = with pkgs; [ jq openssl ];
} ''
size=$(wc -c ${configJson} | cut -d ' ' -f1)
sha256=$(sha256sum ${configJson} | cut -d ' ' -f1)