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

nixos-container: add --port option for nixos-container (forward network ports to systemd-nspawn container)

Browse Source
This commit is contained in:
Ian-Woo Kim 2016-12-02 13:21:03 -08:00 committed by Robin Gloster
parent 3490508ed1
commit a238c8a575
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nixos/modules/virtualisation/containers.nix
View File

@ -89,6 +89,9 @@ let
if [ -n "$HOST_BRIDGE" ]; then if [ -n "$HOST_BRIDGE" ]; then
extraFlags+=" --network-bridge=$HOST_BRIDGE" extraFlags+=" --network-bridge=$HOST_BRIDGE"
fi fi
if [ -n "$HOST_PORT" ]; then
extraFlags+=" --port=$HOST_PORT"
fi
fi fi
extraFlags+=" ${concatStringsSep " " (mapAttrsToList nspawnExtraVethArgs cfg.extraVeths)}" extraFlags+=" ${concatStringsSep " " (mapAttrsToList nspawnExtraVethArgs cfg.extraVeths)}"

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

@ -16,7 +16,7 @@ umask 0022;
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>] 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 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>
@ -37,6 +37,7 @@ my $nixosPath;
my $ensureUniqueName = 0; my $ensureUniqueName = 0;
my $autoStart = 0; my $autoStart = 0;
my $bridge; my $bridge;
my $port;
my $extraConfig; my $extraConfig;
my $signal; my $signal;
my $configFile; my $configFile;
@ -46,6 +47,7 @@ GetOptions(
"ensure-unique-name" => \$ensureUniqueName, "ensure-unique-name" => \$ensureUniqueName,
"auto-start" => \$autoStart, "auto-start" => \$autoStart,
"bridge=s" => \$bridge, "bridge=s" => \$bridge,
"port=s" => \$port,
"system-path=s" => \$systemPath, "system-path=s" => \$systemPath,
"signal=s" => \$signal, "signal=s" => \$signal,
"nixos-path=s" => \$nixosPath, "nixos-path=s" => \$nixosPath,
@ -156,6 +158,7 @@ if ($action eq "create") {
push @conf, "HOST_ADDRESS=$hostAddress\n"; push @conf, "HOST_ADDRESS=$hostAddress\n";
push @conf, "LOCAL_ADDRESS=$localAddress\n"; push @conf, "LOCAL_ADDRESS=$localAddress\n";
push @conf, "HOST_BRIDGE=$bridge\n"; push @conf, "HOST_BRIDGE=$bridge\n";
push @conf, "HOST_PORT=$port\n";
push @conf, "AUTO_START=$autoStart\n"; push @conf, "AUTO_START=$autoStart\n";
write_file($confFile, \@conf); write_file($confFile, \@conf);