fix(lib/ops): tag defaulting while forwarding mkStandardOCI to mkOCI

divnix · Jul 13, 2023 · 301a649 · 301a649
1 parent 74e13ed
commit 301a649
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 12 deletions.
diff --git a/src/lib/ops/mkStandardOCI.nix b/src/lib/ops/mkStandardOCI.nix
@@ -106,14 +106,15 @@ in
     '';
   in
     with dmerge;
-      l.throwIf (args ? tag && meta ? tags)
-      "mkStandardOCI: use of `tag` and `meta.tags` arguments are not supported together. Remove the former."
       cell.ops.mkOCI (
         merge
-        {
-          inherit name tag uid gid labels options perms config meta setup runtimeInputs;
-          entrypoint = operable';
-        }
+        ({
+            inherit name uid gid labels options perms config meta setup runtimeInputs;
+            entrypoint = operable';
+          }
+          # keep this optional so that mkOCI can likewise
+          # match undefined on args ? tag
+          // l.optionalAttrs (args ? tag) {inherit tag;})
         {
           # mkStandardOCI differentiators over mkOCI
           # - live & readiness probes

diff --git a/src/local/flake.lock b/src/local/flake.lock
diff --git a/src/tests/flake.lock b/src/tests/flake.lock