From bc23882b914c56a6667cc45c0a8f976cceb7a04a Mon Sep 17 00:00:00 2001 From: Xiaonan Shen Date: Sat, 28 May 2022 19:55:21 +0800 Subject: [PATCH] Download install tini --- Dockerfile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 5a55bb2..11995b4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,7 +11,7 @@ COPY build.sh /build/ COPY http_rest_frontend /build/http_rest_frontend RUN bash build.sh -FROM krallin/ubuntu-tini:bionic +FROM ubuntu:bionic LABEL maintainer="Xiaonan Shen " EXPOSE 25/tcp @@ -23,6 +23,8 @@ HEALTHCHECK --timeout=2s CMD nc -z 127.0.0.1 1025 && nc -z 127.0.0.1 1143 RUN apt-get update \ && apt-get install -y --no-install-recommends socat pass libsecret-1-0 ca-certificates curl gosu netcat \ && rm -rf /var/lib/apt/lists/* +RUN curl -sSL https://github.com/krallin/tini/releases/download/v0.19.0/tini-$(dpkg --print-architecture) -o /tini \ + && chmod +x /tini # Copy bash scripts COPY gpgparams entrypoint.sh run_protonmail_bridge.sh cli.sh /protonmail/bin/ @@ -32,4 +34,4 @@ ENV PATH "/protonmail/bin:${PATH}" VOLUME [ "/protonmail/data" ] -ENTRYPOINT ["/usr/local/bin/tini", "--", "/protonmail/bin/entrypoint.sh"] +ENTRYPOINT ["/tini", "--", "/protonmail/bin/entrypoint.sh"]