Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

dockerImages: use binary-dist instead of custom hydra build product subtype #2682

Merged
merged 3 commits into from
May 11, 2021
Merged

dockerImages: use binary-dist instead of custom hydra build product subtype #2682

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
499d0b8
dockerImages: use binary-dist instead of custom hydra build product s…
jbgi May 7, 2021
2514135
flake: cleanup redundant expression
jbgi May 10, 2021
814394e
nixos service: use system user for cardano-node.
jbgi May 10, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)))
Expand Down
1 change: 1 addition & 0 deletions nix/nixos/cardano-node-service.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions release.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" {} ''
Expand Down