diff --git a/Dockerfile b/Dockerfile index 9d2d8ce0..c8f73bb5 100644 --- a/Dockerfile +++ b/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"] 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 diff --git a/src/run.sh b/src/run.sh index effc9ea2..39b6916d 100755 --- a/src/run.sh +++ b/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 diff --git a/src/setID.sh b/src/setID.sh new file mode 100644 index 00000000..64b28214 --- /dev/null +++ b/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 \ No newline at end of file