Merge pull request #434 from DDS-Derek/tini

feat: from s6-overlay change to tini and su-exec

Dockerfile

@@ -1,14 +1,8 @@
 # syntax=docker/dockerfile:1
 
-FROM alpine:3.18 AS APP
+FROM alpine:3.18
 
-ENV S6_SERVICES_GRACETIME=30000 \
-    S6_KILL_GRACETIME=60000 \
-    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
-    S6_SYNC_DISKS=1 \
-    TERM="xterm" \
-    HOME="/ab" \
-    LANG="C.UTF-8" \
+ENV LANG="C.UTF-8" \
     TZ=Asia/Shanghai \
     PUID=1000 \
     PGID=1000 \
@@ -20,33 +14,29 @@ COPY backend/requirements.txt .
 RUN set -ex && \
     apk add --no-cache \
         bash \
-        ca-certificates \
-        coreutils \
-        curl \
-        jq \
-        netcat-openbsd \
-        procps-ng \
         python3 \
         py3-bcrypt \
         py3-pip \
-        s6-overlay \
+        su-exec \
         shadow \
+        tini \
         tzdata && \
     python3 -m pip install --no-cache-dir --upgrade pip && \
     sed -i '/bcrypt/d' requirements.txt && \
     pip install --no-cache-dir -r requirements.txt && \
     # Add user
+    mkdir -p /home/ab && \
     addgroup -S ab -g 911 && \
-    adduser -S ab -G ab -h /ab -s /bin/bash -u 911 && \
+    adduser -S ab -G ab -h /home/ab -s /sbin/nologin -u 911 && \
     # Clear
     rm -rf \
-        /ab/.cache \
+        /root/.cache \
         /tmp/*
 
 COPY --chmod=755 backend/src/. .
-COPY --chmod=755 docker/ /
+COPY --chmod=755 entrypoint.sh /entrypoint.sh
 
-ENTRYPOINT [ "/init" ]
+ENTRYPOINT ["tini", "-g", "--", "/entrypoint.sh"]
 
 EXPOSE 7892
 VOLUME [ "/app/config" , "/app/data" ]

entrypoint.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+# shellcheck shell=bash
+
+umask ${UMASK}
+
+if [ -f /config/bangumi.json ]; then
+    mv /config/bangumi.json /app/data/bangumi.json
+fi
+
+groupmod -o -g "${PGID}" ab
+usermod -o -u "${PUID}" ab
+
+chown ab:ab -R /app /home/ab
+
+exec su-exec "${PUID}:${PGID}" python3 main.py