ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-20 12:08:17 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #268853 from nevivurn/feat/gvisor-unbreak

Browse Source 
gvisor: 20221102.1 -> 20231113.0
This commit is contained in:
Robert Scott 2023-11-26 00:43:40 +00:00 committed by GitHub
commit b7a2c41788
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
nixos/tests/gvisor.nix
View File

@ -1,6 +1,6 @@
# This test runs a container through gvisor and checks if simple container starts
import ./make-test-python.nix ({ pkgs, ...} : {
import ./make-test-python.nix ({ pkgs, ... }: {
name = "gvisor";
meta = with pkgs.lib.maintainers; {
maintainers = [ andrew-d ];
@ -9,21 +9,21 @@ import ./make-test-python.nix ({ pkgs, ...} : {
nodes = {
gvisor =
{ pkgs, ... }:
{
virtualisation.docker = {
enable = true;
extraOptions = "--add-runtime runsc=${pkgs.gvisor}/bin/runsc";
};
networking = {
dhcpcd.enable = false;
defaultGateway = "192.168.1.1";
interfaces.eth1.ipv4.addresses = pkgs.lib.mkOverride 0 [
{ address = "192.168.1.2"; prefixLength = 24; }
];
};
{
virtualisation.docker = {
enable = true;
extraOptions = "--add-runtime runsc=${pkgs.gvisor}/bin/runsc";
};
};
networking = {
dhcpcd.enable = false;
defaultGateway = "192.168.1.1";
interfaces.eth1.ipv4.addresses = pkgs.lib.mkOverride 0 [
{ address = "192.168.1.2"; prefixLength = 24; }
];
};
};
};
testScript = ''
start_all()
@ -31,13 +31,7 @@ import ./make-test-python.nix ({ pkgs, ...} : {
gvisor.wait_for_unit("network.target")
gvisor.wait_for_unit("sockets.target")
# Start by verifying that gvisor itself works
output = gvisor.succeed(
"${pkgs.gvisor}/bin/runsc -alsologtostderr do ${pkgs.coreutils}/bin/echo hello world"
)
assert output.strip() == "hello world"
# Also test the Docker runtime
# Test the Docker runtime
gvisor.succeed("tar cv --files-from /dev/null | docker import - scratchimg")
gvisor.succeed(
"docker run -d --name=sleeping --runtime=runsc -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin scratchimg /bin/sleep 10"

13
pkgs/applications/virtualization/gvisor/default.nix
View File

@ -1,4 +1,5 @@
{ lib
, nixosTests
, buildGoModule
, fetchFromGitHub
, iproute2
@ -7,9 +8,9 @@
, procps
}:
buildGoModule rec {
buildGoModule {
pname = "gvisor";
version = "20221102.1";
version = "20231113.0";
# gvisor provides a synthetic go branch (https://github.com/google/gvisor/tree/go)
# that can be used to build gvisor without bazel.
@ -18,11 +19,11 @@ buildGoModule rec {
src = fetchFromGitHub {
owner = "google";
repo = "gvisor";
rev = "bf8eeee3a9eb966bc72c773da060a3c8bb73b8ff";
sha256 = "sha256-rADQsJ+AnBVlfQURGJl1xR6Ad5NyRWSrBSpOFMRld+o=";
rev = "cdaf5c462c4040ed4cc88989e43f7d373acb9d24";
hash = "sha256-9d2AJXoGFRCSM6900gOBxNBgL6nxXqz/pPan5EeEdsI=";
};
vendorHash = "sha256-iGLWxx/Kn1QaJTNOZcc+mwoF3ecEDOkaqmA0DH4pdgU=";
vendorHash = "sha256-QdsVELNcIVsZv2gA05YgQfMZ6hmnfN2GGqW6r+mHqbs=";
nativeBuildInputs = [ makeWrapper ];
@ -39,6 +40,8 @@ buildGoModule rec {
mv $out/bin/shim $out/bin/containerd-shim-runsc-v1
'';
passthru.tests = { inherit (nixosTests) gvisor; };
meta = with lib; {
description = "Application Kernel for Containers";
homepage = "https://github.com/google/gvisor";