Merge pull request #67 from ozwaldorf/main

feat(sgxGramineContainer): expose maxLayers argument from image builder
This commit is contained in:
Harald Hoyer 2024-11-14 01:49:30 +07:00 committed by GitHub
commit 88c0700635
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -22,6 +22,7 @@
, sigFile ? null , sigFile ? null
, extendedPackages ? [ ] , extendedPackages ? [ ]
, customRecursiveMerge ? null , customRecursiveMerge ? null
, maxLayers ? 100
}: }:
assert lib.assertMsg (!(isAzure && sgx_default_qcnl_conf != null)) "sgx_default_qcnl_conf can't be set for Azure"; assert lib.assertMsg (!(isAzure && sgx_default_qcnl_conf != null)) "sgx_default_qcnl_conf can't be set for Azure";
let let
@ -201,6 +202,7 @@ let
inherit tag; inherit tag;
inherit contents; inherit contents;
inherit fromImage; inherit fromImage;
inherit maxLayers;
includeStorePaths = false; includeStorePaths = false;
extraCommands = (mkNixStore contents) + '' extraCommands = (mkNixStore contents) + ''
@ -231,6 +233,7 @@ let
inherit config; inherit config;
inherit tag; inherit tag;
inherit fromImage; inherit fromImage;
inherit maxLayers;
includeStorePaths = false; includeStorePaths = false;
extraCommands = '' extraCommands = ''
@ -247,6 +250,7 @@ let
inherit tag; inherit tag;
inherit config; inherit config;
inherit fromImage; inherit fromImage;
inherit maxLayers;
contents = extendedContents; contents = extendedContents;
}; };
in in