summary refs log tree commit diff
path: root/pkgs/build-support/docker
diff options
context:
space:
mode:
authorUtku Demir <me@utdemir.com>2020-07-06 16:59:58 +1200
committerUtku Demir <me@utdemir.com>2020-07-06 16:59:58 +1200
commit06db3319226b061d385521cdab74cd676254e9e9 (patch)
tree7345402db35e7808e48fd69446af45f4ea2b03ff /pkgs/build-support/docker
parent2ae2186dfda22ee49b8ab1027643bd11909246d5 (diff)
downloadnixpkgs-06db3319226b061d385521cdab74cd676254e9e9.tar
nixpkgs-06db3319226b061d385521cdab74cd676254e9e9.tar.gz
nixpkgs-06db3319226b061d385521cdab74cd676254e9e9.tar.bz2
nixpkgs-06db3319226b061d385521cdab74cd676254e9e9.tar.lz
nixpkgs-06db3319226b061d385521cdab74cd676254e9e9.tar.xz
nixpkgs-06db3319226b061d385521cdab74cd676254e9e9.tar.zst
nixpkgs-06db3319226b061d385521cdab74cd676254e9e9.zip
dockerTools: Verify nix-store contents on buildLayeredImage test
Diffstat (limited to 'pkgs/build-support/docker')
-rw-r--r--pkgs/build-support/docker/examples.nix17
1 files changed, 13 insertions, 4 deletions
diff --git a/pkgs/build-support/docker/examples.nix b/pkgs/build-support/docker/examples.nix
index 8b77d6011d3..068daa8df72 100644
--- a/pkgs/build-support/docker/examples.nix
+++ b/pkgs/build-support/docker/examples.nix
@@ -337,12 +337,21 @@ rec {
 
   # 19. Support files in the store on buildLayeredImage
   # See: https://github.com/NixOS/nixpkgs/pull/91084#issuecomment-653496223
-  filesInStore = pkgs.dockerTools.buildLayeredImage {
+  filesInStore = pkgs.dockerTools.buildLayeredImageWithNixDb {
     name = "file-in-store";
     tag = "latest";
-    config.Cmd = [
-      "${pkgs.coreutils}/bin/cat"
-      (pkgs.writeText "somefile" "some data")
+    contents = [
+      pkgs.coreutils
+      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" ];
+    };
   };
 }