format
This commit is contained in:
@@ -381,6 +381,6 @@ let
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
hostAddr = c.hostAddr;
|
inherit (c) hostAddr;
|
||||||
in
|
in
|
||||||
c
|
c
|
||||||
|
|||||||
@@ -55,7 +55,8 @@ in
|
|||||||
net.expose.tcp = [ 3000 ];
|
net.expose.tcp = [ 3000 ];
|
||||||
};
|
};
|
||||||
|
|
||||||
ci-runner = mkVm {
|
ci-runner =
|
||||||
|
mkVm {
|
||||||
name = "ci-runner";
|
name = "ci-runner";
|
||||||
includedInTests = false;
|
includedInTests = false;
|
||||||
net.access = [
|
net.access = [
|
||||||
@@ -180,7 +181,8 @@ in
|
|||||||
services.journald.extraConfig = "ForwardToConsole=yes";
|
services.journald.extraConfig = "ForwardToConsole=yes";
|
||||||
|
|
||||||
virtualisation.containerd.enable = true;
|
virtualisation.containerd.enable = true;
|
||||||
virtualisation.containerd.settings.plugins."io.containerd.snapshotter.v1.overlayfs".mount_options = [ "userxattr" ];
|
virtualisation.containerd.settings.plugins."io.containerd.snapshotter.v1.overlayfs".mount_options =
|
||||||
|
[ "userxattr" ];
|
||||||
|
|
||||||
virtualisation.docker.enable = true;
|
virtualisation.docker.enable = true;
|
||||||
virtualisation.docker.extraOptions = "--containerd /run/containerd/containerd.sock";
|
virtualisation.docker.extraOptions = "--containerd /run/containerd/containerd.sock";
|
||||||
@@ -218,7 +220,8 @@ in
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
} // {
|
}
|
||||||
|
// {
|
||||||
hostConfig = {
|
hostConfig = {
|
||||||
systemd.tmpfiles.rules = [
|
systemd.tmpfiles.rules = [
|
||||||
"d ${ciRunnerData}/nix-rw-store 0755 server server -"
|
"d ${ciRunnerData}/nix-rw-store 0755 server server -"
|
||||||
|
|||||||
@@ -210,6 +210,6 @@ let
|
|||||||
};
|
};
|
||||||
inherit (setup) containerConfig;
|
inherit (setup) containerConfig;
|
||||||
};
|
};
|
||||||
hostAddr = c.hostAddr;
|
inherit (c) hostAddr;
|
||||||
in
|
in
|
||||||
c
|
c
|
||||||
|
|||||||
@@ -554,7 +554,10 @@ rec {
|
|||||||
Gateway = hostAddr;
|
Gateway = hostAddr;
|
||||||
};
|
};
|
||||||
networkConfig.DNS = [ hostAddr ];
|
networkConfig.DNS = [ hostAddr ];
|
||||||
networkConfig.Domains = [ "~." "containers" ];
|
networkConfig.Domains = [
|
||||||
|
"~."
|
||||||
|
"containers"
|
||||||
|
];
|
||||||
linkConfig.RequiredForOnline = if allowInternet then "routable" else "degraded";
|
linkConfig.RequiredForOnline = if allowInternet then "routable" else "degraded";
|
||||||
};
|
};
|
||||||
networking.enableIPv6 = false;
|
networking.enableIPv6 = false;
|
||||||
|
|||||||
@@ -129,11 +129,10 @@
|
|||||||
{
|
{
|
||||||
nixosConfigurations = lib.mapAttrs (_: host: host.hostCfg) allHosts;
|
nixosConfigurations = lib.mapAttrs (_: host: host.hostCfg) allHosts;
|
||||||
|
|
||||||
inspect = lib.mapAttrs
|
inspect = lib.mapAttrs (
|
||||||
(name: host:
|
name: host:
|
||||||
pkgs.writeText "inspect-${name}.json"
|
pkgs.writeText "inspect-${name}.json" (builtins.toJSON (introspect.hostReport { inherit host; }))
|
||||||
(builtins.toJSON (introspect.hostReport { inherit host; })))
|
) allHosts;
|
||||||
allHosts;
|
|
||||||
|
|
||||||
packages.${system} = customPkgs // {
|
packages.${system} = customPkgs // {
|
||||||
inherit ci;
|
inherit ci;
|
||||||
|
|||||||
Reference in New Issue
Block a user