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: Always set imageTag attribute #92934

Merged
merged 1 commit into from Jul 16, 2020
Merged

dockerTools: Always set imageTag attribute #92934

merged 1 commit into from Jul 16, 2020

Conversation

roberth
Copy link
Member

@roberth roberth commented Jul 11, 2020

The image tag can be specified or generated from the output hash.
Previously, a generated tag could be recovered from the evaluated
image with some string operations.

However, with the introduction of streamLayeredImage, it's not
feasible to compute the generated tag yourself.

With this change, the imageTag attribute is set unconditionally,
for the buildImage, buildLayeredImage, streamLayeredImage functions.

Motivation for this change
  • Make dockerTools easier to use
  • Keep arion working
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
dockerTools: Always set imageTag attribute
8c0459f 
The image tag can be specified or generated from the output hash.
Previously, a generated tag could be recovered from the evaluated
image with some string operations.

However, with the introduction of streamLayeredImage, it's not
feasible to compute the generated tag yourself.

With this change, the imageTag attribute is set unconditionally,
for the buildImage, buildLayeredImage, streamLayeredImage functions.
@roberth roberth requested a review from utdemir July 11, 2020 14:58
@utdemir
Copy link
Member

utdemir commented Jul 12, 2020

LGTM, sorry for the change, and thanks for the tests!

The duplication of logic between streamLayeredImage and buildImage start to be an issue, so I guess there is some benefit to merge those two code paths at one point (of course not in the scope of this PR).

@roberth
Copy link
Member Author

roberth commented Jul 16, 2020

Those bash scripts became untenable, so I'm really glad you rewrote it. So thank you, and thanks for the review!

@roberth roberth merged commit c1908bf into NixOS:master Jul 16, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@utdemir utdemir utdemir 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
@roberth @utdemir