mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-27 01:13:05 +00:00
8c868f47a8
Annoyed with the interference of the python formatting of
generated code (see #72964), I took matters into my own hands
as maintainer of dockerTools.
Afterwards, I've created a PR, hoping to unstuck the discussion.
@aszlig took notice and thanks to his python ecosystem knowledge,
the testing efforts of @blaggacao and @Ma27, and a sense of
shared suffering and comraderie we were able to change the
situation for the better in #122201.
Now, we have a proper linter that actually helps contributors,
so it's time to turn it back on again.
I'm glad we could make it happen this quickly!
Thanks!
This reverts commit 4035049af3.
34 lines
1.0 KiB
Nix
34 lines
1.0 KiB
Nix
# this test creates a simple GNU image with docker tools and sees if it executes
|
|
|
|
import ./make-test-python.nix ({ pkgs, ... }:
|
|
{
|
|
name = "docker-tools-overlay";
|
|
meta = with pkgs.lib.maintainers; {
|
|
maintainers = [ lnl7 roberth ];
|
|
};
|
|
|
|
nodes = {
|
|
docker =
|
|
{ ... }:
|
|
{
|
|
virtualisation.docker.enable = true;
|
|
virtualisation.docker.storageDriver = "overlay"; # defaults to overlay2
|
|
};
|
|
};
|
|
|
|
testScript = ''
|
|
docker.wait_for_unit("sockets.target")
|
|
|
|
docker.succeed(
|
|
"docker load --input='${pkgs.dockerTools.examples.bash}'",
|
|
"docker run --rm ${pkgs.dockerTools.examples.bash.imageName} bash --version",
|
|
)
|
|
|
|
# Check if the nix store has correct user permissions depending on what
|
|
# storage driver is used, incorrectly built images can show up as readonly.
|
|
# drw------- 3 0 0 3 Apr 14 11:36 /nix
|
|
# drw------- 99 0 0 100 Apr 14 11:36 /nix/store
|
|
docker.succeed("docker run --rm -u 1000:1000 ${pkgs.dockerTools.examples.bash.imageName} bash --version")
|
|
'';
|
|
})
|