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.pullImage: accept hash parameter #342400

Merged
merged 2 commits into from
Dec 9, 2024
Merged

dockerTools.pullImage: accept hash parameter #342400

merged 2 commits into from
Dec 9, 2024

Conversation

nbraud
Copy link
Contributor

@nbraud nbraud commented Sep 16, 2024 •
edited
Loading

Description of changes

Follow-up on #342072, contains its commits.

  • accept hash parameter in dockerTools.pullImage
  • produce a hash parameter in SRI format, from nix-prefetch-docker
  • update doc/dockertools

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • Tested compilation of all affected packages using nixpkgs-review
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@nbraud nbraud added 0.kind: enhancement Add something new 2.status: blocked by pr/issue Another PR or issue is preventing this from being completed labels Sep 16, 2024
@nbraud

This comment was marked as outdated.

Sign in to view
@nbraud
Copy link
Contributor Author

nbraud commented Sep 17, 2024

Rebased atop 342072's finalized state, still waiting on it to be merged

@github-actions github-actions bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: documentation This PR adds or changes documentation 8.has: module (update) This PR changes an existing module in `nixos/` 6.topic: fetch 6.topic: lib The Nixpkgs function library 6.topic: k3s Kubernates distribution (https://k3s.io/) labels Sep 17, 2024
@nbraud
Copy link
Contributor Author

nbraud commented Sep 17, 2024

Forgot to update this PR after renaming the lib.fetchers functions

@nbraud nbraud force-pushed the sha-to-SRI/docker branch 2 times, most recently from 64c3f66 to 9aabe5e Compare September 17, 2024 15:02
@nbraud nbraud marked this pull request as ready for review September 17, 2024 15:02
@nbraud nbraud requested a review from roberth as a code owner September 17, 2024 15:02
@nbraud nbraud removed the 2.status: blocked by pr/issue Another PR or issue is preventing this from being completed label Sep 17, 2024
@github-actions github-actions bot removed 6.topic: fetch 6.topic: lib The Nixpkgs function library labels Sep 17, 2024
@nbraud
Copy link
Contributor Author

nbraud commented Sep 17, 2024

Result of nixpkgs-review pr 342400 run on aarch64-darwin 1

3 packages built:
  • nix-prefetch-docker
  • nixpkgs-manual
  • nvfetcher

@nbraud
Copy link
Contributor Author

nbraud commented Sep 18, 2024

Result of nixpkgs-review pr 342400 run on x86_64-linux 1

2 packages blacklisted:
  • nixos-install-tools
  • tests.nixos-functions.nixos-test
6 packages built:
  • disko
  • haskellPackages.nvfetcher
  • haskellPackages.nvfetcher.doc
  • nix-prefetch-docker
  • nixpkgs-manual
  • nvfetcher

@nbraud nbraud added the needs_reviewer (old Marvin label, do not use) label Sep 18, 2024
@nbraud nbraud requested a review from Mic92 December 4, 2024 20:14
@nbraud
Copy link
Contributor Author

nbraud commented Dec 4, 2024 •
edited
Loading

@Mic92 I requested your review, since you very-recently touched dockerTools and the nominal code-owner hasn't responded since September.

@nbraud nbraud added the awaiting_reviewer (old Marvin label, do not use) label Dec 4, 2024
@nbraud nbraud requested a review from flandweber December 4, 2024 21:04
@Mic92
Copy link
Member

Mic92 commented Dec 5, 2024

Does it mean that both hash and sha256 are accepted as parameters?

@nbraud
Copy link
Contributor Author

nbraud commented Dec 5, 2024

Does it mean that both hash and sha256 are accepted as parameters?

Yes, lib.fetchers.withNormalizedHash converts both hash or sha256 parameters into outputHash{,Algo}.

@Mic92 Mic92 force-pushed the sha-to-SRI/docker branch from 442cf09 to 5720f42 Compare December 9, 2024 13:31
@Mic92 Mic92 merged commit ff8576f into NixOS:master Dec 9, 2024
21 of 22 checks passed
@nbraud
Copy link
Contributor Author

nbraud commented Dec 12, 2024

Thanks, @Mic92 ! ❤️

@nbraud nbraud deleted the sha-to-SRI/docker branch December 12, 2024 18:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Mic92 Mic92 Mic92 left review comments

@roberth roberth Awaiting requested review from roberth

@flandweber flandweber Awaiting requested review from flandweber

Assignees
No one assigned
Labels
0.kind: enhancement Add something new 6.topic: k3s Kubernates distribution (https://k3s.io/) 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: documentation This PR adds or changes documentation 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10 awaiting_reviewer (old Marvin label, do not use) needs_reviewer (old Marvin label, do not use)
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@nbraud @Mic92 @FliegendeWurst