docker: use the official Red Hat images (#7817)

v1v · mergify[bot] · commit 81cba7fee255 · 2025-05-05T13:35:49.000Z
(cherry picked from commit 56f5d90) # Conflicts: # dev-tools/packaging/packages.yml # dev-tools/packaging/templates/docker/Dockerfile.elastic-agent.tmpl
diff --git a/dev-tools/packaging/packages.yml b/dev-tools/packaging/packages.yml
@@ -477,6 +477,7 @@ shared:
   - &docker_ubuntu_spec
     docker_variant: 'basic'
     extra_vars:
+<<<<<<< HEAD
       from: '--platform=linux/amd64 ubuntu:24.04'
   - &docker_ubuntu_arm_spec
     docker_variant: 'basic'
@@ -487,10 +488,13 @@ shared:
     docker_variant: 'ubi'
     extra_vars:
       from: '--platform=linux/amd64 docker.elastic.co/ubi9/ubi-minimal'
+=======
+      from: '--platform=linux/amd64 redhat/ubi9-minimal'
+>>>>>>> 56f5d9053 (docker: use the official Red Hat images (#7817))
   - &docker_ubi_arm_spec
     docker_variant: 'ubi'
     extra_vars:
-      from: '--platform=linux/arm64 docker.elastic.co/ubi9/ubi-minimal'
+      from: '--platform=linux/arm64 redhat/ubi9-minimal'
 
   - &docker_wolfi_spec
     docker_variant: 'wolfi'
diff --git a/dev-tools/packaging/templates/docker/Dockerfile.elastic-agent.tmpl b/dev-tools/packaging/templates/docker/Dockerfile.elastic-agent.tmpl
@@ -17,6 +17,14 @@ RUN for iter in {1..10}; do \
 
 COPY beat {{ $beatHome }}
 
+{{- if (and (contains .buildFrom "redhat/ubi") (contains .buildFrom "-minimal")) }}
+RUN for iter in {1..10}; do \
+        microdnf update -y && \
+        microdnf install -y findutils && \
+        microdnf clean all && \
+        exit_code=0 && break || exit_code=$? && echo "microdnf error: retry $iter in 10s" && sleep 10; done; (exit $exit_code)
+{{- end }}
+
 RUN true && \
     # ECE needs to create config here under non-1000 user
     chmod 0777 {{ $beatHome}} && \
@@ -71,6 +79,7 @@ FROM {{ .from }}
 
 ENV BEAT_SETUID_AS={{ .user }}
 
+<<<<<<< HEAD
 {{- if contains .from "ubi-minimal" }}
 RUN for iter in {1..10}; do microdnf update -y && microdnf install -y tar gzip findutils shadow-utils && microdnf clean all && exit_code=0 && break || exit_code=$? && echo "microdnf error: retry $iter in 10s" && sleep 10; done; (exit $exit_code)
 {{- end }}
@@ -79,6 +88,9 @@ RUN for iter in {1..10}; do microdnf update -y && microdnf install -y tar gzip f
 # Delete the existing "ubuntu" user to prevent conflict with the user that is added later.
 # See https://bugs.launchpad.net/cloud-images/+bug/2005129/comments/2.
 RUN touch /var/mail/ubuntu && chown ubuntu /var/mail/ubuntu && userdel -r ubuntu
+=======
+{{- if (and (contains .from "redhat/ubi") (contains .from "-minimal")) }}
+>>>>>>> 56f5d9053 (docker: use the official Red Hat images (#7817))
 RUN for iter in {1..10}; do \
         apt-get update -y && \
         DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends --yes ca-certificates curl gawk xz-utils && \
@@ -193,7 +205,11 @@ RUN apk add --no-cache git make python-3.11 py3.11-pip && \
     chmod 0755 {{ $beatHome }}/data/elastic-agent-*/components/connectors
 {{- end }}
 
+<<<<<<< HEAD
 {{- if (and (eq .Variant "complete") (contains .from "ubuntu"))  }}
+=======
+{{- if (and (eq .Variant "complete") (and (contains .from "redhat/ubi") (contains .from "-minimal") ))  }}
+>>>>>>> 56f5d9053 (docker: use the official Red Hat images (#7817))
 USER root
 ENV NODE_PATH={{ $beatHome }}/.node
 RUN echo \
