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] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: kruskall <[email protected]> (cherry picked from commit fec0120) # Conflicts: # packaging/docker/Dockerfile
elastic · Dec 23, 2024 · 20ad168 · 20ad168
1 parent 71b4b1f
commit 20ad168
Showing 1 changed file with 4 additions and 0 deletions.
diff --git 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