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

Merge pull request #60029 from Ma27/configure-ipv4-for-imperative-container

Browse Source 
nixos-container: allow setting custom local and host address
This commit is contained in:
Robin Gloster 2019-06-06 07:35:07 +00:00 committed by GitHub
commit 2cca7180c1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 28 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nixos/doc/manual/administration/imperative-containers.xml
View File

@ -29,6 +29,13 @@
<xref linkend="opt-services.openssh.enable"/> = true; <xref linkend="opt-services.openssh.enable"/> = true;
<link linkend="opt-users.users._name__.openssh.authorizedKeys.keys">users.users.root.openssh.authorizedKeys.keys</link> = ["ssh-dss AAAAB3N…"]; <link linkend="opt-users.users._name__.openssh.authorizedKeys.keys">users.users.root.openssh.authorizedKeys.keys</link> = ["ssh-dss AAAAB3N…"];
' '
</screen>
By default the next free address in the <literal>10.233.0.0/16</literal> subnet will be chosen
as container IP. This behavior can be altered by setting <literal>--host-address</literal> and
<literal>--local-address</literal>:
<screen>
# nixos-container create test --config-file test-container.nix \
--local-address 10.235.1.2 --host-address 10.235.1.1
</screen> </screen>
</para> </para>

32
pkgs/tools/virtualization/nixos-container/nixos-container.pl
View File

@ -23,7 +23,7 @@ $ENV{"NIXOS_CONFIG"} = "";
sub showHelp { sub showHelp {
print <<EOF; print <<EOF;
Usage: nixos-container list Usage: nixos-container list
nixos-container create <container-name> [--nixos-path <path>] [--system-path <path>] [--config-file <path>] [--config <string>] [--ensure-unique-name] [--auto-start] [--bridge <iface>] [--port <port>] nixos-container create <container-name> [--nixos-path <path>] [--system-path <path>] [--config-file <path>] [--config <string>] [--ensure-unique-name] [--auto-start] [--bridge <iface>] [--port <port>] [--host-address <string>] [--local-address <string>]
nixos-container destroy <container-name> nixos-container destroy <container-name>
nixos-container start <container-name> nixos-container start <container-name>
nixos-container stop <container-name> nixos-container stop <container-name>
@ -48,6 +48,8 @@ my $port;
my $extraConfig; my $extraConfig;
my $signal; my $signal;
my $configFile; my $configFile;
my $hostAddress;
my $localAddress;
GetOptions( GetOptions(
"help" => sub { showHelp() }, "help" => sub { showHelp() },
@ -59,9 +61,15 @@ GetOptions(
"signal=s" => \$signal, "signal=s" => \$signal,
"nixos-path=s" => \$nixosPath, "nixos-path=s" => \$nixosPath,
"config=s" => \$extraConfig, "config=s" => \$extraConfig,
"config-file=s" => \$configFile "config-file=s" => \$configFile,
"host-address=s" => \$hostAddress,
"local-address=s" => \$localAddress,
) or exit 1; ) or exit 1;
if (defined $hostAddress and !defined $localAddress or defined $localAddress and !defined $hostAddress) {
die "With --host-address set, --local-address is required as well!";
}
my $action = $ARGV[0] or die "$0: no action specified\n"; my $action = $ARGV[0] or die "$0: no action specified\n";
if (defined $configFile and defined $extraConfig) { if (defined $configFile and defined $extraConfig) {
@ -149,16 +157,18 @@ if ($action eq "create") {
$usedIPs{$1} = 1 if $s =~ /^LOCAL_ADDRESS=([0-9\.]+)$/m; $usedIPs{$1} = 1 if $s =~ /^LOCAL_ADDRESS=([0-9\.]+)$/m;
} }
my ($ipPrefix, $hostAddress, $localAddress); unless (defined $hostAddress) {
for (my $nr = 1; $nr < 255; $nr++) { my $ipPrefix;
$ipPrefix = "10.233.$nr"; for (my $nr = 1; $nr < 255; $nr++) {
$hostAddress = "$ipPrefix.1"; $ipPrefix = "10.233.$nr";
$localAddress = "$ipPrefix.2"; $hostAddress = "$ipPrefix.1";
last unless $usedIPs{$hostAddress} || $usedIPs{$localAddress}; $localAddress = "$ipPrefix.2";
$ipPrefix = undef; last unless $usedIPs{$hostAddress} || $usedIPs{$localAddress};
} $ipPrefix = undef;
}
die "$0: out of IP addresses\n" unless defined $ipPrefix; die "$0: out of IP addresses\n" unless defined $ipPrefix;
}
my @conf; my @conf;
push @conf, "PRIVATE_NETWORK=1\n"; push @conf, "PRIVATE_NETWORK=1\n";