feat: add tini manage process (#1788)

Signed-off-by: Qi Zhang <[email protected]>
goodrain · Nov 29, 2023 · 6dd8ae6 · 6dd8ae6
1 parent d9d4188
commit 6dd8ae6
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 10 deletions.
diff --git a/hack/contrib/docker/api/entrypoint.sh b/hack/contrib/docker/api/entrypoint.sh
@@ -4,5 +4,5 @@ if [ "$1" = "bash" ];then
 elif [ "$1" = "version" ];then
     /run/rainbond-api version
 else
-    exec /run/rainbond-api --start=true $@
+    exec /bin/tini -- /run/rainbond-api --start=true $@
 fi
diff --git a/hack/contrib/docker/chaos/entrypoint.sh b/hack/contrib/docker/chaos/entrypoint.sh
@@ -4,5 +4,5 @@ if [ "$1" = "bash" ];then
 elif [ "$1" = "version" ];then
     /run/rainbond-chaos version
 else
-    exec /run/rainbond-chaos $@
+    exec /bin/tini -- /run/rainbond-chaos $@
 fi
diff --git a/hack/contrib/docker/eventlog/Dockerfile.arm b/hack/contrib/docker/eventlog/Dockerfile.arm
@@ -1,4 +1,5 @@
-FROM goodrainapps/alpine:3.16
+ARG BASE_IMAGE_VERSION
+FROM goodrainapps/alpine:${BASE_IMAGE_VERSION}
 ARG RELEASE_DESC
 RUN apk add --no-cache libstdc++ ca-certificates openssl openssl-dev zeromq-dev
 

diff --git a/hack/contrib/docker/eventlog/entrypoint.sh b/hack/contrib/docker/eventlog/entrypoint.sh
@@ -4,5 +4,5 @@ if [ "$1" = "bash" ];then
 elif [ "$1" = "version" ];then
     /run/rainbond-eventlog version
 else
-    exec /run/rainbond-eventlog $@
+    exec /bin/tini -- /run/rainbond-eventlog $@
 fi
diff --git a/hack/contrib/docker/init-probe/entrypoint.sh b/hack/contrib/docker/init-probe/entrypoint.sh
@@ -4,5 +4,5 @@ if [ "$1" = "bash" ];then
 elif [ "$1" = "version" ];then
     /run/rainbond-init-probe version
 else
-    exec /run/rainbond-init-probe $@
+    exec /bin/tini -- /run/rainbond-init-probe $@
 fi
diff --git 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
diff --git a/hack/contrib/docker/mq/entrypoint.sh b/hack/contrib/docker/mq/entrypoint.sh
@@ -4,5 +4,5 @@ if [ "$1" = "bash" ];then
 elif [ "$1" = "version" ];then
     /run/rainbond-mq version
 else
-    exec /run/rainbond-mq $@
+    exec /bin/tini -- /run/rainbond-mq $@
 fi
diff --git a/hack/contrib/docker/node/entrypoint.sh b/hack/contrib/docker/node/entrypoint.sh
@@ -4,5 +4,5 @@ if [ "$1" = "bash" ];then
 elif [ "$1" = "version" ];then
     /run/rainbond-node version
 else
-    exec /run/rainbond-node $@
+    exec /bin/tini -- /run/rainbond-node $@
 fi
diff --git a/hack/contrib/docker/webcli/entrypoint.sh b/hack/contrib/docker/webcli/entrypoint.sh
@@ -4,5 +4,5 @@ if [ "$1" = "bash" ];then
 elif [ "$1" = "version" ];then
     /usr/bin/rainbond-webcli version
 else
-    exec /usr/bin/rainbond-webcli $@
+    exec /bin/tini -- /usr/bin/rainbond-webcli $@
 fi
diff --git a/hack/contrib/docker/worker/entrypoint.sh b/hack/contrib/docker/worker/entrypoint.sh
@@ -4,5 +4,5 @@ if [ "$1" = "bash" ];then
 elif [ "$1" = "version" ];then
     /run/rainbond-worker version
 else
-    exec /run/rainbond-worker $@
+    exec /bin/tini -- /run/rainbond-worker $@
 fi