mirror of
https://gitlab.computer.surgery/matrix/grapevine.git
synced 2025-12-16 23:31:24 +01:00
drop oci image outputs
We don't support this anyway. OCI images will be needed for testing with Complement, but there are a bunch of other special requirements that has so these oci image outputs won't be very useful for that anyway.
This commit is contained in:
parent
0b5a07d192
commit
e318dfcb3d
2 changed files with 0 additions and 34 deletions
|
|
@ -21,8 +21,6 @@
|
||||||
|
|
||||||
inherit inputs;
|
inherit inputs;
|
||||||
|
|
||||||
oci-image = self.callPackage ./nix/pkgs/oci-image {};
|
|
||||||
|
|
||||||
# Return a new scope with overrides applied to the 'default' package
|
# Return a new scope with overrides applied to the 'default' package
|
||||||
overrideDefaultPackage = args: self.overrideScope (final: prev: {
|
overrideDefaultPackage = args: self.overrideScope (final: prev: {
|
||||||
default = prev.default.override args;
|
default = prev.default.override args;
|
||||||
|
|
@ -50,7 +48,6 @@
|
||||||
{
|
{
|
||||||
packages = {
|
packages = {
|
||||||
default = (mkScope pkgs).default;
|
default = (mkScope pkgs).default;
|
||||||
oci-image = (mkScope pkgs).oci-image;
|
|
||||||
}
|
}
|
||||||
//
|
//
|
||||||
builtins.listToAttrs
|
builtins.listToAttrs
|
||||||
|
|
@ -73,12 +70,6 @@
|
||||||
name = binaryName;
|
name = binaryName;
|
||||||
value = (mkScope pkgsCrossStatic).default;
|
value = (mkScope pkgsCrossStatic).default;
|
||||||
}
|
}
|
||||||
|
|
||||||
# An output for an OCI image based on that binary
|
|
||||||
{
|
|
||||||
name = "oci-image-${crossSystem}";
|
|
||||||
value = (mkScope pkgsCrossStatic).oci-image;
|
|
||||||
}
|
|
||||||
]
|
]
|
||||||
)
|
)
|
||||||
[
|
[
|
||||||
|
|
|
||||||
|
|
@ -1,25 +0,0 @@
|
||||||
# Keep sorted
|
|
||||||
{ default
|
|
||||||
, dockerTools
|
|
||||||
, lib
|
|
||||||
, tini
|
|
||||||
}:
|
|
||||||
|
|
||||||
dockerTools.buildImage {
|
|
||||||
name = default.pname;
|
|
||||||
tag = "next";
|
|
||||||
copyToRoot = [
|
|
||||||
dockerTools.caCertificates
|
|
||||||
];
|
|
||||||
config = {
|
|
||||||
# Use the `tini` init system so that signals (e.g. ctrl+c/SIGINT)
|
|
||||||
# are handled as expected
|
|
||||||
Entrypoint = [
|
|
||||||
"${lib.getExe' tini "tini"}"
|
|
||||||
"--"
|
|
||||||
];
|
|
||||||
Cmd = [
|
|
||||||
"${lib.getExe default}"
|
|
||||||
];
|
|
||||||
};
|
|
||||||
}
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue