public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos/test/docker-tools: fix Nix image digest

Browse Source
This commit is contained in:
Antoine Eiche 2019-03-06 09:18:35 +01:00
parent f435d75d79
commit af23d1e2e7
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nixos/tests/docker-tools.nix
View File

@ -34,8 +34,8 @@ import ./make-test.nix ({ pkgs, ... }: {
# To test the pullImage tool # To test the pullImage tool
$docker->succeed("docker load --input='${pkgs.dockerTools.examples.nixFromDockerHub}'"); $docker->succeed("docker load --input='${pkgs.dockerTools.examples.nixFromDockerHub}'");
$docker->succeed("docker run --rm nixos/nix:1.11 nix-store --version"); $docker->succeed("docker run --rm nixos/nix:2.2.1 nix-store --version");
$docker->succeed("docker rmi nixos/nix:1.11"); $docker->succeed("docker rmi nixos/nix:2.2.1");
# To test runAsRoot and entry point # To test runAsRoot and entry point
$docker->succeed("docker load --input='${pkgs.dockerTools.examples.nginx}'"); $docker->succeed("docker load --input='${pkgs.dockerTools.examples.nginx}'");

6
pkgs/build-support/docker/examples.nix
View File

@ -87,9 +87,9 @@ rec {
# 4. example of pulling an image. could be used as a base for other images # 4. example of pulling an image. could be used as a base for other images
nixFromDockerHub = pullImage { nixFromDockerHub = pullImage {
imageName = "nixos/nix"; imageName = "nixos/nix";
imageDigest = "sha256:20d9485b25ecfd89204e843a962c1bd70e9cc6858d65d7f5fadc340246e2116b"; imageDigest = "sha256:85299d86263a3059cf19f419f9d286cc9f06d3c13146a8ebbb21b3437f598357";
sha256 = "0mqjy3zq2v6rrhizgb9nvhczl87lcfphq9601wcprdika2jz7qh8"; sha256 = "0vnp3mhpk4ny3xa3cgngqsargnmvfgld54d5sn4b5av6yqzzp67z";
finalImageTag = "1.11"; finalImageTag = "2.2.1";
}; };
# 5. example of multiple contents, emacs and vi happily coexisting # 5. example of multiple contents, emacs and vi happily coexisting