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

dockerTools.buildImage: fix two bugs introduced in c88337c9aca9d91804da7d1d05960c88e17455c9 #52109

Merged
merged 1 commit into from Dec 27, 2018
Merged

dockerTools.buildImage: fix two bugs introduced in c88337c9aca9d91804da7d1d05960c88e17455c9 #52109

merged 1 commit into from Dec 27, 2018

Conversation

djahandarie
Copy link
Contributor

@djahandarie djahandarie commented Dec 14, 2018 •
edited

Motivation for this change

The new docker.buildImage introduced a little over a week ago was not working in the case you provide a fromImage (plus perhaps some other conditions?).

This could use a test-case directly in the examples, which this PR doesn't provide.

cc @grahamc

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • 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 nox --run "nox-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)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@djahandarie
Copy link
Contributor Author

Thanks @puffnfresh.

@grahamc Any further thoughts here or is this good to go? docker.buildImage is pretty broken without this...

@grahamc
Copy link
Member

grahamc commented Dec 26, 2018 via email

@nlewo nlewo mentioned this pull request Dec 27, 2018
Merged
10 tasks
nlewo added a commit to nlewo/nixpkgs that referenced this pull request Dec 27, 2018
@nlewo
dockerTools.examples.runAsRootParentImage: init
43cbba0 
Example of running something as root on top of a parent image.
This is a regression test related to the PR NixOS#52109.
nlewo
nlewo approved these changes Dec 27, 2018
View reviewed changes
Copy link
Member

@nlewo nlewo left a comment

Choose a reason for hiding this comment

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

I submitted a regression test in PR #52959.

@nlewo nlewo merged commit 23ebff3 into NixOS:master Dec 27, 2018
@nlewo nlewo mentioned this pull request Jan 4, 2019
Closed
globin pushed a commit to mayflower/nixpkgs that referenced this pull request Jan 7, 2019
@nlewo @globin
dockerTools.examples.runAsRootParentImage: init
1e1809a 
Example of running something as root on top of a parent image.
This is a regression test related to the PR NixOS#52109.

(cherry picked from commit 43cbba0)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@puffnfresh puffnfresh puffnfresh approved these changes

@nlewo nlewo nlewo approved these changes

Assignees
No one assigned
Labels
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
5 participants
@djahandarie @grahamc @puffnfresh @nlewo @GrahamcOfBorg