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

dockerTools.buildLayeredImage: Fix cross compilation #104271

Merged
merged 4 commits into from Nov 19, 2020
Merged

dockerTools.buildLayeredImage: Fix cross compilation #104271

merged 4 commits into from Nov 19, 2020

Conversation

adisbladis
Copy link
Member

@adisbladis adisbladis commented Nov 19, 2020 •
edited

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.

roberth
roberth reviewed Nov 19, 2020
View reviewed changes
Copy link
Member

@roberth roberth left a comment

Choose a reason for hiding this comment

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

Thanks!
Let's make sure this doesn't break again by adding a test. Could you

  • add an example of cross compilation to pkgs/build-support/docker/examples.nix?
  • add a test case in nixos/tests/docker-tools.nix? Just docker loading it is already useful. If that's not possible, just reference the example in a comment that explains why we can't easily load it yet.

You may be able to run the cross compiled image by loading it in a separate NixOS test that runs on the intended system type. Is that something you're comfortable with?

pkgs/build-support/docker/default.nix Outdated Show resolved Hide resolved
pkgs/build-support/docker/default.nix Show resolved Hide resolved
@adisbladis
Copy link
Member Author

@roberth All taken care of :)

roberth
roberth approved these changes Nov 19, 2020
View reviewed changes
Copy link
Member

@roberth roberth left a comment

Choose a reason for hiding this comment

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

Looks good. Thank you!

@roberth roberth merged commit c68e739 into NixOS:master Nov 19, 2020
@terinjokes terinjokes mentioned this pull request Dec 12, 2020
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@roberth roberth roberth approved these changes

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

Successfully merging this pull request may close these issues.

None yet
2 participants
@adisbladis @roberth