diff --git a/hack/contrib/docker/api/entrypoint.sh b/hack/contrib/docker/api/entrypoint.sh index b5ebb2394b..ea19fd334f 100755 --- 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 \ No newline at end of file diff --git a/hack/contrib/docker/chaos/entrypoint.sh b/hack/contrib/docker/chaos/entrypoint.sh index 0f466d2c44..5d25b7505b 100755 --- 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 \ No newline at end of file diff --git a/hack/contrib/docker/eventlog/Dockerfile.arm b/hack/contrib/docker/eventlog/Dockerfile.arm index ac58d01dfe..b9369c268b 100644 --- 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 index 6052180589..ff2eb04fd5 100755 --- 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 \ No newline at end of file diff --git a/hack/contrib/docker/init-probe/entrypoint.sh b/hack/contrib/docker/init-probe/entrypoint.sh index 31f93cd12f..6c32b6abbc 100755 --- 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 \ 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 diff --git a/hack/contrib/docker/mq/entrypoint.sh b/hack/contrib/docker/mq/entrypoint.sh index d6df4f3a0f..f417222e36 100755 --- 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 \ No newline at end of file diff --git a/hack/contrib/docker/node/entrypoint.sh b/hack/contrib/docker/node/entrypoint.sh index 019848d50c..d56eac68dc 100755 --- 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 \ No newline at end of file diff --git a/hack/contrib/docker/webcli/entrypoint.sh b/hack/contrib/docker/webcli/entrypoint.sh index 1f0c2db583..440cb359bc 100755 --- 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 \ No newline at end of file diff --git a/hack/contrib/docker/worker/entrypoint.sh b/hack/contrib/docker/worker/entrypoint.sh index ff3664971c..fd65bb8caa 100755 --- 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 \ No newline at end of file