Skip to content

Commit f45a924

Browse files
committed
Change dumb-init to tini
1 parent e1bd1e8 commit f45a924

File tree

1 file changed

+10
-4
lines changed
  • src/dev/build/tasks/os_packages/docker_generator/templates

1 file changed

+10
-4
lines changed

src/dev/build/tasks/os_packages/docker_generator/templates/Dockerfile

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,15 @@ RUN for iter in {1..10}; do \
5353
(exit $exit_code)
5454

5555
# Add an init process, check the checksum to make sure it's a match
56-
RUN curl -L -o /usr/local/bin/dumb-init https://github.com/Yelp/dumb-init/releases/download/v1.2.2/dumb-init_1.2.2_amd64
57-
RUN echo "37f2c1f0372a45554f1b89924fbb134fc24c3756efaedf11e07f599494e0eff9 /usr/local/bin/dumb-init" | sha256sum -c -
58-
RUN chmod +x /usr/local/bin/dumb-init
56+
RUN set -e ; \
57+
TINI_VERSION='v0.19.0' ; \
58+
TINI_BIN='tini-amd64' ; \
59+
curl --retry 8 -S -L -O "https://github.com/krallin/tini/releases/download/${TINI_VERSION}/${TINI_BIN}" ; \
60+
curl --retry 8 -S -L -O "https://github.com/krallin/tini/releases/download/${TINI_VERSION}/${TINI_BIN}.sha256sum" ; \
61+
sha256sum -c "${TINI_BIN}.sha256sum" ; \
62+
rm "${TINI_BIN}.sha256sum" ; \
63+
mv "${TINI_BIN}" /bin/tini ; \
64+
chmod +x /bin/tini
5965

6066
RUN mkdir /usr/share/fonts/local
6167
RUN curl -L -o /usr/share/fonts/local/NotoSansCJK-Regular.ttc https://github.com/googlefonts/noto-cjk/raw/NotoSansV2.001/NotoSansCJK-Regular.ttc
@@ -125,6 +131,6 @@ RUN mkdir /licenses && \
125131

126132
USER kibana
127133

128-
ENTRYPOINT ["/usr/local/bin/dumb-init", "--"]
134+
ENTRYPOINT ["/bin/tini", "--"]
129135

130136
CMD ["/usr/local/bin/kibana-docker"]

0 commit comments

Comments
 (0)