Skip to content

Conversation

kkaarreell
Copy link
Collaborator

@kkaarreell kkaarreell commented Oct 21, 2025

Summary by Sourcery

Preserve SSH credentials and DNS settings during image build and tests by copying SSH keys and resolv.conf into the build context and container image.

Enhancements:

  • Copy /root/.ssh and /etc/resolv.conf to the working directory in the test script for inclusion in the image
  • COPY .ssh and resolv.conf into the image in the Containerfile to retain SSH keys and DNS configuration

@kkaarreell kkaarreell self-assigned this Oct 21, 2025
Copy link

sourcery-ai bot commented Oct 21, 2025

Reviewer's guide (collapsed on small PRs)

Reviewer's Guide

This PR extends the test harness and container build to preserve the host’s SSH keys and DNS settings by copying them into the build context and including them in the image.

Class diagram for updated container file structure

classDiagram
    class ContainerImage {
        +/var/roothome/.ssh
        +/etc/resolv.conf
        +/etc/ima/ima-policy
        +/usr/lib/bootc/kargs.d/10-ima_kargs.toml
        +/etc/yum.repos.d/
    }
    class Host {
        +.ssh
        +resolv.conf
    }
    Host <|-- ContainerImage : "files copied during build"
Loading

File-Level Changes

Change Details Files
Include SSH keys and resolv.conf in test script build context
  • Add ‘cp -r /root/.ssh .’ to capture SSH keys
  • Add ‘cp /etc/resolv.conf .’ to capture DNS configuration
setup/bootc_configure_kernel_ima_module/test.sh
Add COPY directives for SSH keys and resolv.conf in container build
  • Add ‘COPY .ssh /var/roothome/.ssh’
  • Add ‘COPY resolv.conf /etc/resolv.conf’
setup/bootc_configure_kernel_ima_module/Containerfile

Tips and commands

Interacting with Sourcery

  • Trigger a new review: Comment @sourcery-ai review on the pull request.
  • Continue discussions: Reply directly to Sourcery's review comments.
  • Generate a GitHub issue from a review comment: Ask Sourcery to create an
    issue from a review comment by replying to it. You can also reply to a
    review comment with @sourcery-ai issue to create an issue from it.
  • Generate a pull request title: Write @sourcery-ai anywhere in the pull
    request title to generate a title at any time. You can also comment
    @sourcery-ai title on the pull request to (re-)generate the title at any time.
  • Generate a pull request summary: Write @sourcery-ai summary anywhere in
    the pull request body to generate a PR summary at any time exactly where you
    want it. You can also comment @sourcery-ai summary on the pull request to
    (re-)generate the summary at any time.
  • Generate reviewer's guide: Comment @sourcery-ai guide on the pull
    request to (re-)generate the reviewer's guide at any time.
  • Resolve all Sourcery comments: Comment @sourcery-ai resolve on the
    pull request to resolve all Sourcery comments. Useful if you've already
    addressed all the comments and don't want to see them anymore.
  • Dismiss all Sourcery reviews: Comment @sourcery-ai dismiss on the pull
    request to dismiss all existing Sourcery reviews. Especially useful if you
    want to start fresh with a new review - don't forget to comment
    @sourcery-ai review to trigger a new review!

Customizing Your Experience

Access your dashboard to:

  • Enable or disable review features such as the Sourcery-generated pull request
    summary, the reviewer's guide, and others.
  • Change the review language.
  • Add, remove or edit custom review instructions.
  • Adjust other review settings.

Getting Help

@kkaarreell kkaarreell merged commit 4e0c279 into rhel-9-main Oct 21, 2025
1 of 2 checks passed
@kkaarreell kkaarreell deleted the backport/20251021_46588_rhel-9-main branch October 21, 2025 10:56
Copy link

@sourcery-ai sourcery-ai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hey there - I've reviewed your changes and they look great!

Prompt for AI Agents
Please address the comments from this code review:

## Individual Comments

### Comment 1
<location> `setup/bootc_configure_kernel_ima_module/Containerfile:8` </location>
<code_context>
 COPY 10-ima_kargs.toml /usr/lib/bootc/kargs.d/10-ima_kargs.toml
 COPY ima-policy /etc/ima/ima-policy
 COPY yum.repos.d/* /etc/yum.repos.d/
+COPY .ssh /var/roothome/.ssh
+COPY resolv.conf /etc/resolv.conf
 ARG KEYLIME_BOOTC_INSTALL_PACKAGES="rsync beakerlib selinux-policy-devel swtpm swtpm-tools nmap keylime expect"
</code_context>

<issue_to_address>
**🚨 issue (security):** Consider potential security implications of copying SSH keys into the container.

Copying the entire .ssh directory may expose private keys or sensitive files. Only copy required public keys or configuration files, and verify that private keys are excluded and permissions are secure.
</issue_to_address>

### Comment 2
<location> `setup/bootc_configure_kernel_ima_module/Containerfile:9` </location>
<code_context>
 COPY ima-policy /etc/ima/ima-policy
 COPY yum.repos.d/* /etc/yum.repos.d/
+COPY .ssh /var/roothome/.ssh
+COPY resolv.conf /etc/resolv.conf
 ARG KEYLIME_BOOTC_INSTALL_PACKAGES="rsync beakerlib selinux-policy-devel swtpm swtpm-tools nmap keylime expect"
 RUN dnf -y install ${KEYLIME_BOOTC_INSTALL_PACKAGES}
</code_context>

<issue_to_address>
**issue (bug_risk):** Overwriting /etc/resolv.conf may interfere with container DNS resolution.

Copying a static resolv.conf may break DNS in environments with dynamic DNS assignment. Please verify this is required and that the file's contents are suitable for all deployment contexts.
</issue_to_address>

Sourcery is free for open source - if you like our reviews please consider sharing them ✨
Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.

COPY 10-ima_kargs.toml /usr/lib/bootc/kargs.d/10-ima_kargs.toml
COPY ima-policy /etc/ima/ima-policy
COPY yum.repos.d/* /etc/yum.repos.d/
COPY .ssh /var/roothome/.ssh
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚨 issue (security): Consider potential security implications of copying SSH keys into the container.

Copying the entire .ssh directory may expose private keys or sensitive files. Only copy required public keys or configuration files, and verify that private keys are excluded and permissions are secure.

COPY ima-policy /etc/ima/ima-policy
COPY yum.repos.d/* /etc/yum.repos.d/
COPY .ssh /var/roothome/.ssh
COPY resolv.conf /etc/resolv.conf
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

issue (bug_risk): Overwriting /etc/resolv.conf may interfere with container DNS resolution.

Copying a static resolv.conf may break DNS in environments with dynamic DNS assignment. Please verify this is required and that the file's contents are suitable for all deployment contexts.

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

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant