From 20ad16802f3b47f331027c54e05fd2c078a4c19d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 23 Dec 2024 20:14:01 +0000 Subject: [PATCH] build(deps): bump ubi9/ubi-micro in /packaging/docker (#15031) Bumps ubi9/ubi-micro from `a22fffe` to `becdf7f`. --- updated-dependencies: - dependency-name: ubi9/ubi-micro dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: kruskall <99559985+kruskall@users.noreply.github.com> (cherry picked from commit fec01206b7a61ad62fd215ee6194eb42013f2ad9) # Conflicts: # packaging/docker/Dockerfile --- packaging/docker/Dockerfile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packaging/docker/Dockerfile b/packaging/docker/Dockerfile index 22b6c48db74..94583561e5b 100644 --- a/packaging/docker/Dockerfile +++ b/packaging/docker/Dockerfile @@ -26,7 +26,11 @@ RUN --mount=type=cache,target=/go/pkg/mod \ # Build stage 1 # Copy prepared files from the previous stage and complete the image. ################################################################################ +<<<<<<< HEAD FROM ${BASE_IMAGE} +======= +FROM registry.access.redhat.com/ubi9/ubi-micro:latest@sha256:becdf7fff4509ee81df982000d0adef858a7ae7995dfb7d774b9ded6a461ebad +>>>>>>> fec01206 (build(deps): bump ubi9/ubi-micro in /packaging/docker (#15031)) ARG TARGETARCH ARG BUILD_DATE ARG VERSION