public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos/containers: styling improvements

This commit is contained in:
Patryk Wychowaniec 2021-02-26 16:03:49 +01:00
parent d8fd467095
commit 5f1345a303
No known key found for this signature in database
GPG Key ID: F62547D075E09767
13 changed files with 40 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nixos/tests/containers-bridge.nix
View File

@ -1,5 +1,3 @@
# Test for NixOS' container support.
let let
hostIp = "192.168.0.1"; hostIp = "192.168.0.1";
containerIp = "192.168.0.100/24"; containerIp = "192.168.0.100/24";
@ -7,10 +5,10 @@ let
containerIp6 = "fc00::2/7"; containerIp6 = "fc00::2/7";
in in
import ./make-test-python.nix ({ pkgs, ...} : { import ./make-test-python.nix ({ pkgs, lib, ... }: {
name = "containers-bridge"; name = "containers-bridge";
meta = with pkgs.lib.maintainers; { meta = {
maintainers = [ aristid aszlig eelco kampfschlaefer ]; maintainers = with lib.maintainers; [ aristid aszlig eelco kampfschlaefer ];
}; };
machine = machine =

6
nixos/tests/containers-custom-pkgs.nix
View File

@ -1,4 +1,4 @@
import ./make-test-python.nix ({ pkgs, lib, ...} : let import ./make-test-python.nix ({ pkgs, lib, ... }: let
customPkgs = pkgs.appendOverlays [ (self: super: { customPkgs = pkgs.appendOverlays [ (self: super: {
hello = super.hello.overrideAttrs (old: { hello = super.hello.overrideAttrs (old: {
@ -8,8 +8,8 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : let
in { in {
name = "containers-custom-pkgs"; name = "containers-custom-pkgs";
meta = with lib.maintainers; { meta = {
maintainers = [ adisbladis earvstedt ]; maintainers = with lib.maintainers; [ adisbladis earvstedt ];
}; };
machine = { config, ... }: { machine = { config, ... }: {

7
nixos/tests/containers-ephemeral.nix
View File

@ -1,7 +1,8 @@
# Test for NixOS' container support. import ./make-test-python.nix ({ pkgs, lib, ... }: {
import ./make-test-python.nix ({ pkgs, ...} : {
name = "containers-ephemeral"; name = "containers-ephemeral";
meta = {
maintainers = with lib.maintainers; [ patryk27 ];
};
machine = { pkgs, ... }: { machine = { pkgs, ... }: {
virtualisation.memorySize = 768; virtualisation.memorySize = 768;

8
nixos/tests/containers-extra_veth.nix
View File

@ -1,9 +1,7 @@
# Test for NixOS' container support. import ./make-test-python.nix ({ pkgs, lib, ... }: {
import ./make-test-python.nix ({ pkgs, ...} : {
name = "containers-extra_veth"; name = "containers-extra_veth";
meta = with pkgs.lib.maintainers; { meta = {
maintainers = [ kampfschlaefer ]; maintainers = with lib.maintainers; [ kampfschlaefer ];
}; };
machine = machine =

8
nixos/tests/containers-hosts.nix
View File

@ -1,9 +1,7 @@
# Test for NixOS' container support. import ./make-test-python.nix ({ pkgs, lib, ... }: {
import ./make-test-python.nix ({ pkgs, ...} : {
name = "containers-hosts"; name = "containers-hosts";
meta = with pkgs.lib.maintainers; { meta = {
maintainers = [ montag451 ]; maintainers = with lib.maintainers; [ montag451 ];
}; };
machine = machine =

8
nixos/tests/containers-imperative.nix
View File

@ -1,9 +1,7 @@
# Test for NixOS' container support. import ./make-test-python.nix ({ pkgs, lib, ... }: {
import ./make-test-python.nix ({ pkgs, ...} : {
name = "containers-imperative"; name = "containers-imperative";
meta = with pkgs.lib.maintainers; { meta = {
maintainers = [ aristid aszlig eelco kampfschlaefer ]; maintainers = with lib.maintainers; [ aristid aszlig eelco kampfschlaefer ];
}; };
machine = machine =

8
nixos/tests/containers-ip.nix
View File

@ -1,5 +1,3 @@
# Test for NixOS' container support.
let let
webserverFor = hostAddress: localAddress: { webserverFor = hostAddress: localAddress: {
inherit hostAddress localAddress; inherit hostAddress localAddress;
@ -13,10 +11,10 @@ let
}; };
}; };
in import ./make-test-python.nix ({ pkgs, ...} : { in import ./make-test-python.nix ({ pkgs, lib, ... }: {
name = "containers-ipv4-ipv6"; name = "containers-ipv4-ipv6";
meta = with pkgs.lib.maintainers; { meta = {
maintainers = [ aristid aszlig eelco kampfschlaefer ]; maintainers = with lib.maintainers; [ aristid aszlig eelco kampfschlaefer ];
}; };
machine = machine =

8
nixos/tests/containers-macvlans.nix
View File

@ -1,15 +1,13 @@
# Test for NixOS' container support.
let let
# containers IP on VLAN 1 # containers IP on VLAN 1
containerIp1 = "192.168.1.253"; containerIp1 = "192.168.1.253";
containerIp2 = "192.168.1.254"; containerIp2 = "192.168.1.254";
in in
import ./make-test-python.nix ({ pkgs, ...} : { import ./make-test-python.nix ({ pkgs, lib, ... }: {
name = "containers-macvlans"; name = "containers-macvlans";
meta = with pkgs.lib.maintainers; { meta = {
maintainers = [ montag451 ]; maintainers = with lib.maintainers; [ montag451 ];
}; };
nodes = { nodes = {

7
nixos/tests/containers-physical_interfaces.nix
View File

@ -1,8 +1,7 @@
import ./make-test-python.nix ({ pkgs, lib, ... }: {
import ./make-test-python.nix ({ pkgs, ...} : {
name = "containers-physical_interfaces"; name = "containers-physical_interfaces";
meta = with pkgs.lib.maintainers; { meta = {
maintainers = [ kampfschlaefer ]; maintainers = with lib.maintainers; [ kampfschlaefer ];
}; };
nodes = { nodes = {

8
nixos/tests/containers-portforward.nix
View File

@ -1,5 +1,3 @@
# Test for NixOS' container support.
let let
hostIp = "192.168.0.1"; hostIp = "192.168.0.1";
hostPort = 10080; hostPort = 10080;
@ -7,10 +5,10 @@ let
containerPort = 80; containerPort = 80;
in in
import ./make-test-python.nix ({ pkgs, ...} : { import ./make-test-python.nix ({ pkgs, lib, ... }: {
name = "containers-portforward"; name = "containers-portforward";
meta = with pkgs.lib.maintainers; { meta = {
maintainers = [ aristid aszlig eelco kampfschlaefer ianwookim ]; maintainers = with lib.maintainers; [ aristid aszlig eelco kampfschlaefer ianwookim ];
}; };
machine = machine =

7
nixos/tests/containers-reloadable.nix
View File

@ -1,7 +1,6 @@
import ./make-test-python.nix ({ pkgs, lib, ...} : import ./make-test-python.nix ({ pkgs, lib, ... }:
let let
client_base = { client_base = {
containers.test1 = { containers.test1 = {
autoStart = true; autoStart = true;
config = { config = {
@ -16,8 +15,8 @@ let
}; };
in { in {
name = "containers-reloadable"; name = "containers-reloadable";
meta = with pkgs.lib.maintainers; { meta = {
maintainers = [ danbst ]; maintainers = with lib.maintainers; [ danbst ];
}; };
nodes = { nodes = {

8
nixos/tests/containers-restart_networking.nix
View File

@ -1,5 +1,3 @@
# Test for NixOS' container support.
let let
client_base = { client_base = {
networking.firewall.enable = false; networking.firewall.enable = false;
@ -16,11 +14,11 @@ let
}; };
}; };
}; };
in import ./make-test-python.nix ({ pkgs, ...} : in import ./make-test-python.nix ({ pkgs, lib, ... }:
{ {
name = "containers-restart_networking"; name = "containers-restart_networking";
meta = with pkgs.lib.maintainers; { meta = {
maintainers = [ kampfschlaefer ]; maintainers = with lib.maintainers; [ kampfschlaefer ];
}; };
nodes = { nodes = {

8
nixos/tests/containers-tmpfs.nix
View File

@ -1,9 +1,7 @@
# Test for NixOS' container support. import ./make-test-python.nix ({ pkgs, lib, ... }: {
import ./make-test-python.nix ({ pkgs, ...} : {
name = "containers-tmpfs"; name = "containers-tmpfs";
meta = with pkgs.lib.maintainers; { meta = {
maintainers = [ ]; maintainers = with lib.maintainers; [ patryk27 ];
}; };
machine = machine =