update dockerfile template based on feedback from dockerhub (#17794) (#17800)

apply feedback from docker-library/official-images#18983 (comment)

- remove manual retries
- decompress tarball without piping
- determine architecture from within docker before downloading tarball
    - this is required for dockerhub
    - for wolfi based image keep the current injection of ARCH from the environment

(cherry picked from commit 8e73c68)

Co-authored-by: João Duarte <jsvd@users.noreply.github.com>

Author: mergify[bot]

docker/templates/Dockerfile.erb

@@ -6,9 +6,12 @@
   <%   url_root = 'http://localhost:8000' -%>
 <% end -%>
 <% if image_flavor == 'oss' -%>
-  <%   tarball = "logstash-oss-#{elastic_version}-linux-#{arch}.tar.gz" -%>
+  <%   tarball = "logstash-oss-#{elastic_version}-linux-${arch}.tar.gz" -%>
   <%   license = 'Apache 2.0' -%>
-<% else -%>
+<% elsif image_flavor == 'full' %>
+  <%   tarball = "logstash-#{elastic_version}-linux-${arch}.tar.gz" -%>
+  <%   license = 'Elastic License' -%>
+<% else -%><%# 'wolfi' needs arch to be injected from the outside -%>
   <%   tarball = "logstash-#{elastic_version}-linux-#{arch}.tar.gz" -%>
   <%   license = 'Elastic License' -%>
 <% end -%>
@@ -43,21 +46,15 @@ ENV LANG=<%= locale %> LC_ALL=<%= locale %>
 WORKDIR /usr/share
 
 # Install packages
-RUN for iter in {1..10}; do \
+RUN \
 <% if image_flavor == 'full' || image_flavor == 'oss' -%>
-  <%= package_manager %> update -y && \
   <%= package_manager %> install -y procps findutils tar gzip && \
   <%= package_manager %> install -y openssl && \
   <%= package_manager %> install -y which shadow-utils && \
-  <%= package_manager %> clean all && \
+  <%= package_manager %> clean all
 <% else -%><%# 'wolfi' -%>
-  <%= package_manager %> add --no-cache curl bash openssl && \
+  <%= package_manager %> add --no-cache curl bash openssl
 <% end -%>
-  exit_code=0 && break || \
-  exit_code=$? && echo "packaging error: retry $iter in 10s" && \
-  <%= package_manager %> clean all && sleep 10; \
-  done; \
-  (exit $exit_code)
 
 # Provide a non-root user to run the process
 # Add Logstash itself and set permissions
@@ -77,8 +74,12 @@ RUN addgroup -g 1000 logstash && \
   --no-create-home \
   logstash && \
 <% end -%>
-  curl -Lo - <%= url_root %>/<%= tarball %> | \
-  tar zxf - -C /usr/share && \
+<% if image_flavor == 'full' || image_flavor == 'oss' -%>
+  arch="$(rpm --query --queryformat='%{ARCH}' rpm)" && \
+<% end -%>
+  curl -f -Lo logstash.tar.gz <%= url_root %>/<%= tarball %> && \
+  tar -zxf logstash.tar.gz -C /usr/share && \
+  rm logstash.tar.gz && \
   mv /usr/share/logstash-<%= elastic_version %> /usr/share/logstash && \
   chown -R logstash:root /usr/share/logstash && \
   chmod -R g=u /usr/share/logstash && \