Merge #2682

2682: dockerImages: use binary-dist instead of custom hydra build product subtype r=jbgi a=jbgi so that docker images correctly appear for download on hydra: https://hydra.iohk.io/build/6289120 Currently on master: https://hydra.iohk.io/build/6287806 Co-authored-by: Jean-Baptiste Giraudeau <jean-baptiste.giraudeau@iohk.io>
IntersectMBO · May 11, 2021 · 23422b0 · 23422b0
2 parents a6bea12 + 814394e
commit 23422b0
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/flake.nix b/flake.nix
@@ -91,7 +91,7 @@
           inherit (pkgs) cardano-node-profiled cardano-node-eventlogged cardano-node-asserted;
         }
         // scripts
-        // (collectExes flake.packages)
+        // exes
         // (prefixNamesWith "static/"
               (mapAttrs pkgs.rewriteStatic (lazyCollectExe
                 (if system == "x86_64-darwin" then flake else muslFlake).packages)))

diff --git a/nix/nixos/cardano-node-service.nix b/nix/nixos/cardano-node-service.nix
@@ -451,6 +451,7 @@ in {
         description = "cardano-node node daemon user";
         uid = 10016;
         group = "cardano-node";
+        isSystemUser = true;
       };
 
       ## TODO:  use http://hackage.haskell.org/package/systemd for:

diff --git a/release.nix b/release.nix
@@ -81,8 +81,8 @@ let
   in pkgs.runCommand "cardano-node-docker-images" {} ''
     mkdir -pv $out/nix-support/
     cat <<EOF > $out/nix-support/hydra-build-products
-    file dockerimage-${dockerImage.name} ${dockerImage}
-    file dockerimage-${submitApiDockerImage.name} ${submitApiDockerImage}
+    file binary-dist ${dockerImage}
+    file binary-dist ${submitApiDockerImage}
     EOF
   '';
   mkPins = inputs: pkgs.runCommand "ifd-pins" {} ''