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.

Sign up for GitHub

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_18_09: fix build #98264

Merged
merged 1 commit into from Sep 20, 2020
Merged

docker_18_09: fix build #98264

merged 1 commit into from Sep 20, 2020

Conversation

r-burns
Copy link
Contributor

@r-burns r-burns commented Sep 19, 2020

The cross-compiler patch introduced in #92140 fixes an issue in Docker CE 19.03+, and will not apply to (and is not needed for) previous versions.

See also:
docker/docker-ce@2a37fdb
docker/docker-ce@2fdfb44

Motivation for this change

ZHF 20.09 #97479

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 (Ubuntu x86_64)
  • 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.

docker_18_09: fix build
ab96727 
The cross-compilation patch introduced in
NixOS#92140
fixes an issue introduced in Docker CE 19.03,
and will not apply to (and is not needed for)
previous versions.
@periklis periklis removed their request for review September 19, 2020 15:40
jonringer
jonringer approved these changes Sep 20, 2020
View reviewed changes
Copy link
Contributor

@jonringer jonringer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Result of nixpkgs-review pr 98264 1

1 package built:
  • docker_18_09

@jonringer jonringer merged commit 9d58eb4 into NixOS:master Sep 20, 2020
@r-burns r-burns mentioned this pull request Sep 20, 2020
Merged
10 tasks
@r-burns r-burns deleted the docker18.09 branch August 28, 2021 06:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jonringer jonringer jonringer approved these changes

@offlinehacker offlinehacker Awaiting requested review from offlinehacker

@tailhook tailhook Awaiting requested review from tailhook

@vdemeester vdemeester Awaiting requested review from vdemeester

@NeQuissimus NeQuissimus Awaiting requested review from NeQuissimus

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

Successfully merging this pull request may close these issues.

None yet
2 participants
@r-burns @jonringer