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

Override build images using build-args #535

Merged
merged 2 commits into from
Dec 5, 2023

Conversation

EricMountain
Copy link
Member

Override build images using build-args to reduce risk of conflict when updating from upstream.

@EricMountain EricMountain requested a review from a team December 5, 2023 14:40
ARG CILIUM_RUNTIME_IMAGE=registry.ddbuild.io/images/mirror/cilium/cilium-runtime:76c96fc643c701fa5c822e5076498ea61150c476@sha256:66e5ee8dd0d45374cc864794acbf6752c8e327b216fe225087287cdb27bc73ea
ARG CILIUM_BUILDER_IMAGE=quay.io/cilium/cilium-builder:c216208ed2de6f0e9bc43e6fe918f944ff6d98b8@sha256:fcdb9cfe9e4dcdbdba99d6b68bdfe1bf008f0f2196c3848f6a2b0d77cbd89b1a
ARG CILIUM_RUNTIME_IMAGE=quay.io/cilium/cilium-runtime:76c96fc643c701fa5c822e5076498ea61150c476@sha256:66e5ee8dd0d45374cc864794acbf6752c8e327b216fe225087287cdb27bc73ea


# cilium-envoy from github.com/cilium/proxy
#
Copy link
Member Author

@EricMountain EricMountain Dec 5, 2023

Choose a reason for hiding this comment

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

On the next line (not visible in this diff) I've left the FROM registry.ddbuild.io/.... Really what we need is to upstream a change where that image is also set via ARG so we can override it in .gitlab-ci.yml. Alternatively, we could introduce that here too.

Let me know if you have a preference.

@EricMountain EricMountain marked this pull request as ready for review December 5, 2023 14:44
Copy link
Member

@jaredledvina jaredledvina left a comment

Choose a reason for hiding this comment

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

LGTM

@EricMountain EricMountain merged commit 31dcef1 into v1.13-dd Dec 5, 2023
23 of 36 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