Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: f435d75d79b7
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: af23d1e2e7e2
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Mar 6, 2019

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

    @nlewo
    nlewo committed Mar 6, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    af23d1e View commit details
Showing with 5 additions and 5 deletions.
  1. +2 −2 nixos/tests/docker-tools.nix
  2. +3 −3 pkgs/build-support/docker/examples.nix
4 changes: 2 additions & 2 deletions nixos/tests/docker-tools.nix
View file
Original file line number Diff line number Diff line change
@@ -34,8 +34,8 @@ import ./make-test.nix ({ pkgs, ... }: {
# To test the pullImage tool
$docker->succeed("docker load --input='${pkgs.dockerTools.examples.nixFromDockerHub}'");
$docker->succeed("docker run --rm nixos/nix:1.11 nix-store --version");
$docker->succeed("docker rmi nixos/nix:1.11");
$docker->succeed("docker run --rm nixos/nix:2.2.1 nix-store --version");
$docker->succeed("docker rmi nixos/nix:2.2.1");
# To test runAsRoot and entry point
$docker->succeed("docker load --input='${pkgs.dockerTools.examples.nginx}'");
6 changes: 3 additions & 3 deletions pkgs/build-support/docker/examples.nix
View file
Original file line number Diff line number Diff line change
@@ -87,9 +87,9 @@ rec {
# 4. example of pulling an image. could be used as a base for other images
nixFromDockerHub = pullImage {
imageName = "nixos/nix";
imageDigest = "sha256:20d9485b25ecfd89204e843a962c1bd70e9cc6858d65d7f5fadc340246e2116b";
sha256 = "0mqjy3zq2v6rrhizgb9nvhczl87lcfphq9601wcprdika2jz7qh8";
finalImageTag = "1.11";
imageDigest = "sha256:85299d86263a3059cf19f419f9d286cc9f06d3c13146a8ebbb21b3437f598357";
sha256 = "0vnp3mhpk4ny3xa3cgngqsargnmvfgld54d5sn4b5av6yqzzp67z";
finalImageTag = "2.2.1";
};

# 5. example of multiple contents, emacs and vi happily coexisting