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: mark streamLayerdImage result as isExe #99375

Merged
merged 1 commit into from Oct 5, 2020

Conversation

@roberth
Copy link
Contributor

@roberth roberth commented Oct 2, 2020

Motivation for this change

Allow build*Image and streamLayeredImage to be used interchangeably in code that supports both methods,
by streamImageCommand or by tools like arion.

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)

    • I have decided not to test every branch of the function in its own test case to keep the tests reasonably fast and focused. I did test it manually.
  • 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.

Copy link
Member

@utdemir utdemir left a comment

I can't say that I completely understand this PR. It seems like we're trying to achieve a kind of polymorphism. However, that doesn't seem very Nix-y to me; I don't see how that polymorphism would be more preferable over the old boring way of using two different functions to manipulate two different derivations.

However, since you do seem to have a need for it; I prefer not to explicitly approve or disapprove this PR, so with apologies, I prefer someone else to review it.

@roberth roberth force-pushed the hercules-ci:mark-streamLayeredImage branch from a956546 to 11b0106 Oct 5, 2020
@ofborg ofborg bot removed the 6.topic: nixos label Oct 5, 2020
@roberth
Copy link
Contributor Author

@roberth roberth commented Oct 5, 2020

I agree that overly polymorphic code is a bad idea, so I've removed the extra function that wasn't quite necessary.

For compatibility, Arion supports both the stream and build variations. Adding only the isExe attribute makes that just a little bit more robust and it could be useful for some other application, particularly if their code doesn't control the expression that produces the image.

@utdemir
utdemir approved these changes Oct 5, 2020
Copy link
Member

@utdemir utdemir left a comment

Thank you @roberth, I'm much more happy with this PR in this state, I don't see any harm from exposing isExe.

@roberth
Copy link
Contributor Author

@roberth roberth commented Oct 5, 2020

Thank you for the reviews @utdemir

@roberth roberth merged commit 2d44a36 into NixOS:master Oct 5, 2020
16 checks passed
16 checks passed
tests tests
Details
action
Details
Evaluation Performance Report Evaluator Performance Report
Details
Wait for ofborg
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="11b0106"; rev="11b0106cf9ca3442870ba961e6c4adf6b44b6615"; } ./pkgs/t
Details
grahamcofborg-eval-lib-tests nix-build --arg pkgs import ./. {} ./lib/tests/release.nix
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="11b0106"; rev="11b0106cf9ca3442870ba961e6c4adf6b44b6615"; } ./nixos/
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="11b0106"; rev="11b0106cf9ca3442870ba961e6c4adf6b44b6615"; } ./nixos/
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="11b0106"; rev="11b0106cf9ca3442870ba961e6c4adf6b44b6615"; } ./nixos/
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="11b0106"; rev="11b0106cf9ca3442870ba961e6c4adf6b44b6615"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="11b0106"; rev="11b0106cf9ca3442870ba961e6c4adf6b44b6615"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="11b0106"; rev="11b0106cf9ca3442870ba961e6c4adf6b44b6615"; } ./pkgs/t
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
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.