alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #181544 from qowoz/misc-deprecations

Browse source 
dockerTools, nixos/kubernetes: fix deprecations
This commit is contained in:
Robert Hensing 2022-07-15 09:14:37 +02:00 committed by GitHub
parent 2aed985790 0c98db7b91
commit 26839ce8e0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 21 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
nixos/modules/services/cluster/kubernetes/kubelet.nix
View file

@ -23,7 +23,11 @@ let
infraContainer = pkgs.dockerTools.buildImage { infraContainer = pkgs.dockerTools.buildImage {
name = "pause"; name = "pause";
tag = "latest"; tag = "latest";
contents = top.package.pause; copyToRoot = pkgs.buildEnv {
name = "image-root";
pathsToLink = [ "/bin" ];
paths = [ top.package.pause ];
};
config.Cmd = ["/bin/pause"]; config.Cmd = ["/bin/pause"];
}; };

12
nixos/tests/kubernetes/dns.nix
View file

@ -33,7 +33,11 @@ let
redisImage = pkgs.dockerTools.buildImage { redisImage = pkgs.dockerTools.buildImage {
name = "redis"; name = "redis";
tag = "latest"; tag = "latest";
contents = [ pkgs.redis pkgs.bind.host ]; copyToRoot = pkgs.buildEnv {
name = "image-root";
pathsToLink = [ "/bin" ];
paths = [ pkgs.redis pkgs.bind.host ];
};
config.Entrypoint = ["/bin/redis-server"]; config.Entrypoint = ["/bin/redis-server"];
}; };
@ -54,7 +58,11 @@ let
probeImage = pkgs.dockerTools.buildImage { probeImage = pkgs.dockerTools.buildImage {
name = "probe"; name = "probe";
tag = "latest"; tag = "latest";
contents = [ pkgs.bind.host pkgs.busybox ]; copyToRoot = pkgs.buildEnv {
name = "image-root";
pathsToLink = [ "/bin" ];
paths = [ pkgs.bind.host pkgs.busybox ];
};
config.Entrypoint = ["/bin/tail"]; config.Entrypoint = ["/bin/tail"];
}; };

6
nixos/tests/kubernetes/rbac.nix
View file

@ -84,7 +84,11 @@ let
kubectlImage = pkgs.dockerTools.buildImage { kubectlImage = pkgs.dockerTools.buildImage {
name = "kubectl"; name = "kubectl";
tag = "latest"; tag = "latest";
contents = [ copyKubectl pkgs.busybox kubectlPod2 ]; copyToRoot = pkgs.buildEnv {
name = "image-root";
pathsToLink = [ "/bin" ];
paths = [ copyKubectl pkgs.busybox kubectlPod2 ];
};
config.Entrypoint = ["/bin/sh"]; config.Entrypoint = ["/bin/sh"];
}; };

2
pkgs/build-support/docker/examples.nix
View file

@ -588,7 +588,7 @@ rec {
chown 1000 ./home/jane chown 1000 ./home/jane
ln -s ${pkgs.hello.overrideAttrs (o: { ln -s ${pkgs.hello.overrideAttrs (o: {
# A unique `hello` to make sure that it isn't included via another mechanism by accident. # A unique `hello` to make sure that it isn't included via another mechanism by accident.
configureFlags = o.configureFlags or "" + " --program-prefix=layeredImageWithFakeRootCommands-"; configureFlags = o.configureFlags or [] ++ [ " --program-prefix=layeredImageWithFakeRootCommands-" ];
doCheck = false; doCheck = false;
})} ./hello })} ./hello
''; '';