Add tini.

cs125-illinois · Nov 9, 2022 · f4fc33b · f4fc33b
1 parent 3f0a7fd
commit f4fc33b
Showing 1 changed file with 23 additions and 18 deletions.
diff --git a/server/Dockerfile b/server/Dockerfile
@@ -2,26 +2,31 @@ FROM openjdk:17-jdk-slim
 
 RUN apt update && \
     apt install -y --no-install-recommends software-properties-common \
-      ca-certificates gpg-agent curl gnupg
+    ca-certificates gpg-agent curl gnupg
 RUN curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add - && \
-  add-apt-repository "deb [arch=amd64,arm64] https://download.docker.com/linux/ubuntu bionic stable" && \
-  apt update && \
-  apt install -y --no-install-recommends docker-ce-cli=5:20.10.16~3-0~ubuntu-bionic
+    add-apt-repository "deb [arch=amd64,arm64] https://download.docker.com/linux/ubuntu bionic stable" && \
+    apt update && \
+    apt install -y --no-install-recommends docker-ce-cli=5:20.10.16~3-0~ubuntu-bionic
+
+ARG TARGETARCH
+ENV TINI_VERSION v0.19.0
+ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${TARGETARCH} /tini
+RUN chmod +x /tini
+ENTRYPOINT ["/tini", "--"]
 
 WORKDIR /
 COPY *.jar jeed.jar
-CMD [\
-  "java",\
-  "-ea", "--enable-preview", "-Dfile.encoding=UTF-8",\
-  "-Xms512m", "-Xmx1G", "-Xss256k", "-XX:+UseZGC", "-XX:ZCollectionInterval=8",\
-  "-XX:-OmitStackTraceInFastThrow",\
-  "--add-opens", "java.base/java.lang=ALL-UNNAMED",\
-  "--add-exports", "jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED",\
-  "--add-exports", "jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED",\
-  "--add-exports", "jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED",\
-  "--add-exports", "jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED",\
-  "--add-exports", "jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED",\
-  "--add-exports", "java.management/sun.management=ALL-UNNAMED",\
-  "-jar", "jeed.jar"\
-]
+CMD java -ea --enable-preview -Dfile.encoding=UTF-8 \
+    -Xms1G -Xmx1G -Xss256k \
+    -XX:+UseZGC -XX:ZCollectionInterval=8 -XX:-OmitStackTraceInFastThrow \
+    --add-opens java.base/java.lang=ALL-UNNAMED \
+    --add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED \
+    --add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED \
+    --add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED \
+    --add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED \
+    --add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED \
+    --add-exports java.management/sun.management=ALL-UNNAMED \
+    $JAVA_OPTS \
+    -jar jeed.jar
+
 # vim: tw=0