From c0761caabdeb461424c891f68bc5c436273983aa Mon Sep 17 00:00:00 2001 From: DDSRem <1448139087@qq.com> Date: Thu, 22 Sep 2022 21:25:49 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E5=A2=9E=E5=8A=A0PUID=E5=92=8CPGID?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=EF=BC=8C=E4=BD=BF=E7=94=A8supervisor?= =?UTF-8?q?=E5=90=AF=E5=8A=A8=E7=A8=8B=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 15 ++++++++--- src/bangumi.conf | 67 ++++++++++++++++++++++++++++++++++++++++++++++++ src/run.sh | 10 ++++++-- 3 files changed, 87 insertions(+), 5 deletions(-) create mode 100644 src/bangumi.conf diff --git a/Dockerfile b/Dockerfile index 9d2d8ce0..84adf7f0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,13 +14,22 @@ WORKDIR /src COPY --from=build /install /usr/local ADD ./src /src -RUN apk add curl +RUN apk add --update --no-cache \ + curl \ + shadow \ + supervisor -RUN mkdir "/config" && \ +RUN addgroup -S bangumi && \ + adduser -S bangumi -G bangumi -h /home/bangumi && \ + usermod -s /bin/bash bangumi + +RUN mkdir -p "/config" "/config/logs/supervisor" && \ chmod a+x run.sh && \ chmod a+x getWebUI.sh -ENV TZ=Asia/Shanghai +ENV TZ=Asia/Shanghai \ + PUID=1000 \ + PGID=1000 EXPOSE 7892 diff --git a/src/bangumi.conf b/src/bangumi.conf new file mode 100644 index 00000000..ae884a95 --- /dev/null +++ b/src/bangumi.conf @@ -0,0 +1,67 @@ +[unix_http_server] +file=/supervisor.sock +chmod=0700 + +[supervisord] +nodaemon=true +childlogdir=/config/logs/supervisor +logfile=/config/logs/supervisord.log +pidfile=/supervisord.pid + +[rpcinterface:supervisor] +supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface + +[supervisorctl] +serverurl=unix:///supervisor.sock + +[program:bangumi_app] +; 启动位置 +directory=/src +; 启动命令 +command=python3 app.py +; 是否自动重启 +autostart=true +autorestart=true +; 等待时间 +startsecs=1 +; 启动进程数 +numprocs=1 +; 重试次数 +startretries=3 +; 是否杀死子进程 +killasgroup=true +stopasgroup=true +; 日志输出控制台 +redirect_stderr=true +; 日志保存最大 10M +stdout_logfile_maxbytes=10MB +; 日志保存最大七天 +stdout_logfile_backups=3 +; 用户 +user=bangumi + +[program:bangumi_api] +; 启动位置 +directory=/src +; 启动命令 +command=python3 api.py +; 是否自动重启 +autostart=true +autorestart=true +; 等待时间 +startsecs=1 +; 启动进程数 +numprocs=1 +; 重试次数 +startretries=3 +; 是否杀死子进程 +killasgroup=true +stopasgroup=true +; 日志输出控制台 +redirect_stderr=true +; 日志保存最大 10M +stdout_logfile_maxbytes=10MB +; 日志保存最大七天 +stdout_logfile_backups=3 +; 用户 +user=bangumi \ No newline at end of file diff --git a/src/run.sh b/src/run.sh index effc9ea2..cc03ab22 100755 --- a/src/run.sh +++ b/src/run.sh @@ -2,5 +2,11 @@ sh ./getWebUI.sh -exec python3 app.py & -exec python3 api.py +groupmod -o -g "$PGID" bangumi +usermod -o -u "$PUID" bangumi + +echo '设置文件夹权限' +chown bangumi:bangumi /config +chown -R bangumi:bangumi /src /usr/local + +exec /usr/bin/supervisord -n -c /src/bangumi.conf \ No newline at end of file From 5dcc91cebf632c497b133c096ff01ed5f1c7fe27 Mon Sep 17 00:00:00 2001 From: DDSRem <1448139087@qq.com> Date: Fri, 23 Sep 2022 18:01:44 +0800 Subject: [PATCH 02/11] =?UTF-8?q?fix=20bug=20=E4=BC=98=E5=8C=96=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=E4=BD=93=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 4 +++- src/bangumi.conf | 1 + src/run.sh | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 84adf7f0..0e3faa6e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,7 +11,7 @@ FROM python:3.10-alpine WORKDIR /src -COPY --from=build /install /usr/local +COPY --from=build --chmod=777 /install /usr/local ADD ./src /src RUN apk add --update --no-cache \ @@ -33,4 +33,6 @@ ENV TZ=Asia/Shanghai \ EXPOSE 7892 +VOLUME [ "/config" ] + CMD ["sh", "run.sh"] diff --git a/src/bangumi.conf b/src/bangumi.conf index ae884a95..0fcbb6a7 100644 --- a/src/bangumi.conf +++ b/src/bangumi.conf @@ -7,6 +7,7 @@ nodaemon=true childlogdir=/config/logs/supervisor logfile=/config/logs/supervisord.log pidfile=/supervisord.pid +user=root [rpcinterface:supervisor] supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface diff --git a/src/run.sh b/src/run.sh index cc03ab22..afc9de1f 100755 --- a/src/run.sh +++ b/src/run.sh @@ -7,6 +7,6 @@ usermod -o -u "$PUID" bangumi echo '设置文件夹权限' chown bangumi:bangumi /config -chown -R bangumi:bangumi /src /usr/local +chown -R bangumi:bangumi /src exec /usr/bin/supervisord -n -c /src/bangumi.conf \ No newline at end of file From 0967aec3d7f28f03d64b7991dc3c23cfd361f4fc Mon Sep 17 00:00:00 2001 From: DDSRem <1448139087@qq.com> Date: Fri, 23 Sep 2022 18:15:24 +0800 Subject: [PATCH 03/11] =?UTF-8?q?=E5=A2=9E=E5=8A=A0PUID=E5=92=8CPGID?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 11 ++++---- src/bangumi.conf | 68 ------------------------------------------------ src/run.sh | 10 +++---- src/setID.sh | 8 ++++++ 4 files changed, 16 insertions(+), 81 deletions(-) delete mode 100644 src/bangumi.conf create mode 100644 src/setID.sh diff --git a/Dockerfile b/Dockerfile index 0e3faa6e..9afde965 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,13 +17,12 @@ ADD ./src /src RUN apk add --update --no-cache \ curl \ shadow \ - supervisor + su-exec -RUN addgroup -S bangumi && \ - adduser -S bangumi -G bangumi -h /home/bangumi && \ - usermod -s /bin/bash bangumi - -RUN mkdir -p "/config" "/config/logs/supervisor" && \ +RUN addgroup -S auto_bangumi && \ + adduser -S auto_bangumi -G auto_bangumi -h /home/auto_bangumi && \ + usermod -s /bin/bash auto_bangumi && \ + mkdir -p "/config" && \ chmod a+x run.sh && \ chmod a+x getWebUI.sh diff --git a/src/bangumi.conf b/src/bangumi.conf deleted file mode 100644 index 0fcbb6a7..00000000 --- a/src/bangumi.conf +++ /dev/null @@ -1,68 +0,0 @@ -[unix_http_server] -file=/supervisor.sock -chmod=0700 - -[supervisord] -nodaemon=true -childlogdir=/config/logs/supervisor -logfile=/config/logs/supervisord.log -pidfile=/supervisord.pid -user=root - -[rpcinterface:supervisor] -supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface - -[supervisorctl] -serverurl=unix:///supervisor.sock - -[program:bangumi_app] -; 启动位置 -directory=/src -; 启动命令 -command=python3 app.py -; 是否自动重启 -autostart=true -autorestart=true -; 等待时间 -startsecs=1 -; 启动进程数 -numprocs=1 -; 重试次数 -startretries=3 -; 是否杀死子进程 -killasgroup=true -stopasgroup=true -; 日志输出控制台 -redirect_stderr=true -; 日志保存最大 10M -stdout_logfile_maxbytes=10MB -; 日志保存最大七天 -stdout_logfile_backups=3 -; 用户 -user=bangumi - -[program:bangumi_api] -; 启动位置 -directory=/src -; 启动命令 -command=python3 api.py -; 是否自动重启 -autostart=true -autorestart=true -; 等待时间 -startsecs=1 -; 启动进程数 -numprocs=1 -; 重试次数 -startretries=3 -; 是否杀死子进程 -killasgroup=true -stopasgroup=true -; 日志输出控制台 -redirect_stderr=true -; 日志保存最大 10M -stdout_logfile_maxbytes=10MB -; 日志保存最大七天 -stdout_logfile_backups=3 -; 用户 -user=bangumi \ No newline at end of file diff --git a/src/run.sh b/src/run.sh index afc9de1f..09976edd 100755 --- a/src/run.sh +++ b/src/run.sh @@ -2,11 +2,7 @@ sh ./getWebUI.sh -groupmod -o -g "$PGID" bangumi -usermod -o -u "$PUID" bangumi +sh ./setID.sh -echo '设置文件夹权限' -chown bangumi:bangumi /config -chown -R bangumi:bangumi /src - -exec /usr/bin/supervisord -n -c /src/bangumi.conf \ No newline at end of file +su-exec auto_bangumi:auto_bangumi python3 app.py & +su-exec auto_bangumi:auto_bangumi python3 api.py \ No newline at end of file diff --git a/src/setID.sh b/src/setID.sh new file mode 100644 index 00000000..ea1cde54 --- /dev/null +++ b/src/setID.sh @@ -0,0 +1,8 @@ +#!/bin/bash + +groupmod -o -g "$PGID" auto_bangumi +usermod -o -u "$PUID" auto_bangumi + +echo '设置文件夹权限' +chown auto_bangumi:auto_bangumi /config +chown -R auto_bangumi:auto_bangumi /src \ No newline at end of file From c3923da837913513856e0248710020ee97f53c95 Mon Sep 17 00:00:00 2001 From: DDSRem <1448139087@qq.com> Date: Fri, 23 Sep 2022 18:21:44 +0800 Subject: [PATCH 04/11] =?UTF-8?q?docker-compose=E6=B7=BB=E5=8A=A0PUID?= =?UTF-8?q?=E5=92=8CPGID=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/docker-compose/All-in-one/docker-compose.yml | 2 ++ docs/docker-compose/AutoBangumi/docker-compose.yml | 2 ++ docs/docker-compose/qBittorrent+AutoBangumi/docker-compose.yml | 2 ++ 3 files changed, 6 insertions(+) diff --git a/docs/docker-compose/All-in-one/docker-compose.yml b/docs/docker-compose/All-in-one/docker-compose.yml index 0dd3c3db..3eff1b60 100644 --- a/docs/docker-compose/All-in-one/docker-compose.yml +++ b/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 diff --git a/docs/docker-compose/AutoBangumi/docker-compose.yml b/docs/docker-compose/AutoBangumi/docker-compose.yml index 43b53f18..04e2663c 100644 --- a/docs/docker-compose/AutoBangumi/docker-compose.yml +++ b/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 diff --git a/docs/docker-compose/qBittorrent+AutoBangumi/docker-compose.yml b/docs/docker-compose/qBittorrent+AutoBangumi/docker-compose.yml index 65d71dba..f25a0487 100644 --- a/docs/docker-compose/qBittorrent+AutoBangumi/docker-compose.yml +++ b/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 From 4579cf7a658854110f1323181d0157fd1e48ca94 Mon Sep 17 00:00:00 2001 From: DDSRem <1448139087@qq.com> Date: Sat, 24 Sep 2022 20:12:58 +0800 Subject: [PATCH 05/11] fix bug --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index 9afde965..7f826ab9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -23,6 +23,7 @@ RUN addgroup -S auto_bangumi && \ adduser -S auto_bangumi -G auto_bangumi -h /home/auto_bangumi && \ usermod -s /bin/bash auto_bangumi && \ mkdir -p "/config" && \ + chmod -R 777 /usr/local && \ chmod a+x run.sh && \ chmod a+x getWebUI.sh From 15b5172bebc07b82ec6ff0214c3f95ed1a32cfb3 Mon Sep 17 00:00:00 2001 From: DDSRem <1448139087@qq.com> Date: Sat, 24 Sep 2022 20:21:38 +0800 Subject: [PATCH 06/11] =?UTF-8?q?=E5=8E=8B=E7=BC=A9=E9=95=9C=E5=83=8F?= =?UTF-8?q?=E4=BD=93=E7=A7=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 7f826ab9..3846a695 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,11 +7,16 @@ COPY requirements.txt . RUN python3 -m pip install --upgrade pip \ && pip install -r requirements.txt --prefix="/install" +FROM python:3.10-alpine AS permission + +COPY --from=build --chmod=777 /install /usr/local +RUN chmod -R 777 /usr/local + FROM python:3.10-alpine WORKDIR /src -COPY --from=build --chmod=777 /install /usr/local +COPY --from=permission --chmod=777 /usr/local /usr/local ADD ./src /src RUN apk add --update --no-cache \ @@ -23,7 +28,6 @@ RUN addgroup -S auto_bangumi && \ adduser -S auto_bangumi -G auto_bangumi -h /home/auto_bangumi && \ usermod -s /bin/bash auto_bangumi && \ mkdir -p "/config" && \ - chmod -R 777 /usr/local && \ chmod a+x run.sh && \ chmod a+x getWebUI.sh From af89d6a8063de9d78d8eb6f66ec8f395ce19ea4e Mon Sep 17 00:00:00 2001 From: DDSRem <1448139087@qq.com> Date: Sun, 25 Sep 2022 11:15:44 +0800 Subject: [PATCH 07/11] fix bug --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 3846a695..d49c7439 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,7 +22,8 @@ ADD ./src /src RUN apk add --update --no-cache \ curl \ shadow \ - su-exec + su-exec \ + bash RUN addgroup -S auto_bangumi && \ adduser -S auto_bangumi -G auto_bangumi -h /home/auto_bangumi && \ From c17fdfae984228fd2591ff4edc05dcfb02a5cb45 Mon Sep 17 00:00:00 2001 From: DDSRem <1448139087@qq.com> Date: Thu, 6 Oct 2022 14:08:52 +0800 Subject: [PATCH 08/11] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9D=83=E9=99=90Bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index d49c7439..436b09a6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,16 +7,11 @@ COPY requirements.txt . RUN python3 -m pip install --upgrade pip \ && pip install -r requirements.txt --prefix="/install" -FROM python:3.10-alpine AS permission - -COPY --from=build --chmod=777 /install /usr/local -RUN chmod -R 777 /usr/local - FROM python:3.10-alpine WORKDIR /src -COPY --from=permission --chmod=777 /usr/local /usr/local +COPY --from=build --chmod=777 /install /usr/local ADD ./src /src RUN apk add --update --no-cache \ From 9f261e3a50d35c2b8871641a0684df85465fed34 Mon Sep 17 00:00:00 2001 From: DDSRem <1448139087@qq.com> Date: Wed, 28 Dec 2022 13:31:40 +0800 Subject: [PATCH 09/11] optimization --- Dockerfile | 13 ++++++++----- src/run.sh | 1 + src/setID.sh | 8 +++++--- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index 436b09a6..d58ec0da 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,16 +20,19 @@ RUN apk add --update --no-cache \ su-exec \ bash -RUN addgroup -S auto_bangumi && \ - adduser -S auto_bangumi -G auto_bangumi -h /home/auto_bangumi && \ +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 && \ - chmod a+x getWebUI.sh + chmod a+x \ + run.sh \ + getWebUI.sh \ + setID.sh ENV TZ=Asia/Shanghai \ PUID=1000 \ - PGID=1000 + PGID=1000 \ + UMASK=022 EXPOSE 7892 diff --git a/src/run.sh b/src/run.sh index 09976edd..b3b1dfcc 100755 --- a/src/run.sh +++ b/src/run.sh @@ -4,5 +4,6 @@ sh ./getWebUI.sh sh ./setID.sh +umask ${UMASK} su-exec auto_bangumi:auto_bangumi python3 app.py & su-exec auto_bangumi:auto_bangumi python3 api.py \ No newline at end of file diff --git a/src/setID.sh b/src/setID.sh index ea1cde54..64b28214 100644 --- a/src/setID.sh +++ b/src/setID.sh @@ -1,8 +1,10 @@ #!/bin/bash +echo "设置文件夹权限" +echo "PUID=${PUID}" +echo "PGID=${PGID}" + groupmod -o -g "$PGID" auto_bangumi usermod -o -u "$PUID" auto_bangumi -echo '设置文件夹权限' -chown auto_bangumi:auto_bangumi /config -chown -R auto_bangumi:auto_bangumi /src \ No newline at end of file +chown -R auto_bangumi:auto_bangumi /src /templates /config \ No newline at end of file From 7ea32664368239561014e079e660f91a1b244b41 Mon Sep 17 00:00:00 2001 From: DDS-Tomo <108336573+DDS-ALL@users.noreply.github.com> Date: Wed, 28 Dec 2022 18:22:34 +0800 Subject: [PATCH 10/11] optimization --- Dockerfile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index d58ec0da..c8f73bb5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,12 +9,17 @@ 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 --chmod=777 /install /usr/local -ADD ./src /src +COPY --chmod=755 ./src /src -RUN apk add --update --no-cache \ +RUN apk add --no-cache \ curl \ shadow \ su-exec \ @@ -29,11 +34,6 @@ RUN addgroup -S auto_bangumi -g 1000 && \ getWebUI.sh \ setID.sh -ENV TZ=Asia/Shanghai \ - PUID=1000 \ - PGID=1000 \ - UMASK=022 - EXPOSE 7892 VOLUME [ "/config" ] From 8908b1fbbfe4ad2e8fe703bf6cc1d268447050e4 Mon Sep 17 00:00:00 2001 From: DDS-Tomo <108336573+DDS-ALL@users.noreply.github.com> Date: Wed, 28 Dec 2022 18:24:24 +0800 Subject: [PATCH 11/11] optimization --- src/run.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/run.sh b/src/run.sh index b3b1dfcc..39b6916d 100755 --- a/src/run.sh +++ b/src/run.sh @@ -5,5 +5,5 @@ sh ./getWebUI.sh sh ./setID.sh umask ${UMASK} -su-exec auto_bangumi:auto_bangumi python3 app.py & -su-exec auto_bangumi:auto_bangumi python3 api.py \ No newline at end of file +exec su-exec auto_bangumi:auto_bangumi python3 app.py & +exec su-exec auto_bangumi:auto_bangumi python3 api.py