Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

docker: 19.03.12 -> 19.03.13 #101752

Merged
merged 1 commit into from Oct 27, 2020
Merged

Conversation

@petabyteboy
Copy link
Member

@petabyteboy petabyteboy commented Oct 26, 2020

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
@petabyteboy petabyteboy force-pushed the petabyteboy:feature/docker-19-03-13 branch 2 times, most recently from 6c0d784 to 893b45f Oct 26, 2020
@petabyteboy
Copy link
Member Author

@petabyteboy petabyteboy commented Oct 26, 2020

I will make the dependencies conditional for containerd 1.3.x since they are not required for <=1.2.x or >=1.4.x, and Docker 18.09 still uses an older version, so we should not touch the Docker 18.09 derivation.

@petabyteboy petabyteboy force-pushed the petabyteboy:feature/docker-19-03-13 branch 2 times, most recently from 503a6d5 to 8a067f7 Oct 26, 2020
@mweinelt
Copy link
Member

@mweinelt mweinelt commented Oct 26, 2020

@ofborg test docker docker-edge docker-registry docker-tools docker-tools-overlay

@mweinelt
Copy link
Member

@mweinelt mweinelt commented Oct 26, 2020

builder for '/nix/store/5g9ann65lipv0qvg0smyvkybhc36s18f-docker-containerd-19.03.13.drv' failed with exit code 1; last 10 log lines:
  Perhaps you should add the directory containing `libseccomp.pc'
  to the PKG_CONFIG_PATH environment variable
  No package 'libseccomp' found
  Package libseccomp was not found in the pkg-config search path.
  Perhaps you should add the directory containing `libseccomp.pc'
  to the PKG_CONFIG_PATH environment variable
  No package 'libseccomp' found
  pkg-config: exit status 1
  make: *** [Makefile:188: bin/containerd] Error 2
  builder for '/nix/store/5g9ann65lipv0qvg0smyvkybhc36s18f-docker-containerd-19.03.13.drv' failed with exit code 2
cannot build derivation '/nix/store/sp0zrq59jrv3v0fkac2mnggkg5l6wbw9-docker-19.03.13.drv': 1 dependencies couldn't be built

@petabyteboy petabyteboy force-pushed the petabyteboy:feature/docker-19-03-13 branch from 8a067f7 to 410ea73 Oct 26, 2020
@mweinelt
Copy link
Member

@mweinelt mweinelt commented Oct 26, 2020

@ofborg test docker docker-edge docker-registry docker-tools docker-tools-overlay

@mweinelt
Copy link
Member

@mweinelt mweinelt commented Oct 26, 2020

Result of nixpkgs-review pr 101752 1

7 packages built:
  • charliecloud
  • docker
  • docker-gc
  • out-of-tree
  • pipework
  • python37Packages.jupyter-repo2docker
  • python38Packages.jupyter-repo2docker

@mweinelt
Copy link
Member

@mweinelt mweinelt commented Oct 26, 2020

@mweinelt
Copy link
Member

@mweinelt mweinelt commented Oct 26, 2020

The tests have been updated on master, can you rebase?

Added libseccomp and pkgconfig inputs to containerd, because 1.3.x requires them.
However containerd 1.2.x and 1.4.x do not.
@petabyteboy petabyteboy force-pushed the petabyteboy:feature/docker-19-03-13 branch from 410ea73 to 0dc4ced Oct 27, 2020
@petabyteboy
Copy link
Member Author

@petabyteboy petabyteboy commented Oct 27, 2020

@ofborg test docker docker-edge docker-registry docker-tools docker-tools-overlay

@mweinelt
Copy link
Member

@mweinelt mweinelt commented Oct 27, 2020

Result of nixpkgs-review pr 101752 1

1 package blacklisted:
  • tests.nixos-functions.nixos-test
7 packages built:
  • charliecloud
  • docker (docker-edge ,docker_19_03)
  • docker-gc
  • out-of-tree
  • pipework
  • python37Packages.jupyter-repo2docker
  • python38Packages.jupyter-repo2docker

@mweinelt mweinelt merged commit 91e28cf into NixOS:master Oct 27, 2020
21 checks passed
21 checks passed
@github-actions
tests
Details
@github-actions
action
Details
@ofborg
Evaluation Performance Report Evaluator Performance Report
Details
@github-actions
Wait for ofborg
Details
@ofborg
docker, docker.passthru.tests on aarch64-linux Success
Details
@ofborg
docker, docker.passthru.tests on x86_64-linux Success
Details
@ofborg
grahamcofborg-eval ^.^!
Details
@ofborg
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
@ofborg
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
@ofborg
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="0dc4ced"; rev="0dc4ced3ebe71f6c91bfa22540f88cfabeb8bfea"; } ./pkgs/t
Details
@ofborg
grahamcofborg-eval-lib-tests nix-build --arg pkgs import ./. {} ./lib/tests/release.nix
Details
@ofborg
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="0dc4ced"; rev="0dc4ced3ebe71f6c91bfa22540f88cfabeb8bfea"; } ./nixos/
Details
@ofborg
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="0dc4ced"; rev="0dc4ced3ebe71f6c91bfa22540f88cfabeb8bfea"; } ./nixos/
Details
@ofborg
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="0dc4ced"; rev="0dc4ced3ebe71f6c91bfa22540f88cfabeb8bfea"; } ./nixos/
Details
@ofborg
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="0dc4ced"; rev="0dc4ced3ebe71f6c91bfa22540f88cfabeb8bfea"; } ./pkgs/t
Details
@ofborg
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="0dc4ced"; rev="0dc4ced3ebe71f6c91bfa22540f88cfabeb8bfea"; } ./pkgs/t
Details
@ofborg
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="0dc4ced"; rev="0dc4ced3ebe71f6c91bfa22540f88cfabeb8bfea"; } ./pkgs/t
Details
@ofborg
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
@ofborg
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
@ofborg
tests.docker, tests.docker-edge, tests.docker-registry, tests.docker-tools, tests.docker-tools-overlay on aarch64-linux Success
Details
@ofborg
tests.docker, tests.docker-edge, tests.docker-registry, tests.docker-tools, tests.docker-tools-overlay on x86_64-linux Success
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants