diff --git a/spring-runner/Dockerfile-alpine b/spring-runner/Dockerfile-alpine index 3c8f088..5a75c6c 100644 --- a/spring-runner/Dockerfile-alpine +++ b/spring-runner/Dockerfile-alpine @@ -25,7 +25,7 @@ FROM image # 安装时区 ENV TZ=Asia/Shanghai -RUN apk add --no-cache tzdata curl busybox-extras +RUN apk add --no-cache tzdata curl busybox-extras tini # 复制启动可执行文件要用到的辅助工具 COPY --from=builder /workspace/gosu /usr/local/bin/gosu diff --git a/spring-runner/Dockerfile-ubuntu b/spring-runner/Dockerfile-ubuntu index 80e776e..b52c5e2 100644 --- a/spring-runner/Dockerfile-ubuntu +++ b/spring-runner/Dockerfile-ubuntu @@ -26,7 +26,7 @@ FROM image # 安装时区 ENV TZ=Asia/Shanghai RUN apt-get update && \ - apt-get install -y --no-install-recommends tzdata ca-certificates curl telnet iputils-ping nano vim && \ + apt-get install -y --no-install-recommends tzdata ca-certificates curl telnet iputils-ping nano vim tini && \ rm -rf /var/lib/apt/lists/* # 复制启动可执行文件要用到的辅助工具 diff --git a/spring-runner/entrypoint-alpine.sh b/spring-runner/entrypoint-alpine.sh index 85a41af..bea4236 100644 --- a/spring-runner/entrypoint-alpine.sh +++ b/spring-runner/entrypoint-alpine.sh @@ -38,7 +38,7 @@ SPRING_OPTS="-Dspring.config.additional-location=optional:./config/" #=========================================================================================== if [ "$1" == "java" ]; then # 运行开发人员指定的程序 - exec gosu runner "$@" + exec gosu runner tini -- "$@" else - exec gosu runner java "$JAVA_OPTS" "$SPRING_OPTS" "$@" -jar "$RUNNER_EXECUTABLE" + exec gosu runner tini -- java "$JAVA_OPTS" "$SPRING_OPTS" "$@" -jar "$RUNNER_EXECUTABLE" fi \ No newline at end of file diff --git a/spring-runner/entrypoint-ubuntu.sh b/spring-runner/entrypoint-ubuntu.sh index 06917d7..78b0183 100644 --- a/spring-runner/entrypoint-ubuntu.sh +++ b/spring-runner/entrypoint-ubuntu.sh @@ -38,7 +38,7 @@ SPRING_OPTS="-Dspring.config.additional-location=optional:./config/" #=========================================================================================== if [ "$1" == "java" ]; then # 运行开发人员指定的程序 - exec gosu runner "$@" + exec gosu runner tini -- "$@" else - exec gosu runner java "$JAVA_OPTS" "$SPRING_OPTS" "$@" -jar "$RUNNER_EXECUTABLE" + exec gosu runner tini -- java "$JAVA_OPTS" "$SPRING_OPTS" "$@" -jar "$RUNNER_EXECUTABLE" fi \ No newline at end of file