Fix build of vm-test image
buildbot/nix-eval Build done.
buildbot/nix-build Build done.
buildbot/nix-effects Build done.
Build images / Build (immich) (push) Successful in 3m30s
Build images / Build (sword-container-builder) (push) Successful in 4m5s
Build images / Build (bitwarden) (push) Successful in 4m10s
Build images / Build (builder) (push) Successful in 4m15s
Build images / Build (vm-test) (push) Successful in 5m32s

This commit is contained in:
Greg Hellings
2026-08-04 07:29:00 -05:00
parent 11b6630c92
commit 3eafcb26ad
+1 -11
View File
@@ -12,20 +12,10 @@
pup,
shellcheck,
python3,
xonsh,
name,
...
}:
let
basicPython = (python3.withPackages (p: with p; [ pyyaml ]));
x = xonsh.overridePythonAttrs (old: {
python3 = basicPython;
propagatedBuildInputs =
(if builtins.hasAttr "propagatedBuildInputs" old then old.propagatedBuildInputs else [ ])
++ [ basicPython.pkgs.pyyaml ];
});
in
dockerTools.buildLayeredImage {
name = name "vm-test";
tag = "latest";
@@ -42,9 +32,9 @@ dockerTools.buildLayeredImage {
jq
packer
pup
(python3.withPackages (x: with x; [ pyyaml ]))
shellcheck
dockerTools.usrBinEnv
x
];
extraCommands = ''
mkdir -p tmp