public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dockerTools: Verify nix-store contents on buildLayeredImage test

Browse Source
This commit is contained in:
Utku Demir 2020-07-06 16:59:58 +12:00
parent 2ae2186dfd
commit 06db331922
No known key found for this signature in database
GPG Key ID: F3F8629C3E0BF60B
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nixos/tests/docker-tools.nix
View File

@ -179,10 +179,11 @@ import ./make-test-python.nix ({ pkgs, ... }: {
docker.succeed("docker run --rm no-store-paths ls /") docker.succeed("docker run --rm no-store-paths ls /")
docker.fail("docker run --rm no-store-paths ls /nix/store") docker.fail("docker run --rm no-store-paths ls /nix/store")
with subtest("Ensure buildLayeredImage supports files directly under /nix/store"): with subtest("Ensure buildLayeredImage does not change store path contents."):
docker.succeed( docker.succeed(
"docker load --input='${pkgs.dockerTools.examples.filesInStore}'", "docker load --input='${pkgs.dockerTools.examples.filesInStore}'",
"docker run file-in-store |& grep 'some data'", "docker run --rm file-in-store nix-store --verify --check-contents",
"docker run --rm file-in-store |& grep 'some data'",
) )
''; '';
}) })

17
pkgs/build-support/docker/examples.nix
View File

@ -337,12 +337,21 @@ rec {
# 19. Support files in the store on buildLayeredImage # 19. Support files in the store on buildLayeredImage
# See: https://github.com/NixOS/nixpkgs/pull/91084#issuecomment-653496223 # See: https://github.com/NixOS/nixpkgs/pull/91084#issuecomment-653496223
filesInStore = pkgs.dockerTools.buildLayeredImage { filesInStore = pkgs.dockerTools.buildLayeredImageWithNixDb {
name = "file-in-store"; name = "file-in-store";
tag = "latest"; tag = "latest";
config.Cmd = [ contents = [
"${pkgs.coreutils}/bin/cat" pkgs.coreutils
(pkgs.writeText "somefile" "some data") pkgs.nix
(pkgs.writeScriptBin "myscript" ''
#!${pkgs.runtimeShell}
cat ${pkgs.writeText "somefile" "some data"}
'')
]; ];
config = {
Cmd = [ "myscript" ];
# For some reason 'nix-store --verify' requires this environment variable
Env = [ "USER=root" ];
};
}; };
} }