diff options
Diffstat (limited to 'nixpkgs/pkgs/tools/virtualization')
5 files changed, 43 insertions, 77 deletions
diff --git a/nixpkgs/pkgs/tools/virtualization/amazon-ecs-cli/default.nix b/nixpkgs/pkgs/tools/virtualization/amazon-ecs-cli/default.nix index d98064df5aae..1578a759ec7d 100644 --- a/nixpkgs/pkgs/tools/virtualization/amazon-ecs-cli/default.nix +++ b/nixpkgs/pkgs/tools/virtualization/amazon-ecs-cli/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "amazon-ecs-cli-${version}"; - version = "1.14.0"; + version = "1.14.1"; src = fetchurl { url = "https://s3.amazonaws.com/amazon-ecs-cli/ecs-cli-linux-amd64-v${version}"; - sha256 = "1m0vj98sy06bx8wryy9zgsl8pm1zwmlwhi52mzd00fqdfq0haggl"; + sha256 = "12q167pbpxw38p1bzcy9z4ix7yh9giwkyrc4vq2qln3pjn9d31rj"; }; unpackPhase = ":"; diff --git a/nixpkgs/pkgs/tools/virtualization/cri-tools/default.nix b/nixpkgs/pkgs/tools/virtualization/cri-tools/default.nix index f57befce3081..1435fd2bde0e 100644 --- a/nixpkgs/pkgs/tools/virtualization/cri-tools/default.nix +++ b/nixpkgs/pkgs/tools/virtualization/cri-tools/default.nix @@ -1,19 +1,23 @@ -{ buildGoPackage, fetchurl, lib }: +{ buildGoPackage, fetchFromGitHub, lib }: buildGoPackage - { name = "cri-tools-1.0.0-alpha.0"; - src = fetchurl - { url = "https://github.com/kubernetes-incubator/cri-tools/archive/v1.0.0-alpha.0.tar.gz"; - sha256 = "1la26f38xafb7g9hrppjq7gmajiyr8idcwbian7n412q9m0lb3ic"; - }; +rec { + pname = "cri-tools"; + version = "1.14.0"; + src = fetchFromGitHub { + owner = "kubernetes-incubator"; + repo = pname; + rev = "v${version}"; + sha256 = "0v5i7shbn7b6av1d2z6r5czyjdll9i7xim9975lpnz1136xb6li7"; + }; - goPackagePath = "github.com/kubernetes-incubator/cri-tools"; - subPackages = [ "cmd/crictl" "cmd/critest" ]; + goPackagePath = "github.com/kubernetes-incubator/cri-tools"; + subPackages = [ "cmd/crictl" "cmd/critest" ]; - meta = { - license = lib.licenses.asl20; - }; - - goDeps = ./deps.nix; - } + meta = { + description = "CLI and validation tools for Kubelet Container Runtime Interface (CRI)"; + homepage = https://github.com/kubernetes-sigs/cri-tools; + license = lib.licenses.asl20; + }; +} diff --git a/nixpkgs/pkgs/tools/virtualization/cri-tools/deps.nix b/nixpkgs/pkgs/tools/virtualization/cri-tools/deps.nix deleted file mode 100644 index 796e335c0f84..000000000000 --- a/nixpkgs/pkgs/tools/virtualization/cri-tools/deps.nix +++ /dev/null @@ -1,48 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 -[ - { - goPackagePath = "github.com/docker/docker"; - fetch = { - type = "git"; - url = "https://github.com/docker/docker"; - rev = "94b8a116fbf1cd90e68d8f5361b520d326a66f9b"; - sha256 = "0winmx2dx9chrv9ab4cl1i00z2vag2swy2lfwiy8jx73qhaf9g4d"; - }; - } - { - goPackagePath = "k8s.io/api"; - fetch = { - type = "git"; - url = "https://github.com/kubernetes/api"; - rev = "57d7f151236665c12202a51c21bc939eb5d5ba91"; - sha256 = "0sdpymjw6wqs1fc2q3h0v60slbd0p5qqr23ssff72wprn8520q37"; - }; - } - { - goPackagePath = "k8s.io/apimachinery"; - fetch = { - type = "git"; - url = "https://github.com/kubernetes/apimachinery"; - rev = "91d8586aac31d9086939d077ba556d2c7fb157b4"; - sha256 = "1672igw8c0hp8qkwns69n5k8qgr1rzjaah9gjh37am34v172vgl7"; - }; - } - { - goPackagePath = "k8s.io/client-go"; - fetch = { - type = "git"; - url = "https://github.com/kubernetes/client-go"; - rev = "109fef42a850b1af9d332a4ba433f65436be66c7"; - sha256 = "1yspxap56fgk0vh2n8jxl3j870yig7swpv8w4w7l92jawrfxv1zf"; - }; - } - { - goPackagePath = "k8s.io/kubernetes"; - fetch = { - type = "git"; - url = "https://github.com/kubernetes/kubernetes"; - rev = "ea2fbd4de4b38aae93ec397cb5ea4d9eb6aefef8"; - sha256 = "1108d2h7px0b4gqc9xrwb0w5dhs5kxxbbvbcr938ipgln250qrpz"; - }; - } -] diff --git a/nixpkgs/pkgs/tools/virtualization/nixos-container/nixos-container.pl b/nixpkgs/pkgs/tools/virtualization/nixos-container/nixos-container.pl index a210a65f431c..b5ceb522e230 100755 --- a/nixpkgs/pkgs/tools/virtualization/nixos-container/nixos-container.pl +++ b/nixpkgs/pkgs/tools/virtualization/nixos-container/nixos-container.pl @@ -23,7 +23,7 @@ $ENV{"NIXOS_CONFIG"} = ""; sub showHelp { print <<EOF; 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 start <container-name> nixos-container stop <container-name> @@ -48,6 +48,8 @@ my $port; my $extraConfig; my $signal; my $configFile; +my $hostAddress; +my $localAddress; GetOptions( "help" => sub { showHelp() }, @@ -59,9 +61,15 @@ GetOptions( "signal=s" => \$signal, "nixos-path=s" => \$nixosPath, "config=s" => \$extraConfig, - "config-file=s" => \$configFile + "config-file=s" => \$configFile, + "host-address=s" => \$hostAddress, + "local-address=s" => \$localAddress, ) 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"; if (defined $configFile and defined $extraConfig) { @@ -149,16 +157,18 @@ if ($action eq "create") { $usedIPs{$1} = 1 if $s =~ /^LOCAL_ADDRESS=([0-9\.]+)$/m; } - my ($ipPrefix, $hostAddress, $localAddress); - for (my $nr = 1; $nr < 255; $nr++) { - $ipPrefix = "10.233.$nr"; - $hostAddress = "$ipPrefix.1"; - $localAddress = "$ipPrefix.2"; - last unless $usedIPs{$hostAddress} || $usedIPs{$localAddress}; - $ipPrefix = undef; - } + unless (defined $hostAddress) { + my $ipPrefix; + for (my $nr = 1; $nr < 255; $nr++) { + $ipPrefix = "10.233.$nr"; + $hostAddress = "$ipPrefix.1"; + $localAddress = "$ipPrefix.2"; + 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; push @conf, "PRIVATE_NETWORK=1\n"; diff --git a/nixpkgs/pkgs/tools/virtualization/udocker/default.nix b/nixpkgs/pkgs/tools/virtualization/udocker/default.nix index 98046a8e0438..7d06b59b013c 100644 --- a/nixpkgs/pkgs/tools/virtualization/udocker/default.nix +++ b/nixpkgs/pkgs/tools/virtualization/udocker/default.nix @@ -2,14 +2,14 @@ buildPythonApplication rec { - version = "1.1.1"; + version = "1.1.3"; pname = "udocker"; src = fetchFromGitHub rec { owner = "indigo-dc"; repo = "udocker" ; rev = "v${version}"; - sha256 = "134xk7rfj0xki9znryk5qf1nsfa318ahrrsi1k6ia7kipp7i3hb4"; + sha256 = "1c8y1p3brj987drikwrby8m1hdr40ja4anx0p4xsij3ll2h62w6z"; }; buildInputs = [ proot patchelf fakechroot runc simplejson pycurl coreutils ]; |