mirror of
https://github.com/elastic/kibana.git
synced 2025-06-27 18:51:07 -04:00
[build] Dockerfile cleanup (#220317)
Adds few miscellaneous fixes. https://buildkite.com/elastic/kibana-artifacts-snapshot/builds/6240
This commit is contained in:
parent
088e80ac27
commit
82de954618
1 changed files with 4 additions and 4 deletions
|
@ -20,7 +20,7 @@ RUN apk --no-cache add curl
|
||||||
|
|
||||||
{{#usePublicArtifact}}
|
{{#usePublicArtifact}}
|
||||||
RUN cd /tmp && \
|
RUN cd /tmp && \
|
||||||
{{#wolfi}}arch="$(apk --print-arch)" ; \ {{/wolfi}}{{#ubi}}arch="$(rpm --query --queryformat='%{ARCH}' rpm)"; \ {{/ubi}} && \
|
{{#wolfi}}arch="$(apk --print-arch)"{{/wolfi}}{{#ubi}}arch="$(rpm --query --queryformat='%{ARCH}' rpm)"{{/ubi}} && \
|
||||||
curl -f --retry 8 -s -L \
|
curl -f --retry 8 -s -L \
|
||||||
--output kibana.tar.gz \
|
--output kibana.tar.gz \
|
||||||
https://{{publicArtifactSubdomain}}.elastic.co/downloads/kibana/{{artifactPrefix}}-$arch.tar.gz && \
|
https://{{publicArtifactSubdomain}}.elastic.co/downloads/kibana/{{artifactPrefix}}-$arch.tar.gz && \
|
||||||
|
@ -49,17 +49,17 @@ RUN set -e ; \
|
||||||
case "$arch" in \
|
case "$arch" in \
|
||||||
aarch64) \
|
aarch64) \
|
||||||
TINI_BIN='tini-arm64' ; \
|
TINI_BIN='tini-arm64' ; \
|
||||||
|
TINI_CHECKSUM='07952557df20bfd2a95f9bef198b445e006171969499a1d361bd9e6f8e5e0e81' ; \
|
||||||
;; \
|
;; \
|
||||||
x86_64) \
|
x86_64) \
|
||||||
TINI_BIN='tini-amd64' ; \
|
TINI_BIN='tini-amd64' ; \
|
||||||
|
TINI_CHECKSUM='93dcc18adc78c65a028a84799ecf8ad40c936fdfc5f2a57b1acda5a8117fa82c' ; \
|
||||||
;; \
|
;; \
|
||||||
*) echo >&2 "Unsupported architecture $arch" ; exit 1 ;; \
|
*) echo >&2 "Unsupported architecture $arch" ; exit 1 ;; \
|
||||||
esac ; \
|
esac ; \
|
||||||
TINI_VERSION='v0.19.0' ; \
|
TINI_VERSION='v0.19.0' ; \
|
||||||
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}" ; \
|
||||||
curl -f --retry 8 -S -L -O "https://github.com/krallin/tini/releases/download/${TINI_VERSION}/${TINI_BIN}.sha256sum" ; \
|
echo "${TINI_CHECKSUM} ${TINI_BIN}" | sha256sum -c - ; \
|
||||||
sha256sum -c "${TINI_BIN}.sha256sum" ; \
|
|
||||||
rm "${TINI_BIN}.sha256sum" ; \
|
|
||||||
mv "${TINI_BIN}" /bin/tini ; \
|
mv "${TINI_BIN}" /bin/tini ; \
|
||||||
chmod +x /bin/tini
|
chmod +x /bin/tini
|
||||||
{{^serverless}}
|
{{^serverless}}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue