summaryrefslogtreecommitdiffstats
path: root/nixos/modules/profiles
diff options
context:
space:
mode:
authorDing Xiang Fei <dingxiangfei2009@gmail.com>2018-10-30 15:44:00 +0800
committerDing Xiang Fei <dingxiangfei2009@gmail.com>2018-11-07 12:52:53 +0800
commit4259f7575e5a715bf4001e22894ce95cdc06385a (patch)
treed02a5a8c3a2762c5d8c52e1b0a6e4dacc040dd63 /nixos/modules/profiles
parentb8040919b01b5d70b029fe4824a65a7928a6d100 (diff)
use closure-info for building system tarball
Diffstat (limited to 'nixos/modules/profiles')
-rw-r--r--nixos/modules/profiles/docker-container.nix16
1 files changed, 10 insertions, 6 deletions
diff --git a/nixos/modules/profiles/docker-container.nix b/nixos/modules/profiles/docker-container.nix
index 7031d7d1d593..5d6b11498b52 100644
--- a/nixos/modules/profiles/docker-container.nix
+++ b/nixos/modules/profiles/docker-container.nix
@@ -15,15 +15,19 @@ in {
# Create the tarball
system.build.tarball = pkgs.callPackage ../../lib/make-system-tarball.nix {
- contents = [];
+ contents = [
+ {
+ source = "${config.system.build.toplevel}/.";
+ target = "./";
+ }
+ ];
extraArgs = "--owner=0";
# Add init script to image
- storeContents = [
- { object = config.system.build.toplevel + "/init";
- symlink = "/init";
- }
- ] ++ (pkgs2storeContents [ pkgs.stdenv ]);
+ storeContents = pkgs2storeContents [
+ config.system.build.toplevel
+ pkgs.stdenv
+ ];
# Some container managers like lxc need these
extraCommands = "mkdir -p proc sys dev";