Merge pull request #202 from DDS-Derek/2.6.0-dev

feat: Rewrite docker

Dockerfile

@@ -1,41 +1,65 @@
 # syntax=docker/dockerfile:1
-FROM python:3.11-alpine
 
-ENV TZ=Asia/Shanghai \
+FROM python:3.11-alpine AS Builder
+WORKDIR /app
+COPY requirements.txt .
+RUN apk add --no-cache --virtual=build-dependencies \
+        libxml2-dev \
+        libxslt-dev \
+        gcc \
+        g++ \
+        linux-headers \
+        build-base && \
+    python3 -m pip install --upgrade pip && \
+    pip install cython && \
+    pip install --no-cache-dir -r requirements.txt && \
+    apk del --purge \
+        build-dependencies && \
+    rm -rf \
+        /root/.cache \
+        /tmp/*
+
+FROM scratch AS APP
+
+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" \
+    TZ=Asia/Shanghai \
     PUID=1000 \
     PGID=1000 \
     UMASK=022
 
+COPY --from=Builder / /
+
 WORKDIR /app
 
-COPY requirements.txt .
-
-RUN python3 -m pip install --upgrade pip \
-    && pip install -r requirements.txt --no-cache-dir
+RUN apk add --no-cache \
+        curl \
+        wget \
+        jq \
+        shadow \
+        s6-overlay \
+        bash && \
+    # Download WebUI
+    wget "https://github.com/Rewrite0/Auto_Bangumi_WebUI/releases/latest/download/dist.zip" -O /tmp/dist.zip && \
+    unzip -q -d /tmp /tmp/dist.zip && \
+    mv /tmp/dist /app/templates && \
+    # Add user
+    mkdir /ab && \
+    addgroup -S ab -g 911 && \
+    adduser -S ab -G ab -h /ab -s /bin/bash -u 911 && \
+    rm -rf \
+        /root/.cache \
+        /tmp/*
 
 COPY --chmod=755 src/. .
+COPY --chmod=755 ./docker /
 
-RUN apk add --no-cache \
-    curl \
-    shadow \
-    su-exec \
-    bash
-
-# Download WebUI
-RUN wget "https://github.com/Rewrite0/Auto_Bangumi_WebUI/releases/download/$(curl 'https://api.github.com/repos/Rewrite0/Auto_Bangumi_WebUI/releases/latest' | grep "tag_name" | head -n 1 | awk -F ":" '{print $2}' | sed 's/\"//g;s/,//g;s/ //g')/dist.zip" && \
-    unzip dist.zip && \
-    mv dist templates
-
-RUN addgroup -S auto_bangumi -g 1000 && \
-    adduser -S auto_bangumi -G auto_bangumi -h /home/auto_bangumi -u 1000 && \
-    usermod -s /bin/bash auto_bangumi && \
-    mkdir -p "config" && \
-    mkdir -p "data" && \
-    chmod a+x \
-        run.sh
+ENTRYPOINT [ "/init" ]
 
 EXPOSE 7892
-
-VOLUME [ "/app/config" , "/app/data"]
-
-CMD ["sh", "run.sh"]
+VOLUME [ "/app/config" , "/app/data" ]

docker/etc/cont-init.d/010-old-compatible

@@ -0,0 +1,14 @@
+#!/usr/bin/with-contenv bash
+# shellcheck shell=bash
+
+function __old_compatible {
+
+    umask ${UMASK}
+
+    if [ -f /config/bangumi.json ]; then
+        mv /config/bangumi.json /app/data/bangumi.json
+    fi
+
+}
+
+__old_compatible 2>&1 | sed "s#^#cont-init: info: $(realpath $0): &#g"

docker/etc/cont-init.d/020-fixuser

@@ -0,0 +1,13 @@
+#!/usr/bin/with-contenv bash
+# shellcheck shell=bash
+
+function __fixuser {
+
+    groupmod -o -g "${PGID}" ab
+    usermod -o -u "${PUID}" ab
+
+    chown ab:ab -R /app
+
+}
+
+__fixuser 2>&1 | sed "s#^#cont-init: info: $(realpath $0): &#g"

docker/etc/services.d/auto_bangumi/finish

@@ -0,0 +1,4 @@
+#!/usr/bin/with-contenv bash
+# shellcheck shell=bash
+
+pkill -f 'python3 main.py'

docker/etc/services.d/auto_bangumi/notification-fd

@@ -0,0 +1 @@
+3

docker/etc/services.d/auto_bangumi/run

@@ -0,0 +1,16 @@
+#!/usr/bin/with-contenv bash
+# shellcheck shell=bash
+
+umask ${UMASK}
+
+if [ -f /app/config/config.json ]; then
+    AB_PORT=$(jq '.program.webui_port' /app/config/config.json)
+elif [ -f /app/config/config_dev.json ]; then
+    AB_PORT=$(jq '.program.webui_port' /app/config/config_dev.json)
+else
+    AB_PORT=7892
+fi
+
+exec \
+    s6-notifyoncheck -d -n 300 -w 1000 -c "nc -z localhost ${AB_PORT}" \
+    cd /app s6-setuidgid ab python3 main.py

src/run.sh

@@ -1,10 +0,0 @@
-#!/bin/bash
-
-# Check old version
-if [ -f /config/bangumi.json ]; then
-    mv /config/bangumi.json /app/data/bangumi.json
-fi
-
-
-umask ${UMASK}
-python3 main.py