Navigation Menu

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

Jump to bottom

docker: 19.03.12 -> 19.03.13 #101752

Merged
merged 1 commit into from Oct 27, 2020
Merged

docker: 19.03.12 -> 19.03.13 #101752

merged 1 commit into from Oct 27, 2020

Conversation

ghost
Copy link

@ghost ghost commented Oct 26, 2020 •
edited by ghost

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.

@ghost
Copy link
Author

ghost 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.

@mweinelt
Copy link
Member

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

@mweinelt
Copy link
Member 

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

@mweinelt
Copy link
Member

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

@mweinelt
Copy link
Member

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

Some tests are failing, looks unrelated, but I'm not sure.

https://logs.nix.ci/?key=nixos/nixpkgs.101752&attempt_id=db3ff184-344b-416d-a8ff-d2d226f6226d

@mweinelt
Copy link
Member

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

docker: 19.03.12 -> 19.03.13
0dc4ced 
Added libseccomp and pkgconfig inputs to containerd, because 1.3.x requires them.
However containerd 1.2.x and 1.4.x do not.
@ghost
Copy link
Author

ghost commented Oct 27, 2020

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

@mweinelt
Copy link
Member

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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@offlinehacker offlinehacker Awaiting requested review from offlinehacker

@periklis periklis Awaiting requested review from periklis

@vdemeester vdemeester Awaiting requested review from vdemeester

@tailhook tailhook Awaiting requested review from tailhook

Assignees
No one assigned
Labels
8.has: documentation 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
1 participant
@mweinelt