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

Fix dockerTools.buildLayerImage with 2 layers #78834

Merged
merged 2 commits into from Jan 30, 2020
Merged

Fix dockerTools.buildLayerImage with 2 layers #78834

merged 2 commits into from Jan 30, 2020

Conversation

nlewo
Copy link
Member

@nlewo nlewo commented Jan 30, 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.

@nlewo nlewo requested a review from grahamc January 30, 2020 09:48
@nlewo nlewo mentioned this pull request Jan 30, 2020
Closed
10 tasks
@nlewo
Copy link
Member Author

nlewo commented Jan 30, 2020

@GrahamcOfBorg test docker-tools

@nlewo
dockerTools.buildLayeredImage: fix image with only 2 layers
283bcc1 
A test is also added to ensure an image with 2 layers can be built.
@nlewo
dockerTools.buildLayeredImage: assert maxLayers > 1
01a6847 
Since a layer is reserved for "customization", the image can not
contains less than 2 layers.

The user gets the following message at evaluation:

    nix-instantiate nixos/tests/docker-tools.nix
    trace: the maxLayers argument of dockerTools.buildLayeredImage function must be greather than 1 (current value: 1)
@nlewo nlewo merged commit 86f8732 into NixOS:master Jan 30, 2020
dtzWill pushed a commit to dtzWill/nixpkgs that referenced this pull request Jan 30, 2020
@nlewo @dtzWill
Merge pull request NixOS#78834 from nlewo/fix-two-layers-image
09d34c7 
Fix dockerTools.buildLayerImage with 2 layers

(cherry picked from commit 86f8732)
anna328p pushed a commit to anna328p/nixpkgs that referenced this pull request Feb 2, 2020
@nlewo @anna328p
Merge pull request NixOS#78834 from nlewo/fix-two-layers-image
1330f0c 
Fix dockerTools.buildLayerImage with 2 layers
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@grahamc grahamc Awaiting requested review from grahamc

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
1 participant
@nlewo