Skip to content

Pull base images on every build and reference BUILD_DATE in the update #2

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.

Sign up for GitHub

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

Merged
aaaaaaaalex merged 2 commits into from
Sep 30, 2026
Merged

Pull base images on every build and reference BUILD_DATE in the update #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4b543dd
Pull the base images on every build
aaaaaaaalex Sep 30, 2026
8cc0721
Reference BUILD_DATE in the package update
aaaaaaaalex Sep 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ PROMETHEUS_DUMP_PATH ?= $(shell find ./must-gather.local* -name prom_data.tar.gz
build: docker-build docker-push

docker-build:
${CONTAINER_ENGINE} build --build-arg BUILD_DATE=${BUILD_DATE} -f build/Dockerfile -t ${IMAGE_REGISTRY}/${IMAGE_NAME}:${IMAGE_TAG} .
${CONTAINER_ENGINE} build --pull --build-arg BUILD_DATE=${BUILD_DATE} -f build/Dockerfile -t ${IMAGE_REGISTRY}/${IMAGE_NAME}:${IMAGE_TAG} .

docker-push:
${CONTAINER_ENGINE} push ${IMAGE_REGISTRY}/${IMAGE_NAME}:${IMAGE_TAG}
Expand Down
7 changes: 4 additions & 3 deletions build/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@ FROM quay.io/openshift/origin-must-gather:4.22 as builder

FROM registry.access.redhat.com/ubi9-minimal:latest

# BUILD_DATE differs on every build, so declaring it here re-runs the package
# update rather than reusing a cached layer from an earlier build.
# BUILD_DATE differs on every build. The update below references it, so it
# re-runs rather than reusing a cached layer from an earlier build.
ARG BUILD_DATE=unknown
RUN microdnf -y update && \
RUN echo "Updating packages for build ${BUILD_DATE}" && \
microdnf -y update && \
microdnf -y install rsync tar gzip jq findutils && \
microdnf -y clean all

Expand Down
Loading