Merge pull request #146 from DDS-Derek/main

Add PUID, PGID, Umask settings to Docker image

Dockerfile

@@ -9,19 +9,33 @@ RUN python3 -m pip install --upgrade pip \
 
 FROM python:3.10-alpine
 
+ENV TZ=Asia/Shanghai \
+    PUID=1000 \
+    PGID=1000 \
+    UMASK=022
+
 WORKDIR /src
 
-COPY --from=build /install /usr/local
-ADD ./src /src
+COPY --from=build --chmod=777 /install /usr/local
+COPY --chmod=755 ./src /src
 
-RUN apk add curl
+RUN apk add --no-cache \
+    curl \
+    shadow \
+    su-exec \
+    bash
 
-RUN mkdir "/config" && \
-    chmod a+x run.sh && \
-    chmod a+x getWebUI.sh
-
-ENV TZ=Asia/Shanghai
+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" && \
+    chmod a+x \
+        run.sh \
+        getWebUI.sh \
+        setID.sh
 
 EXPOSE 7892
 
+VOLUME [ "/config" ]
+
 CMD ["sh", "run.sh"]

docs/docker-compose/All-in-one/docker-compose.yml

@@ -25,6 +25,8 @@ services:
     container_name: AutoBangumi
     environment:
       - TZ=Asia/Shanghai
+      - PGID=${GID}
+      - PUID=${UID}
       - AB_INTERVAL_TIME=1800
       - AB_DOWNLOADER_HOST=qbittorrent:${QB_PORT}
       - AB_DOWNLOADER_USERNAME=admin

docs/docker-compose/AutoBangumi/docker-compose.yml

@@ -4,6 +4,8 @@ services:
     container_name: AutoBangumi
     environment:
       - TZ=Asia/Shanghai
+      - PGID=${GID}
+      - PUID=${UID}
       - AB_INTERVAL_TIME=1800
       - AB_DOWNLOADER_HOST=localhost:${QB_PORT}
       - AB_DOWNLOADER_USERNAME=admin

docs/docker-compose/qBittorrent+AutoBangumi/docker-compose.yml

@@ -25,6 +25,8 @@ services:
     container_name: AutoBangumi
     environment:
       - TZ=Asia/Shanghai
+      - PGID=${GID}
+      - PUID=${UID}
       - AB_INTERVAL_TIME=1800
       - AB_DOWNLOADER_HOST=qbittorrent:${QB_PORT}
       - AB_DOWNLOADER_USERNAME=admin

src/run.sh

@@ -2,5 +2,8 @@
 
 sh ./getWebUI.sh
 
-exec python3 app.py &
-exec python3 api.py
+sh ./setID.sh
+
+umask ${UMASK}
+exec su-exec auto_bangumi:auto_bangumi python3 app.py &
+exec su-exec auto_bangumi:auto_bangumi python3 api.py

src/setID.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+echo "设置文件夹权限"
+echo "PUID=${PUID}"
+echo "PGID=${PGID}"
+
+groupmod -o -g "$PGID" auto_bangumi
+usermod -o -u "$PUID" auto_bangumi
+
+chown -R auto_bangumi:auto_bangumi /src /templates /config