[8.19] [build] Dockerfile feedback (elastic#217354) (elastic#218726)

# Backport

This will backport the following commits from `main` to `8.19`:
- [[build] Dockerfile feedback
(elastic#217354)](elastic#217354)

<!--- Backport version: 9.6.6 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sorenlouv/backport)

<!--BACKPORT
[{"author":{"name":"Jon","email":"[email protected]"},"sourceCommit":{"committedDate":"2025-04-21T12:44:22Z","message":"[build]
Dockerfile feedback (elastic#217354)\n\nAddresses feedback
from\nhttps://github.com/docker-library/official-images/pull/18692.\nhttps://buildkite.com/elastic/kibana-artifacts-snapshot/builds/6005","sha":"9b90fa5197884cefcf0ba808ce968703733a9225","branchLabelMapping":{"^v9.1.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["Team:Operations","release_note:skip","backport:version","v9.1.0","v8.19.0"],"title":"[build]
Dockerfile
feedback","number":217354,"url":"https://github.com/elastic/kibana/pull/217354","mergeCommit":{"message":"[build]
Dockerfile feedback (elastic#217354)\n\nAddresses feedback
from\nhttps://github.com/docker-library/official-images/pull/18692.\nhttps://buildkite.com/elastic/kibana-artifacts-snapshot/builds/6005","sha":"9b90fa5197884cefcf0ba808ce968703733a9225"}},"sourceBranch":"main","suggestedTargetBranches":["8.19"],"targetPullRequestStates":[{"branch":"main","label":"v9.1.0","branchLabelMappingKey":"^v9.1.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/217354","number":217354,"mergeCommit":{"message":"[build]
Dockerfile feedback (elastic#217354)\n\nAddresses feedback
from\nhttps://github.com/docker-library/official-images/pull/18692.\nhttps://buildkite.com/elastic/kibana-artifacts-snapshot/builds/6005","sha":"9b90fa5197884cefcf0ba808ce968703733a9225"}},{"branch":"8.19","label":"v8.19.0","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"}]}]
BACKPORT-->

Co-authored-by: Jon <[email protected]>

Author: kibanamachine

src/dev/build/tasks/os_packages/docker_generator/templates/base/Dockerfile

@@ -23,9 +23,10 @@ RUN apk --no-cache add curl
 
 {{#usePublicArtifact}}
 RUN cd /tmp && \
-  curl --retry 8 -s -L \
+  {{#wolfi}}arch="$(apk --print-arch)" ; \ {{/wolfi}}{{#ubi}}arch="$(rpm --query --queryformat='%{ARCH}' rpm)"; \ {{/ubi}} && \
+  curl -f --retry 8 -s -L \
     --output kibana.tar.gz \
-     https://{{publicArtifactSubdomain}}.elastic.co/downloads/kibana/{{artifactPrefix}}-$(arch).tar.gz && \
+     https://{{publicArtifactSubdomain}}.elastic.co/downloads/kibana/{{artifactPrefix}}-$arch.tar.gz && \
   cd -
 {{/usePublicArtifact}}
 {{^usePublicArtifact}}
@@ -47,18 +48,19 @@ RUN chmod -R g=u /usr/share/kibana
 # Add an init process, check the checksum to make sure it's a match
 RUN set -e ; \
     TINI_BIN="" ; \
-    case "$(arch)" in \
+    {{#wolfi}}arch="$(apk --print-arch)" ; \ {{/wolfi}}{{#ubi}}arch="$(rpm --query --queryformat='%{ARCH}' rpm)"; \ {{/ubi}}
+    case "$arch" in \
         aarch64) \
             TINI_BIN='tini-arm64' ; \
             ;; \
         x86_64) \
             TINI_BIN='tini-amd64' ; \
             ;; \
-        *) echo >&2 "Unsupported architecture $(arch)" ; exit 1 ;; \
+        *) echo >&2 "Unsupported architecture $arch" ; exit 1 ;; \
     esac ; \
   TINI_VERSION='v0.19.0' ; \
-  curl --retry 8 -S -L -O "https://github.com/krallin/tini/releases/download/${TINI_VERSION}/${TINI_BIN}" ; \
-  curl --retry 8 -S -L -O "https://github.com/krallin/tini/releases/download/${TINI_VERSION}/${TINI_BIN}.sha256sum" ; \
+  curl -f --retry 8 -S -L -O "https://github.com/krallin/tini/releases/download/${TINI_VERSION}/${TINI_BIN}" ; \
+  curl -f --retry 8 -S -L -O "https://github.com/krallin/tini/releases/download/${TINI_VERSION}/${TINI_BIN}.sha256sum" ; \
   sha256sum -c "${TINI_BIN}.sha256sum" ; \
   rm "${TINI_BIN}.sha256sum" ; \
   mv "${TINI_BIN}" /bin/tini ; \
@@ -88,14 +90,9 @@ FROM {{{baseImageName}}}
 EXPOSE 5601
 
 {{#ubi}}
-RUN for iter in {1..10}; do \
-      microdnf update --setopt=tsflags=nodocs -y && \
-      microdnf install --setopt=tsflags=nodocs -y \
+RUN microdnf install --setopt=tsflags=nodocs -y \
       fontconfig liberation-fonts-common freetype shadow-utils nss findutils && \
-      microdnf clean all && exit_code=0 && break || exit_code=$? && echo "microdnf error: retry $iter in 10s" && \
-      sleep 10; \
-    done; \
-    (exit $exit_code)
+      microdnf clean all
 {{/ubi}}
 {{#ubuntu}}
 RUN for iter in {1..10}; do \
@@ -131,7 +128,7 @@ RUN ln -s /usr/share/kibana /opt/kibana
 
 {{! Please notify @elastic/kibana-security if you want to remove or change this environment variable. }}
 {{! Kibana applications may depend on the ELASTIC_CONTAINER value. Screenshotting uses this to conditionally disable the Chromium sandbox when launching Puppeteer. }}
-ENV ELASTIC_CONTAINER true
+ENV ELASTIC_CONTAINER=true
 ENV PATH=/usr/share/kibana/bin:$PATH
 
 # Set some Kibana configuration defaults.
@@ -198,8 +195,7 @@ LABEL name="Kibana" \
   summary="Kibana" \
   description="Your window into the Elastic Stack."
 
-RUN mkdir /licenses && \
-    cp LICENSE.txt /licenses/LICENSE
+RUN mkdir /licenses && ln LICENSE.txt /licenses/LICENSE
 {{/ubi}}
 
 ENTRYPOINT ["/bin/tini", "--"]