Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

增加pikpak自动apache #7204

Open
wants to merge 14 commits into
base: main
Choose a base branch
from
Open
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
更新 pikpak自动验证的docker服务器
xiaokai committed Aug 30, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit 6b1e91964c3a8af7cad2ff7ed14b4bae627e685d
9 changes: 5 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -38,9 +38,10 @@ FROM ubuntu as pikpak_server
RUN apt update && \
apt install -y git
WORKDIR /app
RUN git clone https://github.com/wangjunkai2022/auto_pikpak.git --depth 1
WORKDIR /app/auto_pikpak
COPY --from=install_py /app/auto_pikpak/venv /app/auto_pikpak/venv
RUN git clone --depth=1 --recurse-submodules https://github.com/wangjunkai2022/pikpak_captcha_server.git
WORKDIR /app/pikpak_captcha_server
RUN rm -rf /app/pikpak_captcha_server/pikpak_captcha/ai/ai_train_pikpak
COPY --from=install_py /app/auto_pikpak/venv /app/pikpak_captcha_server/venv

FROM ubuntu
ARG INSTALL_FFMPEG=false
@@ -53,7 +54,7 @@ RUN apt update && \
apt install -y bash ca-certificates tzdata ffmpeg

# 复制 auto_pikpak 到第二阶段
COPY --from=pikpak_server /app/auto_pikpak /app/auto_pikpak
COPY --from=pikpak_server /app/pikpak_captcha_server /app/pikpak_captcha_server
COPY --from=build_alist /app/bin/alist ./
COPY entrypoint.sh /entrypoint.sh
RUN chmod +x /entrypoint.sh && /entrypoint.sh version
4 changes: 2 additions & 2 deletions entrypoint.sh
Original file line number Diff line number Diff line change
@@ -4,11 +4,11 @@ chown -R ${PUID}:${PGID} /opt/alist/

umask ${UMASK}
# 指定 Python 程序的工作目录
PYTHON_DIR="/app/auto_pikpak"
PYTHON_DIR="/app/pikpak_captcha_server"

# 启动 Python 程序
(
cd "$PYTHON_DIR" && /app/auto_pikpak/venv/bin/python3 server.py &
cd "$PYTHON_DIR" && /app/pikpak_captcha_server/venv/bin/python3 server.py &
)

if [ "$1" = "version" ]; then