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

Backport #282886 to release 23.11 #302113

Merged
merged 5 commits into from
Apr 7, 2024
Merged

Backport #282886 to release 23.11 #302113

merged 5 commits into from
Apr 7, 2024

Conversation

the-sun-will-rise-tomorrow
Copy link
Contributor

@the-sun-will-rise-tomorrow the-sun-will-rise-tomorrow commented Apr 6, 2024 •
edited
Loading

Description of changes

Backport of #282886

Conflicts needed to be resolved due to dockertools.section.md having been refactored in master.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.05 Release Notes (or backporting 23.05 and 23.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@the-sun-will-rise-tomorrow
streamLayeredImage: Allow customizing ownership
de09cdb 
This opens the way towards building images where Nix can be used as an
unprivileged user (in single-user mode).

(cherry picked from commit 0ec13cd)
@the-sun-will-rise-tomorrow
streamLayeredImage: Change mode of /nix, /nix/store to 755
3cc2f49 
The change is insignificant when the owner is root.  However, when it
is not root, this change is needed to allow using Nix (as an
unprivileged user) inside the container.

(cherry picked from commit 2697d34)
@the-sun-will-rise-tomorrow
Document the new streamLayeredImage parameters
4be2b69 
(cherry picked from commit 7799f46)
@the-sun-will-rise-tomorrow
Remove the redundant comments from streamLayeredImage parameters
c550400 
The proper place to describe them is the documentation, where they are
described thoroughly.

(cherry picked from commit b2f1998)
@the-sun-will-rise-tomorrow
dockerTools.tests.docker-tools: Add non-root streamLayeredImage test
d6293f8 
(cherry picked from commit 4733b52)
@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 labels Apr 6, 2024
This was referenced Apr 6, 2024
Merged
Merged
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux labels Apr 6, 2024
@the-sun-will-rise-tomorrow the-sun-will-rise-tomorrow marked this pull request as ready for review April 6, 2024 15:53
@the-sun-will-rise-tomorrow
Copy link
Contributor Author

@ofborg build nixosTests.docker-tools

@roberth roberth merged commit a892b97 into NixOS:release-23.11 Apr 7, 2024
26 of 27 checks passed
@roberth
Copy link
Member

roberth commented Apr 7, 2024

Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@roberth roberth Awaiting requested review from roberth roberth is a code owner

Assignees
No one assigned
Labels
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 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@the-sun-will-rise-tomorrow @roberth