nero/tsuki
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

break oci image builder into a function

Browse source 
Now it can be reused for different `pkgs` and `package`s.
This commit is contained in:
Charles Hall 2024-01-25 19:36:17 -08:00
parent 0e8e4f1083
commit 2a04a361e0
No known key found for this signature in database
GPG key ID: 7B8E0645816E07CF
1 changed files with 10 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

21
flake.nix
View file

@ -159,30 +159,29 @@
meta.mainProgram = cargoToml.package.name; meta.mainProgram = cargoToml.package.name;
}; };
in
{
packages = {
default = package pkgsHost;
oci-image = mkOciImage = pkgs: package:
let pkgs.dockerTools.buildImage {
package = self.packages.${system}.default;
in
pkgsHost.dockerTools.buildImage {
name = package.pname; name = package.pname;
tag = "latest"; tag = "latest";
config = { config = {
# Use the `tini` init system so that signals (e.g. ctrl+c/SIGINT) # Use the `tini` init system so that signals (e.g. ctrl+c/SIGINT)
# are handled as expected # are handled as expected
Entrypoint = [ Entrypoint = [
"${pkgsHost.lib.getExe' pkgsHost.tini "tini"}" "${pkgs.lib.getExe' pkgs.tini "tini"}"
"--" "--"
]; ];
Cmd = [ Cmd = [
"${pkgsHost.lib.getExe package}" "${pkgs.lib.getExe package}"
]; ];
}; };
}; };
in
{
packages = {
default = package pkgsHost;
oci-image = mkOciImage pkgsHost self.packages.${system}.default;
} // builtins.listToAttrs ( } // builtins.listToAttrs (
builtins.map builtins.map
(crossSystem: { (crossSystem: {