Skip to content

Commit 9366b3c

Browse files
committed
build: resort to using namespace for tag for now
1 parent c45a77f commit 9366b3c

File tree

2 files changed

+8
-20
lines changed

2 files changed

+8
-20
lines changed

nix/jormungandr/containers.nix

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,22 +9,16 @@
99
mkOCI = namespace: let
1010
# TODO: fix git rev
1111
# rev =
12-
# if (inputs.self ? rev)
12+
# if (inputs.self.rev != "not-a-commit")
1313
# then inputs.self.rev
1414
# else "dirty";
15-
image = std.lib.ops.mkStandardOCI {
15+
in
16+
std.lib.ops.mkStandardOCI {
1617
name = "${constants.registry}/jormungandr";
17-
#tag = "${rev}-${namespace}";
18+
tag = namespace;
1819
operable = cell.operables."jormungandr-${namespace}";
1920
debug = true;
2021
};
21-
in
22-
image
23-
// {
24-
imageTag = let
25-
hash = l.head (l.strings.splitString "-" (baseNameOf image.outPath));
26-
in "${hash}-${namespace}";
27-
};
2822
in
2923
{}
3024
// lib.mapToNamespaces "jormungandr" mkOCI

nix/vit-servicing-station/containers.nix

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,22 +9,16 @@
99
mkOCI = namespace: let
1010
# TODO: fix git rev
1111
# rev =
12-
# if (inputs.self ? rev)
12+
# if (inputs.self.rev != "not-a-commit")
1313
# then inputs.self.rev
1414
# else "dirty";
15-
image = std.lib.ops.mkStandardOCI {
15+
in
16+
std.lib.ops.mkStandardOCI {
1617
name = "${constants.registry}/vit-servicing-station-server";
17-
#tag = "${rev}-${namespace}";
18+
tag = namespace;
1819
operable = cell.operables."vit-servicing-station-server-${namespace}";
1920
debug = true;
2021
};
21-
in
22-
image
23-
// {
24-
imageTag = let
25-
hash = l.head (l.strings.splitString "-" (baseNameOf image.outPath));
26-
in "${hash}-${namespace}";
27-
};
2822
in
2923
{}
3024
// lib.mapToNamespaces "vit-servicing-station-server" mkOCI

0 commit comments

Comments
 (0)