Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 63bd666c8f49
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: b3d20c3d5039
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Jun 27, 2020

  1. docker: 19.03.11 -> 19.03.12 

    (cherry picked from commit fcede31)
    @Frostman @Ma27
    Frostman authored and Ma27 committed Jun 27, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    0c486cf View commit details

  2. docker: use git tags instead of revs 

    (cherry picked from commit afc8bd6)
    @Frostman @Ma27
    Frostman authored and Ma27 committed Jun 27, 2020
    Copy the full SHA
    b3d20c3 View commit details
Showing with 8 additions and 8 deletions.
  1. +2 −2 nixos/tests/docker.nix
  2. +6 −6 pkgs/applications/virtualization/docker/default.nix
4 changes: 2 additions & 2 deletions nixos/tests/docker.nix
View file
Original file line number Diff line number Diff line change
@@ -43,7 +43,7 @@ import ./make-test-python.nix ({ pkgs, ...} : {
docker.fail("sudo -u noprivs docker ps")
docker.succeed("docker stop sleeping")
# Must match version twice to ensure client and server versions are correct
docker.succeed('[ $(docker version | grep ${pkgs.docker.version} | wc -l) = "2" ]')
# Must match version 4 times to ensure client and server git commits and versions are correct
docker.succeed('[ $(docker version | grep ${pkgs.docker.version} | wc -l) = "4" ]')
'';
})
12 changes: 6 additions & 6 deletions pkgs/applications/virtualization/docker/default.nix
View file
Original file line number Diff line number Diff line change
@@ -184,9 +184,9 @@ rec {
# Get revisions from
# https://github.com/docker/docker-ce/tree/${version}/components/engine/hack/dockerfile/install/*

docker_18_09 = makeOverridable dockerGen {
docker_18_09 = makeOverridable dockerGen rec {
version = "18.09.9";
rev = "039a7df9ba8097dd987370782fcdd6ea79b26016";
rev = "v${version}";
sha256 = "0wqhjx9qs96q2jd091wffn3cyv2aslqn2cvpdpgljk8yr9s0yg7h";
runcRev = "3e425f80a8c931f88e6d94a8c831b9d5aa481657";
runcSha256 = "18psc830b2rkwml1x6vxngam5b5wi3pj14mw817rshpzy87prspj";
@@ -196,10 +196,10 @@ rec {
tiniSha256 = "1h20i3wwlbd8x4jr2gz68hgklh0lb0jj7y5xk1wvr8y58fip1rdn";
};

docker_19_03 = makeOverridable dockerGen {
version = "19.03.11";
rev = "42e35e61f352e527082521280d5ea3761f0dee50";
sha256 = "0q4l4z2bg269hj1dqaq02f84zgp3p8idw1cxczw383cjl0ra8xgq";
docker_19_03 = makeOverridable dockerGen rec {
version = "19.03.12";
rev = "v${version}";
sha256 = "0i5xr8q3yjrz5zsjcq63v4g1mzqpingjr1hbf9amk14484i2wkw7";
runcRev = "dc9208a3303feef5b3839f4323d9beb36df0a9dd"; # v1.0.0-rc10
runcSha256 = "0pi3rvj585997m4z9ljkxz2z9yxf9p2jr0pmqbqrc7bc95f5hagk";
containerdRev = "7ad184331fa3e55e52b890ea95e65ba581ae3429"; # v1.2.13