From e6b1129f9d3c2010fba981307c72ad7d15717d3d Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 29 Sep 2023 20:51:59 +0300 Subject: feat: rewrite tarball generation to use proper nixos-install + nixos-enter Supersedes #243. --- tests/docker/docker.Tests.ps1 | 1 - 1 file changed, 1 deletion(-) (limited to 'tests/docker') diff --git a/tests/docker/docker.Tests.ps1 b/tests/docker/docker.Tests.ps1 index fefff07..9ea46aa 100644 --- a/tests/docker/docker.Tests.ps1 +++ b/tests/docker/docker.Tests.ps1 @@ -27,7 +27,6 @@ Describe "Docker (native)" { It "should be possible to connect to the internet from a container" { $distro.Launch("docker run --rm -it alpine wget -qO- http://www.msftconnecttest.com/connecttest.txt") | Select-Object -Last 1 | Should -BeExactly "Microsoft Connect Test" - # docker exec -it $distro.id /nix/nixos-wsl/entrypoint -c "docker run --rm -it alpine wget -qO- http://www.msftconnecttest.com/connecttest.txt" | Select-Object -Last 1 | Should -BeExactly "Microsoft Connect Test" $LASTEXITCODE | Should -Be 0 } -- cgit v1.2.3 From 9bff9a09a4eb89ca814d4e069c00e52f6c901cdf Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 29 Sep 2023 22:31:16 +0300 Subject: fix: remove deprecated options from test --- tests/docker/docker-native.nix | 4 ---- 1 file changed, 4 deletions(-) (limited to 'tests/docker') diff --git a/tests/docker/docker-native.nix b/tests/docker/docker-native.nix index 47ccb7f..f9319fe 100644 --- a/tests/docker/docker-native.nix +++ b/tests/docker/docker-native.nix @@ -1,10 +1,6 @@ -{ pkgs, lib, ... }: { imports = [ ./base.nix ]; - wsl.docker-native.enable = true; - wsl.docker-native.addToDockerGroup = true; - # Github Actions runners try to use aufs and fail if this is not set explicitly virtualisation.docker.daemon.settings = { "storage-driver" = "vfs"; -- cgit v1.2.3 From 5bca9165acee81d3187fb75df858db765de102cd Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 29 Sep 2023 22:36:09 +0300 Subject: cleanup: clean up tests, don't rely on base config --- tests/docker/docker-native.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'tests/docker') diff --git a/tests/docker/docker-native.nix b/tests/docker/docker-native.nix index f9319fe..f119482 100644 --- a/tests/docker/docker-native.nix +++ b/tests/docker/docker-native.nix @@ -1,8 +1,14 @@ { - imports = [ ./base.nix ]; + imports = [ + + ]; - # Github Actions runners try to use aufs and fail if this is not set explicitly - virtualisation.docker.daemon.settings = { - "storage-driver" = "vfs"; + wsl.enable = true; + users.users.nixos.extraGroups = [ "docker" ]; + + virtualisation.docker = { + enable = true; + # Github Actions runners try to use aufs and fail if this is not set explicitly + daemon.settings."storage-driver" = "vfs"; }; } -- cgit v1.2.3