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