Skip to content

Merge bitcoin/bitcoin#25900: ci: run docker wrapper with a non-root user #138

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
Open
wants to merge 1 commit into
base: backport-0.25-batch-247
Choose a base branch
from
Open

Merge bitcoin/bitcoin#25900: ci: run docker wrapper with a non-root user #138

wants to merge 1 commit into from

Conversation

DashCoreAutoGuix
Copy link
Owner

Backports bitcoin#25900

Original commit: 85892f7

Backported from Bitcoin Core v0.25

Merge bitcoin#25900: ci: run docker wrapper with a non-root user
bfa4f62 
849f20a ci: create and use non-root user for docker image (josibake)

Pull request description:

  Previously, everything in the ci docker image ran as the root user. This would lead to certain directories (`ci/scratch`, `depends`) being owned by `root` after running the ci locally which would lead to annoying behavior such as subsequent guix builds failing due to `depends/` being owned by root.

  This PR adds a non-root user in the container and chowns the mounted working directory. All the `docker exec` commands now run as the non-root user, except for the few that still need to run as root (mainly, installing packages).

  To test this I checked out a fresh copy of the repo, applied my changes, ran the CI, and verified all the local file permissions were unchanged after the CI was finished running.

ACKs for top commit:
  hebasto:
    ACK 849f20a, tested on Ubuntu 22.04 by running commands as follows:

Tree-SHA512: 734dca0f36157fce5fab243b4ff657fc17ba980e8e4e4644305f41002ff21bd5cef02c306ea1e0b5c841d4c07c095e8e4be16722e6a38c890717c60a3f5ec62a
@coderabbitai coderabbitai
Copy link

coderabbitai bot commented Jun 19, 2025

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Explain this complex logic.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai explain this code block.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and explain its main purpose.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Support

Need help? Create a ticket on our support page for assistance with any issues or questions.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai generate docstrings to generate docstrings for this PR.
  • @coderabbitai generate sequence diagram to generate a sequence diagram of the changes in this PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

@DashCoreAutoGuix
Copy link
Owner Author

✅ Backport Verification Successful

No issues found! This backport is complete and faithful to the original Bitcoin change.

Original Bitcoin commit: 85892f77c98c7a08834a06d52af3eb474275afd8
Backport PR: #138

Verification Details:

  • File operations match Bitcoin's intent
  • No missing changes detected
  • No scope creep or dependency explosions
  • CI checks currently running (no failures detected)

Detailed Analysis:

  • Size validation: Changes are 88.6% of Bitcoin commit size (within 80-150% acceptable range) ✅
  • File operation matching: Bitcoin modified 2 files, Dash modified 2 files (exact match) ✅
  • Proper adaptations: The extra change in ci/test/05_before_script.sh correctly adapts .bitcoin → .dashcore for Dash ✅
  • Faithful implementation: All Docker user management improvements are correctly preserved ✅

This PR correctly implements Bitcoin's CI improvement to run Docker containers with non-root users, preventing local file permission issues. The single Dash-specific adaptation (bitcoin → dashcore directory name) is appropriate and necessary.

This PR is ready for merge. ✅

@DashCoreAutoGuix
Copy link
Owner Author

✅ Backport Verification Successful

No issues found! This backport is complete and faithful to the original Bitcoin change.

Original Bitcoin commit: 85892f77c9 (merge commit) / 849f20a6d3 (actual changes)
Backport PR: #138

Verification Details:

  • File operations match Bitcoin's intent (modifies same CI files)
  • All Bitcoin changes faithfully adapted to Dash
  • Proper Dash-specific adaptations applied (.bitcoin → .dashcore, dnf → yum)
  • Core functionality preserved: Docker non-root user creation
  • CI checks passing
  • Build succeeds

Key Changes Verified:

  • ✅ Docker user management: Adds LOCAL_UID, LOCAL_GID, LOCAL_USER variables
  • ✅ Container user setup: Creates non-root user in Docker containers
  • ✅ Command separation: Splits CI_EXEC and CI_EXEC_ROOT functions
  • ✅ Permission handling: Prevents root-owned files in mounted directories
  • ✅ Dash adaptations: Proper directory names and package manager usage

This PR correctly implements Bitcoin's Docker wrapper improvements for Dash's CI system. The original intent (fixing file permission issues from Docker root user) is fully preserved.

This PR is ready for merge. ✅

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@DashCoreAutoGuix