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

dockerTools.buildLayeredImage: store all paths passed in final layer (fix 78744) #80102

Merged
merged 2 commits into from Feb 14, 2020

Conversation

@nlewo
Copy link
Member

nlewo commented Feb 14, 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.
purefn and others added 2 commits Jan 29, 2020
Fixes #78744

My previous change broke when there are more packages than the maximum
number of layers. I had assumed that the `store-path-to-layer.sh` was
only ever passed a single store path, but that is not the case if
there are multiple packages going into the final layer. To fix this, we
loop through the paths going into the final layer, appending them to the
tar file and making sure they end up at the right path.
A regression test for #78744.
@nlewo

This comment has been minimized.

Copy link
Member Author

nlewo commented Feb 14, 2020

@GrahamcOfBorg test docker-tools

@nlewo nlewo merged commit d49804c into NixOS:master Feb 14, 2020
2 checks passed
2 checks passed
tests.docker-tools on aarch64-linux Success
Details
tests.docker-tools on x86_64-linux Success
Details
dtzWill added a commit to dtzWill/nixpkgs that referenced this pull request Feb 14, 2020
dockerTools.buildLayeredImage: store all paths passed in final layer (fix 78744)

(cherry picked from commit d49804c)
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
You can’t perform that action at this time.