chore: coreutils in immich, path in builder
buildbot/nix-eval Build done.
buildbot/nix-build Build done.
buildbot/nix-effects Build done.
Build images / Build (immich) (push) Successful in 1m15s
Build images / Build (bitwarden) (push) Successful in 2m29s
Build images / Build (builder) (push) Successful in 4m13s
Build images / Build (vm-test) (push) Successful in 4m13s
Build images / Build (sword-container-builder) (push) Successful in 4m11s
buildbot/nix-eval Build done.
buildbot/nix-build Build done.
buildbot/nix-effects Build done.
Build images / Build (immich) (push) Successful in 1m15s
Build images / Build (bitwarden) (push) Successful in 2m29s
Build images / Build (builder) (push) Successful in 4m13s
Build images / Build (vm-test) (push) Successful in 4m13s
Build images / Build (sword-container-builder) (push) Successful in 4m11s
This commit is contained in:
+6
-4
@@ -2,6 +2,7 @@
|
|||||||
buildah,
|
buildah,
|
||||||
fakeNss,
|
fakeNss,
|
||||||
git,
|
git,
|
||||||
|
lib,
|
||||||
lib',
|
lib',
|
||||||
nix,
|
nix,
|
||||||
nix-output-monitor,
|
nix-output-monitor,
|
||||||
@@ -31,10 +32,6 @@ let
|
|||||||
'';
|
'';
|
||||||
destination = "/etc/nix/nix.conf";
|
destination = "/etc/nix/nix.conf";
|
||||||
};
|
};
|
||||||
in
|
|
||||||
lib'.mkImage {
|
|
||||||
name = name "builder";
|
|
||||||
config.Env = [ "TEMP=/tmp" ];
|
|
||||||
contents = lib'.basePackages ++ [
|
contents = lib'.basePackages ++ [
|
||||||
buildah
|
buildah
|
||||||
(fakeNss.override {
|
(fakeNss.override {
|
||||||
@@ -53,6 +50,11 @@ lib'.mkImage {
|
|||||||
podman
|
podman
|
||||||
policy
|
policy
|
||||||
];
|
];
|
||||||
|
in
|
||||||
|
lib'.mkImage {
|
||||||
|
inherit contents;
|
||||||
|
name = name "builder";
|
||||||
|
config.Env = [ "TEMP=/tmp" "PATH=${lib.makeBinPath contents}" ];
|
||||||
extraCommands = ''
|
extraCommands = ''
|
||||||
mkdir -p tmp
|
mkdir -p tmp
|
||||||
mkdir -p var/tmp
|
mkdir -p var/tmp
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
{
|
{
|
||||||
immich-go,
|
immich-go,
|
||||||
cacert,
|
cacert,
|
||||||
|
coreutils,
|
||||||
dockerTools,
|
dockerTools,
|
||||||
lib,
|
lib,
|
||||||
|
|
||||||
@@ -11,6 +12,7 @@ dockerTools.buildLayeredImage {
|
|||||||
name = name "immich";
|
name = name "immich";
|
||||||
tag = "latest";
|
tag = "latest";
|
||||||
contents = [
|
contents = [
|
||||||
|
coreutils
|
||||||
dockerTools.binSh
|
dockerTools.binSh
|
||||||
dockerTools.caCertificates
|
dockerTools.caCertificates
|
||||||
immich-go
|
immich-go
|
||||||
|
|||||||
Reference in New Issue
Block a user