diff --git a/distribution/docker/src/docker/dockerfiles/default/Dockerfile b/distribution/docker/src/docker/dockerfiles/default/Dockerfile index 8a125fcbf191a..088e306a3b764 100644 --- a/distribution/docker/src/docker/dockerfiles/default/Dockerfile +++ b/distribution/docker/src/docker/dockerfiles/default/Dockerfile @@ -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