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

ci: dockerimage multi cache #6592

Merged

Conversation

PastaPastaPasta
Copy link
Member

Issue being fixed or feature implemented

docker/build-push-action allows us to cache from multiple refs; let's use it!

I've noticed a lot recently when we are changing docker image we get a lot of cache misses we shouldn't. Now we push an image based on the hash of the dockerfile, and restore from that. Additionally, we can now cache from the branch name.

Previously we'd get into situations where:
develop is pushed, build image: HIT
PR opened that changes image, build image: MISS and push
develop is pushed with a different PR, build image: MISS and push
PR has new commit added or rebased, build image: MISS and push

This PR should allow all of these to hit now.

What was done?

Cache from and push to a tag that is the hash of the dockerfile. Additionally, allow caching from the branch name, or latest if needed.

How Has This Been Tested?

In my own repo, did a situation similiar to as described above, and got cache hits as expected.

Breaking Changes

None

Checklist:

Go over all the following points, and put an x in all the boxes that apply.

  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I have added or updated relevant unit/integration/functional/e2e tests
  • I have made corresponding changes to the documentation
  • I have assigned this pull request to a milestone (for repository code-owners and collaborators only)

@PastaPastaPasta PastaPastaPasta added this to the 23 milestone Feb 21, 2025
Copy link

coderabbitai bot commented Feb 21, 2025

Walkthrough

The pull request updates the Docker container build workflow by modifying the tagging and caching configuration. A new tag is introduced that uses the hash of the Dockerfile, enabling versioning based on the content of the Dockerfile. In addition, the caching strategy is modified to include three references: one using the hash-based tag, another using a predefined tag from the previous steps, and a reference to the latest image. No changes have been made to the declarations of exported or public entities.


Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

❤️ 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.
    • Generate unit testing code for this file.
    • 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 generate unit testing code for this file.
    • @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 generate unit testing code.
    • @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.

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. (Beta)
  • @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.

Copy link

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

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

Actionable comments posted: 0

🧹 Nitpick comments (2)
.github/workflows/build-container.yml (2)

26-33: Variable Preparation Step

The “Prepare variables” step properly extracts the branch name and repository name while converting them to lower case. For improved maintainability, consider adding inline comments to explain the purpose of these variables (e.g., how the branch name is used as a tag) for future readers.


54-57: Multi-Cache Strategy Implementation

Switching from a single cache reference to multiple cache-from entries significantly enhances the caching strategy. Leveraging the Dockerfile hash, branch tag, and the latest image should help maximize cache hit rates. Confirm that the ordering does not introduce conflicts and aligns with the intended build behavior.

📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 843a00d and c3526dc.

📒 Files selected for processing (1)
  • .github/workflows/build-container.yml (1 hunks)
⏰ Context from checks skipped due to timeout of 90000ms (10)
  • GitHub Check: win64-build / Build source
  • GitHub Check: mac-build / Build source
  • GitHub Check: linux64_sqlite-build / Build source
  • GitHub Check: linux64_ubsan-build / Build source
  • GitHub Check: linux64-build / Build source
  • GitHub Check: linux64_fuzz-build / Build source
  • GitHub Check: linux64_nowallet-build / Build source
  • GitHub Check: linux64_tsan-build / Build source
  • GitHub Check: linux64_multiprocess-build / Build source
  • GitHub Check: arm-linux-build / Build source
🔇 Additional comments (2)
.github/workflows/build-container.yml (2)

1-9: Review of Workflow Metadata and Outputs

The workflow’s metadata and the outputs in the “on” section are configured correctly. The output path is dynamically constructed using the job outputs for repo and tag, which is consistent with the intended use. Make sure that the computed values are as expected during execution.


50-53: Enhanced Docker Image Tagging

The new tag using the Dockerfile hash (${{ hashFiles('./contrib/containers/ci/Dockerfile') }}) introduces a robust versioning mechanism based on the Dockerfile’s content. This should effectively reduce cache misses when the Dockerfile is modified. Please verify that the hash expression produces the expected tag format.

Copy link

@UdjinM6 UdjinM6 left a comment

Choose a reason for hiding this comment

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

utACK c3526dc

Copy link
Collaborator

@kwvg kwvg left a comment

Choose a reason for hiding this comment

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

utACK c3526dc

@PastaPastaPasta PastaPastaPasta merged commit b4e2269 into dashpay:develop Feb 24, 2025
27 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.

3 participants