pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #122192 from roberth/docker-tools-stimulate-testing

dockerTools testing update

authored by

Robert Hensing and committed by
GitHub 3cfb002b 19af18b9

+11 -2
unified split
+3
nixos/tests/docker-tools-cross.nix
··· 73 "docker rmi ${hello2.imageName}", 74 ) 75 ''; 76 })
··· 73 "docker rmi ${hello2.imageName}", 74 ) 75 ''; 76 + 77 + # Remove when the formatter has been removed and a linter has been added 78 + skipLint = true; 79 })
+4 -1
nixos/tests/docker-tools-overlay.nix
··· 4 { 5 name = "docker-tools-overlay"; 6 meta = with pkgs.lib.maintainers; { 7 - maintainers = [ lnl7 ]; 8 }; 9 10 nodes = { ··· 30 # drw------- 99 0 0 100 Apr 14 11:36 /nix/store 31 docker.succeed("docker run --rm -u 1000:1000 ${pkgs.dockerTools.examples.bash.imageName} bash --version") 32 ''; 33 })
··· 4 { 5 name = "docker-tools-overlay"; 6 meta = with pkgs.lib.maintainers; { 7 + maintainers = [ lnl7 roberth ]; 8 }; 9 10 nodes = { ··· 30 # drw------- 99 0 0 100 Apr 14 11:36 /nix/store 31 docker.succeed("docker run --rm -u 1000:1000 ${pkgs.dockerTools.examples.bash.imageName} bash --version") 32 ''; 33 + 34 + # Remove when the formatter has been removed and a linter has been added 35 + skipLint = true; 36 })
+4 -1
nixos/tests/docker-tools.nix
··· 3 import ./make-test-python.nix ({ pkgs, ... }: { 4 name = "docker-tools"; 5 meta = with pkgs.lib.maintainers; { 6 - maintainers = [ lnl7 ]; 7 }; 8 9 nodes = { ··· 365 "docker run --rm ${examples.layeredImageWithFakeRootCommands.imageName} sh -c 'stat -c '%u' /home/jane | grep -E ^1000$'" 366 ) 367 ''; 368 })
··· 3 import ./make-test-python.nix ({ pkgs, ... }: { 4 name = "docker-tools"; 5 meta = with pkgs.lib.maintainers; { 6 + maintainers = [ lnl7 roberth ]; 7 }; 8 9 nodes = { ··· 365 "docker run --rm ${examples.layeredImageWithFakeRootCommands.imageName} sh -c 'stat -c '%u' /home/jane | grep -E ^1000$'" 366 ) 367 ''; 368 + 369 + # Remove when the formatter has been removed and a linter has been added 370 + skipLint = true; 371 })