Fix?

input-output-hk · Jan 22, 2021 · d40dff6 · d40dff6
1 parent ca8c00a
commit d40dff6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/lib/mk-hashi-stack.nix b/lib/mk-hashi-stack.nix
@@ -47,10 +47,12 @@ let
 
   # "Expands" a docker image into a set which allows for docker commands
   # to be easily performed. E.g. ".#dockerImages.$Image.push
-   imageAttrToCommands = key: image: {
-     inherit image;
-
+  imageAttrToCommands = key: image: let
      id = "${image.imageName}:${image.imageTag}";
+  in {
+     inherit id image;
+
+     outPath = id;
 
      push = let
        parts = builtins.split "/" image.imageName;

diff --git a/lib/mk-nomad-job.nix b/lib/mk-nomad-job.nix
@@ -74,7 +74,7 @@ let
     (map (x: x.Tasks))
     builtins.concatLists
     (map (y: if y.Driver == "docker" then {
-      name = builtins.unsafeDiscardStringContext y.Config.image.id;
+      name = builtins.unsafeDiscardStringContext y.Config.image;
       value = y.Config.image.image;
     } else null))
     (lib.filter (value: value != null))