Skip to content

Commit 4dd371d

Browse files
authored
[8.19] [Build] Address further dockerhub feedback on default Dockerfile (#128686) (#128946)
* [Build] Address further dockerhub feedback on default Dockerfile (#128686) * [Build] Address further dockerhub feedback on default Dockerfile * Bring back license folder * Minor cleanup * polishing (cherry picked from commit 649b505) # Conflicts: # distribution/docker/src/docker/dockerfiles/default/Dockerfile * Fix merge conflict - only add the fixed tini checksum check * Fix arch detection on ubuntu base image
1 parent 4fc089b commit 4dd371d

File tree

1 file changed

+7
-10
lines changed
  • distribution/docker/src/docker/dockerfiles/default

1 file changed

+7
-10
lines changed

distribution/docker/src/docker/dockerfiles/default/Dockerfile

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,18 +29,15 @@ RUN apt-get update -y && DEBIAN_FRONTEND=noninteractive apt-get install -y curl
2929
# The tini GitHub page gives instructions for verifying the binary using
3030
# gpg, but the keyservers are slow to return the key and this can fail the
3131
# build. Instead, we check the binary against the published checksum.
32-
RUN set -eux ; \\
33-
tini_bin="" ; \\
32+
RUN set -eux; \\
3433
case "\$(arch)" in \\
35-
aarch64) tini_bin='tini-arm64' ;; \\
36-
x86_64) tini_bin='tini-amd64' ;; \\
37-
*) echo >&2 ; echo >&2 "Unsupported architecture \$(arch)" ; echo >&2 ; exit 1 ;; \\
34+
aarch64) tini_bin='tini-arm64'; tini_sum='07952557df20bfd2a95f9bef198b445e006171969499a1d361bd9e6f8e5e0e81' ;; \\
35+
x86_64) tini_bin='tini-amd64'; tini_sum='93dcc18adc78c65a028a84799ecf8ad40c936fdfc5f2a57b1acda5a8117fa82c' ;; \\
36+
*) echo >&2 "Unsupported architecture \$arch"; exit 1 ;; \\
3837
esac ; \\
39-
curl --retry 10 -S -L -O https://github.com/krallin/tini/releases/download/v0.19.0/\${tini_bin} ; \\
40-
curl --retry 10 -S -L -O https://github.com/krallin/tini/releases/download/v0.19.0/\${tini_bin}.sha256sum ; \\
41-
sha256sum -c \${tini_bin}.sha256sum ; \\
42-
rm \${tini_bin}.sha256sum ; \\
43-
mv \${tini_bin} /bin/tini ; \\
38+
curl -f --retry 10 -S -L -o /tmp/tini https://github.com/krallin/tini/releases/download/v0.19.0/\${tini_bin}; \\
39+
echo "\${tini_sum} /tmp/tini" | sha256sum -c -; \\
40+
mv /tmp/tini /bin/tini; \\
4441
chmod 0555 /bin/tini
4542
4643
RUN mkdir /usr/share/elasticsearch

0 commit comments

Comments
 (0)