missed a conflict

ebeahan · ebeahan · commit 36b72daaa067 · 2025-05-09T15:05:12.000-05:00
diff --git a/dev-tools/packaging/templates/docker/Dockerfile.elastic-agent.tmpl b/dev-tools/packaging/templates/docker/Dockerfile.elastic-agent.tmpl
@@ -79,18 +79,14 @@ FROM {{ .from }}
 
 ENV BEAT_SETUID_AS={{ .user }}
 
-<<<<<<< HEAD
-{{- if contains .from "ubi-minimal" }}
+{{- if (and (contains .from "redhat/ubi") (contains .from "-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 }}
 
 {{- if contains .from "ubuntu" }}
 # 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 && \
