diff --git a/img/builder.nix b/img/builder.nix index f80c3e7..6317844 100644 --- a/img/builder.nix +++ b/img/builder.nix @@ -2,6 +2,7 @@ buildah, fakeNss, git, + lib, lib', nix, nix-output-monitor, @@ -31,10 +32,6 @@ let ''; destination = "/etc/nix/nix.conf"; }; -in -lib'.mkImage { - name = name "builder"; - config.Env = [ "TEMP=/tmp" ]; contents = lib'.basePackages ++ [ buildah (fakeNss.override { @@ -53,6 +50,11 @@ lib'.mkImage { podman policy ]; +in +lib'.mkImage { + inherit contents; + name = name "builder"; + config.Env = [ "TEMP=/tmp" "PATH=${lib.makeBinPath contents}" ]; extraCommands = '' mkdir -p tmp mkdir -p var/tmp diff --git a/img/immich.nix b/img/immich.nix index aee3180..b03c560 100644 --- a/img/immich.nix +++ b/img/immich.nix @@ -1,6 +1,7 @@ { immich-go, cacert, + coreutils, dockerTools, lib, @@ -11,6 +12,7 @@ dockerTools.buildLayeredImage { name = name "immich"; tag = "latest"; contents = [ + coreutils dockerTools.binSh dockerTools.caCertificates immich-go