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: Support mounting images with more than 16 layers (backport to 24.11) #392435

Draft
wants to merge 1 commit into
base: release-24.11
Choose a base branch
from

Conversation

charles-dyfis-net
Copy link
Contributor

24.11 variant of PR #392422, both addressing #392421.

When a Docker image contains more than 16 layers, the mount -t overlay command run to combine those into a single filesystem view fails.

To address this, we now loop in batches of 16 mount points until we've combined all layers into a single mount.

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/)
  • 25.05 Release Notes (or backporting 24.11 and 25.05 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.

@nix-owners nix-owners bot requested a review from roberth March 23, 2025 16:28
@github-actions github-actions 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 Mar 23, 2025
@wolfgangwalther
Copy link
Contributor

At first glance the changes in here look exactly the same as in the PR to master. We don't need two manually created PRs: We can merge the one to master, and then automatically backport via label.

Alternatively, you'll need to manually cherry-pick the commit once the PR is merged to master with the -x option.

@wolfgangwalther wolfgangwalther marked this pull request as draft March 24, 2025 19:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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
Development

Successfully merging this pull request may close these issues.

2 participants