From d29278369ceffad236c5363e68200e9167d230b0 Mon Sep 17 00:00:00 2001 From: zangmiao Date: Sun, 29 Dec 2024 22:46:25 +0800 Subject: [PATCH] opt code --- .github/workflows/docker-packages.yml | 9 +++++++-- dockerfile | 8 -------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/.github/workflows/docker-packages.yml b/.github/workflows/docker-packages.yml index 7df0dfd..67df3dd 100644 --- a/.github/workflows/docker-packages.yml +++ b/.github/workflows/docker-packages.yml @@ -30,8 +30,13 @@ jobs: echo "IPTVCHECKER_LATEST_TAG:${IPTVCHECKER_LATEST_TAG}" echo ::set-output name=tags::${TAGS} mkdir iptv-checker && cp dockerfile iptv-checker/dockerfile - git clone git@github.com:zhimin-dev/iptv-checker-rs.git - git clone git@github.com:zhimin-dev/iptv-checker-ui-interface.git + + - name: Checkout iptv-checker-ui-interface + uses: actions/checkout@v4 + with: + repository: zhimin-dev/iptv-checker-ui-interface + path: ./iptv-checker-ui-interface + token: ${{ secrets.GH_PAT }} - name: Setup Docker Buildx Command id: buildx diff --git a/dockerfile b/dockerfile index 056f96d..d7bf9ae 100644 --- a/dockerfile +++ b/dockerfile @@ -1,10 +1,3 @@ -# 基础镜像(用于构建前端代码) -FROM debian:buster-slim as frontend-builder -# 设置工作目录 -WORKDIR /usr/src/app -# 复制前端代码 -COPY iptv-checker-ui-interface/dist ./frontend - # 后端构建阶段 FROM rust:latest as backend-builder # 设置工作目录 @@ -25,7 +18,6 @@ RUN apt-get install openssl -y RUN apt-get install ffmpeg -y # 复制前端代码 -COPY --from=frontend-builder /usr/src/app/frontend ./web RUN mkdir -p ./static/input RUN mkdir -p ./static/output # 复制后端构建结果