From 6061d505747debdc175d75cbf18edb9191192463 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Giraudeau Date: Fri, 7 May 2021 10:10:47 +0200 Subject: [PATCH 1/3] dockerImages: use binary-dist instead of custom hydra build product subtype so that docker images correctly appear for download on hydra. --- release.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/release.nix b/release.nix index e2960c6df1b..b7606c1bbc1 100644 --- a/release.nix +++ b/release.nix @@ -81,8 +81,8 @@ let in pkgs.runCommand "cardano-node-docker-images" {} '' mkdir -pv $out/nix-support/ cat < $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" {} '' From 1ae3d45f99781caf09599747d3888138a488fc8e Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Giraudeau Date: Mon, 10 May 2021 13:46:22 +0200 Subject: [PATCH 2/3] flake: cleanup redundant expression --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 2bd59c8a5ac..043cf43affc 100644 --- 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))) From 537caf20443daf3e01c60babbff6fe383ab6abb9 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Giraudeau Date: Mon, 10 May 2021 13:48:22 +0200 Subject: [PATCH 3/3] nixos service: use system user for cardano-node. --- nix/nixos/cardano-node-service.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nix/nixos/cardano-node-service.nix b/nix/nixos/cardano-node-service.nix index f4f6538a12e..fac66c7f6dc 100644 --- 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: