Skip to content

Commit 357881a

Browse files
committed
Updated Nix Docker layering options
1 parent 70ff74d commit 357881a

2 files changed

Lines changed: 12 additions & 3 deletions

File tree

nix/build_container.nix

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,11 @@
33
}:
44
let
55
pkgs = project_dependencies.pkgs;
6+
docker_layering = (import (fetchTarball {
7+
# URL of the tarball archive of the specific commit, branch, or tag
8+
url = "https://github.com/matthid/nix-docker-layering/archive/1.0.0.tar.gz";
9+
sha256 = "0g5y363m479b0pcyv0vkma5ji3x5w2hhw0n61g2wgqaxzraaddva";
10+
}) { inherit pkgs; });
611
lib = project_dependencies.lib;
712
cudatoolkit = project_dependencies.cudatoolkit;
813
project = import ./project.nix { project_dependencies = project_dependencies; };
@@ -14,9 +19,10 @@ let
1419
'';
1520
in import ./docker/buildCudaLayeredImage.nix {
1621
inherit cudatoolkit;
17-
buildLayeredImage = pkgs.dockerTools.streamLayeredImage;
22+
buildLayeredImage = docker_layering.streamLayeredImage;
23+
slurpfileGenerator = docker_layering.generators.equal;
1824
lib = pkgs.lib;
19-
maxLayers = 2;
25+
maxLayers = 20;
2026
name = "project_nix";
2127
tag = "latest";
2228

nix/docker/buildCudaLayeredImage.nix

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
# https://github.com/Staff-d/nix-cuda-docker-example
33
{ cudatoolkit
44
, buildLayeredImage
5+
, slurpfileGenerator
6+
, genArgs ? {}
57
, lib
68
, name
79
, tag ? null
@@ -41,7 +43,8 @@ in buildLayeredImage {
4143
contents extraCommands
4244
maxLayers
4345
fakeRootCommands enableFakechroot
44-
created includeStorePaths;
46+
created includeStorePaths
47+
slurpfileGenerator genArgs;
4548

4649
config = cudaConfig;
4750
}

0 commit comments

Comments
 (0)