Skip to content

[8.19] [Build] Address further dockerhub feedback on default Dockerfile (#128686) #128946

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jun 5, 2025
Merged

[8.19] [Build] Address further dockerhub feedback on default Dockerfile (#128686) #128946

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4686a06
[Build] Address further dockerhub feedback on default Dockerfile (#12…
breskeby Jun 5, 2025
a9a3467
Fix merge conflict
breskeby Jun 5, 2025
7528463
Fix arch detection on ubuntu base image
breskeby Jun 5, 2025
5696b52
Merge branch '8.19' into backport/8.19/pr-128686
breskeby Jun 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 7 additions & 10 deletions distribution/docker/src/docker/dockerfiles/default/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,18 +29,15 @@ RUN apt-get update -y && DEBIAN_FRONTEND=noninteractive apt-get install -y curl
# The tini GitHub page gives instructions for verifying the binary using
# gpg, but the keyservers are slow to return the key and this can fail the
# build. Instead, we check the binary against the published checksum.
RUN set -eux ; \\
tini_bin="" ; \\
RUN set -eux; \\
case "\$(arch)" in \\
aarch64) tini_bin='tini-arm64' ;; \\
x86_64) tini_bin='tini-amd64' ;; \\
*) echo >&2 ; echo >&2 "Unsupported architecture \$(arch)" ; echo >&2 ; exit 1 ;; \\
aarch64) tini_bin='tini-arm64'; tini_sum='07952557df20bfd2a95f9bef198b445e006171969499a1d361bd9e6f8e5e0e81' ;; \\
x86_64) tini_bin='tini-amd64'; tini_sum='93dcc18adc78c65a028a84799ecf8ad40c936fdfc5f2a57b1acda5a8117fa82c' ;; \\
*) echo >&2 "Unsupported architecture \$arch"; exit 1 ;; \\
esac ; \\
curl --retry 10 -S -L -O https://github.com/krallin/tini/releases/download/v0.19.0/\${tini_bin} ; \\
curl --retry 10 -S -L -O https://github.com/krallin/tini/releases/download/v0.19.0/\${tini_bin}.sha256sum ; \\
sha256sum -c \${tini_bin}.sha256sum ; \\
rm \${tini_bin}.sha256sum ; \\
mv \${tini_bin} /bin/tini ; \\
curl -f --retry 10 -S -L -o /tmp/tini https://github.com/krallin/tini/releases/download/v0.19.0/\${tini_bin}; \\
echo "\${tini_sum} /tmp/tini" | sha256sum -c -; \\
mv /tmp/tini /bin/tini; \\
chmod 0555 /bin/tini

RUN mkdir /usr/share/elasticsearch
Expand Down