From 859ba96959037eb3edf02c24112da6eb640ca0cc Mon Sep 17 00:00:00 2001
From: Shuduo Sang <sangshuduo@gmail.com>
Date: Wed, 16 Feb 2022 10:48:10 +0800
Subject: [PATCH] [TD-13300]<fix>: docker stop takes 10 seconds (#10269)

---
 packaging/docker/Dockerfile     | 8 +++++++-
 packaging/docker/dockerbuild.sh | 4 ++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/packaging/docker/Dockerfile b/packaging/docker/Dockerfile
index 4f847f949a..f6a0950e24 100644
--- a/packaging/docker/Dockerfile
+++ b/packaging/docker/Dockerfile
@@ -4,6 +4,7 @@ WORKDIR /root
 
 ARG pkgFile
 ARG dirName
+ARG cpuType
 RUN echo ${pkgFile} && echo ${dirName}
 
 COPY ${pkgFile} /root/
@@ -21,6 +22,11 @@ ENV LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/lib" \
 EXPOSE 6030-6049
 EXPOSE 6030-6039/udp
 COPY ./bin/* /usr/bin/
-ENTRYPOINT ["/usr/bin/entrypoint.sh"]
+
+ENV TINI_VERSION v0.19.0
+RUN bash -c 'echo -e "Downloading tini-${cpuType} ..."'
+ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${cpuType} /tini
+RUN chmod +x /tini
+ENTRYPOINT ["/tini", "--", "/usr/bin/entrypoint.sh"]
 CMD ["taosd"]
 VOLUME [ "/var/lib/taos", "/var/log/taos", "/corefile" ]
diff --git a/packaging/docker/dockerbuild.sh b/packaging/docker/dockerbuild.sh
index c0e52f6dce..3729131c0e 100755
--- a/packaging/docker/dockerbuild.sh
+++ b/packaging/docker/dockerbuild.sh
@@ -89,7 +89,7 @@ cp -f ${comunityArchiveDir}/${pkgFile}  .
 echo "dirName=${dirName}"
 
 
-docker build --rm -f "Dockerfile"  --network=host -t tdengine/tdengine-${dockername}:${version} "." --build-arg pkgFile=${pkgFile} --build-arg dirName=${dirName}
+docker build --rm -f "Dockerfile"  --network=host -t tdengine/tdengine-${dockername}:${version} "." --build-arg pkgFile=${pkgFile} --build-arg dirName=${dirName} --build-arg cpuType=${cpuType}
 docker login -u tdengine -p ${passWord}  #replace the docker registry username and password
 docker push tdengine/tdengine-${dockername}:${version}
 
@@ -98,4 +98,4 @@ docker tag tdengine/tdengine-${dockername}:${version} tdengine/tdengine-${docker
 docker push tdengine/tdengine-${dockername}:latest
 
 
-rm -f ${pkgFile}
\ No newline at end of file
+rm -f ${pkgFile}
-- 
GitLab