Repository navigation
fix: read the base reference from the build log, where ARGs are expanded - #765
Merged
Merged
Conversation
#764 looked for the base in the rendered Containerfile, but BlueBuild names it through an ARG (`ARG BASE_IMAGE="<repository>@sha256:..."`, then `FROM "${BASE_IMAGE}"`), so the lookup fell back to the tag and the dispatched BlueBuild run still recorded no base digest. Its test fed the expanded form, which only the build log shows. podman prints every FROM step with its ARGs expanded, so the reference is now read from build.log. Replaying both hosted runs' build logs gives the pinned digest for budgie-atomic (BlueBuild) and the tag for bazzite-dx-gnome (Containerfile). Signed-off-by: Douglas Baggett <doug.baggett@gmail.com>
Codex Review SummaryThis comment shows the latest Codex review activity on this pull request.
ℹ️ About Codex in GitHubYour team has set up Codex to review pull requests in this repo. Reviews are triggered when you
Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings. |
danathar-atomic-hive
Bot
added
author/clanker
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
#764 didn't fix it. A BlueBuild run dispatched on
mainafter that merge (run 39127974910, budgie-atomic) still recorded an emptybase_digest.Why
The rendered BlueBuild Containerfile names the base through an ARG:
base_reference()looked for the base in the Containerfile'sFROMlines, found no match, and fell back to the tag. #764's test used the expandedFROM …@sha256:…line, which only appears in the build log. That's why the test passed while the real run still failed.Change
base_reference()now reads the base from theSTEP n/m: FROMlines inbuild.log, where podman prints everyFROMwith its ARGs expanded. The test now feeds build-log lines for both methods.How it was checked
python3 -m unittest discover -s tests(2587 tests),ruff check,git diff --check.generate(); that is where the ARG form above comes from.build.logartifacts through the new function: budgie-atomic (BlueBuild, run 39127974910) gives the pinned@sha256:5be0a50e…, and bazzite-dx-gnome (Containerfile, run 39123468770) givesghcr.io/ublue-os/bazzite-dx-gnome:stable.