feat: update docker structure

feat: update docker structure

test

fix build

fix build error

fix

fix docker builder error

Author: shinonomeow

.github/workflows/build.yml

@@ -185,7 +185,7 @@ jobs:
         uses: docker/metadata-action@v4
         with:
           images: |
-            estrellaxd/auto_bangumi
+            shinonomeow/auto_bangumi
             ghcr.io/${{ github.repository }}
           tags: |
             type=raw,value=${{ needs.version-info.outputs.version }}
@@ -197,7 +197,7 @@ jobs:
         uses: docker/metadata-action@v4
         with:
           images: |
-            estrellaxd/auto_bangumi
+            shinonomeow/auto_bangumi
             ghcr.io/${{ github.repository }}
           tags: |
             type=raw,value=${{ needs.version-info.outputs.version }}
@@ -222,7 +222,7 @@ jobs:
         uses: actions/download-artifact@v4
         with:
           name: dist
-          path: backend/src/dist
+          path: backend/dist
 
       - name: Build and push
         if: ${{ needs.version-info.outputs.release == 1 && needs.version-info.outputs.dev != 1 }}
@@ -258,7 +258,7 @@ jobs:
           builder: ${{ steps.buildx.output.name }}
           platforms: linux/amd64,linux/arm64,linux/arm/v7
           push: false
-          tags: estrellaxd/auto_bangumi:test
+          tags: shinonomeow/auto_bangumi:test
           cache-from: type=gha, scope=${{ github.workflow }}
           cache-to: type=gha, scope=${{ github.workflow }}
 

Dockerfile

@@ -4,7 +4,6 @@
 # 构建阶段
 FROM alpine:3.18 AS builder
 
-ENV VENV_PATH="/opt/venv"
 
 # 安装构建依赖
 RUN apk add --no-cache \
@@ -25,10 +24,10 @@ ENV PATH="/root/.local/bin:$PATH"
 WORKDIR /build
 
 # 复制依赖文件并安装（这层会被缓存，除非依赖文件改变）
-COPY backend/pyproject.toml backend/uv.lock ./
+COPY backend/pyproject.toml backend/uv.lock backend/requirements.txt ./
 
 # 安装Python依赖
-RUN uv sync --frozen --no-dev && mv .venv $VENV_PATH
+RUN uv sync --frozen --no-dev
 
 # 运行阶段
 FROM alpine:3.18 AS runtime
@@ -38,8 +37,7 @@ ENV LANG="C.UTF-8" \
     PUID=1000 \
     PGID=1000 \
     UMASK=022 \
-    VENV_PATH="/opt/venv" \
-    PATH="/opt/venv/bin:/root/.local/bin:$PATH"
+    PATH="/root/.local/bin:$PATH"
 
 WORKDIR /app
 
@@ -65,10 +63,12 @@ RUN set -ex && \
     rm -rf /var/cache/apk/* /tmp/*
 
 # 从构建阶段复制虚拟环境
-COPY --from=builder $VENV_PATH $VENV_PATH
+# COPY --from=builder $VENV_PATH $VENV_PATH
+COPY --from=builder /build/.venv /app/.venv
 
 # 复制应用代码（放在最后，因为代码变更最频繁）
-COPY --chmod=755 backend/src/. .
+COPY --chmod=755 backend/src/. ./src
+COPY --chmod=755 backend/dist/. ./dist
 COPY --chmod=755 entrypoint.sh /entrypoint.sh
 
 ENTRYPOINT ["tini", "-g", "--", "/entrypoint.sh"]

entrypoint.sh

@@ -9,22 +9,22 @@ PID_FILE="/tmp/autobangumi.pid"
 
 # 信号处理函数
 cleanup() {
-    echo "收到停止信号，正在清理..."
-    SHOULD_STOP=true
-    if [ -f "$PID_FILE" ]; then
-        pid=$(cat "$PID_FILE")
-        if [ -n "$pid" ]; then
-            echo "正在停止应用进程 $pid..."
-            kill -TERM "$pid" 2>/dev/null
-            sleep 5
-            # 如果进程仍在运行，强制终止
-            if kill -0 "$pid" 2>/dev/null; then
-                echo "强制终止应用进程 $pid..."
-                kill -KILL "$pid" 2>/dev/null
-            fi
-        fi
-        rm -f "$PID_FILE"
+  echo "收到停止信号，正在清理..."
+  SHOULD_STOP=true
+  if [ -f "$PID_FILE" ]; then
+    pid=$(cat "$PID_FILE")
+    if [ -n "$pid" ]; then
+      echo "正在停止应用进程 $pid..."
+      kill -TERM "$pid" 2>/dev/null
+      sleep 5
+      # 如果进程仍在运行，强制终止
+      if kill -0 "$pid" 2>/dev/null; then
+        echo "强制终止应用进程 $pid..."
+        kill -KILL "$pid" 2>/dev/null
+      fi
     fi
+    rm -f "$PID_FILE"
+  fi
 }
 
 # 设置信号捕获
@@ -41,29 +41,28 @@ chown ab:ab -R /app /home/ab
 
 # 热更新重启循环
 while [ "$SHOULD_STOP" != "true" ]; do
-    echo "启动 Auto_Bangumi 应用..."
-    su-exec "${PUID}:${PGID}" ${VENV_PATH}/bin/python main.py &
-    app_pid=$!
-    echo $app_pid > "$PID_FILE"
-    
-    # 等待应用结束
-    wait $app_pid
-    exit_code=$?
-    rm -f "$PID_FILE"
-    
-    # 根据退出码决定是否重启
-    if [ "$SHOULD_STOP" = "true" ]; then
-        echo "容器正在停止..."
-        break
-    elif [ $exit_code -eq 0 ]; then
-        echo "应用正常退出，2秒后重启（热更新）..."
-        sleep 2
-    else
-        echo "应用异常退出 (退出码: $exit_code)，停止容器"
-        exit $exit_code
-    fi
+  echo "启动 Auto_Bangumi 应用..."
+  su-exec "${PUID}:${PGID}" .venv/bin/python src/main.py &
+  app_pid=$!
+  echo $app_pid >"$PID_FILE"
+
+  # 等待应用结束
+  wait $app_pid
+  exit_code=$?
+  rm -f "$PID_FILE"
+
+  # 根据退出码决定是否重启
+  if [ "$SHOULD_STOP" = "true" ]; then
+    echo "容器正在停止..."
+    break
+  elif [ $exit_code -eq 0 ]; then
+    echo "应用正常退出，2秒后重启（热更新）..."
+    sleep 2
+  else
+    echo "应用异常退出 (退出码: $exit_code)，停止容器"
+    exit $exit_code
+  fi
 done
 
 echo "Auto_Bangumi 容器已停止"
 exit 0
-