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 cross compile fixes v2 #92140

Merged
merged 4 commits into from Aug 24, 2020
Merged

Docker cross compile fixes v2 #92140

merged 4 commits into from Aug 24, 2020

Conversation

betaboon
Copy link
Contributor

@betaboon betaboon commented Jul 3, 2020 •
edited

Motivation for this change

#68900

cross-compiling docker on armv7l is still blocked by #50925 (btrfs-progs fails to cross-compile)
you can cross-compile docker for armv7l by overriding btrfs-progs = null.

cc @nspin

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.

@periklis periklis removed their request for review July 28, 2020 11:44
@FRidh FRidh changed the base branch from master to staging August 24, 2020 10:09
@FRidh FRidh merged commit 6d122d6 into NixOS:staging Aug 24, 2020
@betaboon
Copy link
Contributor Author

@FRidh thanks :)

@betaboon betaboon deleted the docker-cross-compile-fixes branch August 24, 2020 13:11
@zowoq zowoq mentioned this pull request Aug 28, 2020
Closed
@r-burns r-burns mentioned this pull request Sep 19, 2020
Merged
10 tasks
jonringer pushed a commit that referenced this pull request Sep 20, 2020
docker_18_09: fix build
9d58eb4 
The cross-compilation patch introduced in
#92140
fixes an issue introduced in Docker CE 19.03,
and will not apply to (and is not needed for)
previous versions.
r-burns pushed a commit to r-burns/nixpkgs that referenced this pull request Sep 20, 2020
@r-burns
docker_18_09: fix build
cba11bc 
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.
jonringer pushed a commit that referenced this pull request Sep 20, 2020
docker_18_09: fix build
b582883 
The cross-compilation patch introduced in
#92140
fixes an issue introduced in Docker CE 19.03,
and will not apply to (and is not needed for)
previous versions.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@vdemeester vdemeester Awaiting requested review from vdemeester

@NeQuissimus NeQuissimus Awaiting requested review from NeQuissimus

@tailhook tailhook Awaiting requested review from tailhook

@offlinehacker offlinehacker Awaiting requested review from offlinehacker

@kalbasit kalbasit Awaiting requested review from kalbasit

@Mic92 Mic92 Awaiting requested review from Mic92

@zowoq zowoq Awaiting requested review from zowoq

Assignees
No one assigned
Labels
8.has: documentation 8.has: package (new) 10.rebuild-darwin: 501-1000 10.rebuild-darwin: 501+ 10.rebuild-linux: 501-1000 10.rebuild-linux: 501+
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@betaboon @FRidh @nspin