Skip to content

Commit a67a9b4

Browse files
committed
fix: prevent zombie processes
1 parent cbf47ff commit a67a9b4

1 file changed

Lines changed: 6 additions & 3 deletions

File tree

Dockerfile

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,10 @@ ENV LANG=C.UTF-8 \
1717
ARG ENABLE_REPLACE_APT_SOURCES=false
1818
RUN --mount=type=bind,source=docker/replace-apt-sources.sh,target=replace-apt-sources.sh \
1919
bash replace-apt-sources.sh ${ENABLE_REPLACE_APT_SOURCES} \
20+
&& add-apt-repository universe \
2021
&& apt-get update -qq \
2122
&& apt-get install -y -qq --no-install-recommends \
22-
ca-certificates tzdata \
23+
ca-certificates tzdata tini \
2324
sudo git unzip wget curl host dos2unix vim \
2425
make cmake \
2526
build-essential \
@@ -73,12 +74,14 @@ ENV NACOS_ADDR="127.0.0.1:8848" \
7374
JAVA_OPT="" \
7475
JAVA_OPT_EXT=""
7576

76-
ENTRYPOINT /wait \
77+
ENTRYPOINT ["/usr/bin/tini", "--"]
78+
79+
CMD /wait \
7780
&& JAVA_OPT="${JAVA_OPT} -jar sduoj-judger.jar" \
7881
&& JAVA_OPT="${JAVA_OPT} ${JAVA_OPT_EXT}" \
7982
&& JAVA_OPT="${JAVA_OPT} --sduoj.config.active=$ACTIVE" \
8083
&& JAVA_OPT="${JAVA_OPT} --sduoj.config.nacos-addr=$NACOS_ADDR" \
81-
&& echo "SDUOJ is starting, you can check the '/app/logs/judger.log'" \
84+
&& echo "SDUOJ is starting. Logs are in '/app/logs/judger.log'" \
8285
&& echo "Run: java ${JAVA_OPT}" \
8386
&& mkdir -p /app/logs \
8487
&& exec java ${JAVA_OPT} >> /app/logs/judger.log 2>&1

0 commit comments

Comments
 (0)