From b780d9e8b3878cd4264215108e60b2c4c4706851 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=80=86=E6=B5=81=E8=80=8C=E4=B8=8A?= <1666888816@qq.com> Date: Tue, 5 Dec 2023 15:41:47 +0800 Subject: [PATCH] fix: kill zombie --- hack/contrib/docker/monitor/Dockerfile | 6 ++++++ hack/contrib/docker/monitor/entrypoint.sh | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/hack/contrib/docker/monitor/Dockerfile b/hack/contrib/docker/monitor/Dockerfile index 3a870aa3c3..cebe992e6e 100644 --- a/hack/contrib/docker/monitor/Dockerfile +++ b/hack/contrib/docker/monitor/Dockerfile @@ -7,6 +7,12 @@ ENV RELEASE_DESC=${RELEASE_DESC} COPY rainbond-monitor /run/rainbond-monitor +RUN if [ $(arch) = "arm64" ] || [ $(arch) = "aarch64" ]; then \ + wget https://pkg.goodrain.com/pkg/tini/v0.19.0/tini-arm -O /bin/tini && chmod +x /bin/tini; \ + else \ + wget https://pkg.goodrain.com/pkg/tini/v0.19.0/tini -O /bin/tini && chmod +x /bin/tini; \ + fi + ADD entrypoint.sh /run/entrypoint.sh ENTRYPOINT ["/run/entrypoint.sh"] \ No newline at end of file diff --git a/hack/contrib/docker/monitor/entrypoint.sh b/hack/contrib/docker/monitor/entrypoint.sh index 35bcc816c7..c5d6d956d8 100755 --- a/hack/contrib/docker/monitor/entrypoint.sh +++ b/hack/contrib/docker/monitor/entrypoint.sh @@ -4,5 +4,5 @@ if [ "$1" = "bash" ];then elif [ "$1" = "version" ];then /run/rainbond-monitor version else - exec /run/rainbond-monitor $@ + exec /bin/tini -- /run/rainbond-monitor $@ fi \ No newline at end of file