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

Honor RAMALAMA_IMAGE if set #733

Merged
merged 1 commit into from
Feb 4, 2025
Merged

Honor RAMALAMA_IMAGE if set #733

merged 1 commit into from
Feb 4, 2025

Conversation

rhatdan
Copy link
Member

@rhatdan rhatdan commented Feb 4, 2025

Currently on my cuda laptop, if I set RAMALAMA_IMAGE to something, ramalama ignores it and forces cuda image.

Summary by Sourcery

Bug Fixes:

  • Fixed a bug where the RAMALAMA_IMAGE environment variable was being ignored, and the CUDA image was always being used.

Copy link
Contributor

sourcery-ai bot commented Feb 4, 2025

Reviewer's Guide by Sourcery

This PR ensures that the RAMALAMA_IMAGE environment variable is respected, preventing the application from defaulting to the CUDA image when a custom image is specified via the environment variable. It also introduces a DEFAULT_IMAGE constant to avoid hardcoding the default image.

Class diagram showing the updated image handling

classDiagram
    class common {
        +DEFAULT_IMAGE: string
        +default_image(): string
        +container_manager()
    }
    class model {
        -_image(args)
        +attempt_to_use_versioned(conman, image, vers, args)
    }
    note for common "DEFAULT_IMAGE constant added"
    note for model "Updated image comparison logic"
Loading

Flow diagram for image selection logic after changes

graph TD
    A[Start] --> B{RAMALAMA_IMAGE set?}
    B -->|Yes| C[Use RAMALAMA_IMAGE]
    B -->|No| D{args.image != DEFAULT_IMAGE?}
    D -->|Yes| E[Use args.image]
    D -->|No| F[Use DEFAULT_IMAGE]
    C --> G[End]
    E --> G
    F --> G
Loading

File-Level Changes

Change Details Files
Respect RAMALAMA_IMAGE environment variable.
  • Added DEFAULT_IMAGE constant.
  • Modified default_image() to return DEFAULT_IMAGE if no image is set.
  • Modified _image() to check against DEFAULT_IMAGE instead of hardcoded image.
ramalama/common.py
ramalama/model.py

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!
  • Generate a plan of action for an issue: Comment @sourcery-ai plan on
    an issue to generate a plan of action for it.

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

Copy link
Contributor

@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 @rhatdan - I've reviewed your changes - here's some feedback:

Overall Comments:

  • In model.py, comparing against DEFAULT_IMAGE instead of default_image() bypasses the environment variable check. This will prevent RAMALAMA_IMAGE from being honored. Please continue using default_image() for the comparison.
Here's what I looked at during the review
  • 🟢 General issues: all looks good
  • 🟢 Security: all looks good
  • 🟢 Testing: all looks good
  • 🟢 Complexity: all looks good
  • 🟢 Documentation: all looks good

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.

Currently on my cuda laptop, if I set RAMALAMA_IMAGE to something,
ramalama ignores it and forces cuda image.

Signed-off-by: Daniel J Walsh <[email protected]>
@rhatdan rhatdan merged commit 5e32fe9 into containers:main Feb 4, 2025
12 checks passed
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.

2 participants