ci: upgrade base images lost in PR #62 merge conflict (issue #65)#66
Merged
levleontiev merged 1 commit intomainfrom Mar 25, 2026
Merged
ci: upgrade base images lost in PR #62 merge conflict (issue #65)#66levleontiev merged 1 commit intomainfrom
levleontiev merged 1 commit intomainfrom
Conversation
PR #62 (supply chain hardening) was based on the pre-dependabot state and overwrote two base image upgrades that had already landed on main: - PR #60: openresty 1.25.3.2-jammy → 1.29.2.1-jammy - PR #59: ubuntu 22.04 → 24.04 Restores both upgrades with pinned digests: - openresty 1.29.2.1-jammy@sha256:01ae8007b5a26967ad8158554591c889345be3ffe51424fe475beb38ed923692 - ubuntu 24.04@sha256:67efaecc0031a612cf7bb3c863407018dbbef0a971f62032b77aa542ac8ac0d2 Updates supply_chain_pins_spec.lua to match the new openresty digest. Closes #65. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
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
2 participants
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.
Summary
1.25.3.2-jammy→1.29.2.1-jammywith digest pin22.04→24.04with digest pin (Dockerfile.test)supply_chain_pins_spec.luaexpected digest to match new openresty versionThese upgrades landed via dependabot PRs #59 and #60 but were overwritten when PR #62 was merged from an older base.
Closes #65.
Test plan
supply_chain_pins_specpasses with new digest🤖 Generated with Claude Code