STAC-24657: add OCI labels to stackstate-process-agent images#240
Open
viliakov wants to merge 3 commits into
Open
STAC-24657: add OCI labels to stackstate-process-agent images#240viliakov wants to merge 3 commits into
viliakov wants to merge 3 commits into
Conversation
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
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.
What
Adds the canonical SUSE Observability OCI label set (19 labels + optional
published-by) to thestackstate-k8s-process-agentimage, built per arch (amd64 + arm64) and combined into a multi-arch manifest. Labels are spliced into the existingdocker buildinvocation per arch.stackstate-k8s-process-agentBCI.dockerfileregistry.suse.com/bci/bci-micro:15.7How
packaging/oci-labels.sh, extended with:--dockerfile PATH— extract base image from the Dockerfile by tracing everyFROMthrough prior stage references and picking the last resolved value.BCI.dockerfiledefinesbci-micro:15.7 AS finalfirst, thenbci-base:latest AS chroot-builder, then a finalFROM final— the algorithm correctly resolves the trailing stage reference back tobci-micro:15.7.--base-digest sha256:…— optional override (not used here yet, but kept identical to the kaniko-friendly helper used by the other Family D repos).packaging/build-and-label.shcalls the helper with--dockerfile BCI.dockerfile, captures the--label=flags, and splices them intodocker build. Both arch CI files (.gitlab-ci-x64.yml,.gitlab-ci-arm.yml) call the wrapper instead of inlining the same logic twice.BASE_IMAGEenv-var pattern — base name and digest now derive from the Dockerfile so they stay in sync with updatecli-driven base bumps.Verification
BCI.dockerfile, confirmed it resolves tobci-micro:15.7(not thebci-base:latestbuilder stage) and emits 19 label lines.docker buildx imagetools inspectorskopeo inspect docker://…) and that the manifest-list merge preserves the per-arch labels.Related