From 064cf4c5c34c65788b80881b6fa0c473ee5e0db4 Mon Sep 17 00:00:00 2001 From: jxxghp Date: Tue, 22 Aug 2023 10:44:09 +0800 Subject: [PATCH] =?UTF-8?q?fix=20build=20=E5=89=8D=E7=AB=AF=E4=B8=8B?= =?UTF-8?q?=E8=BD=BD=E6=9C=80=E6=96=B0Release=E8=80=8C=E4=B8=8D=E6=98=AF?= =?UTF-8?q?=E5=90=8C=E7=89=88=E6=9C=AC=E5=8F=B7Release?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build-docker.yml | 2 +- Dockerfile | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml index 1a14111e..7159026e 100644 --- a/.github/workflows/build-docker.yml +++ b/.github/workflows/build-docker.yml @@ -55,7 +55,7 @@ jobs: linux/arm64 push: true build-args: | - MOVIEPILOT_FRONTEND_VERSION=${{ env.app_version }} + MOVIEPILOT_VERSION=${{ env.app_version }} tags: | ${{ secrets.DOCKER_USERNAME }}/moviepilot:latest ${{ secrets.DOCKER_USERNAME }}/moviepilot:${{ env.app_version }} diff --git a/Dockerfile b/Dockerfile index 7ec3958a..6ba193dd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ FROM python:3.11.4-slim-bullseye -ARG MOVIEPILOT_FRONTEND_VERSION +ARG MOVIEPILOT_VERSION ENV LANG="C.UTF-8" \ HOME="/moviepilot" \ TERM="xterm" \ @@ -69,7 +69,8 @@ RUN apt-get update \ && echo 'fs.inotify.max_user_watches=5242880' >> /etc/sysctl.conf \ && echo 'fs.inotify.max_user_instances=5242880' >> /etc/sysctl.conf \ && locale-gen zh_CN.UTF-8 \ - && curl -sL "https://github.com/jxxghp/MoviePilot-Frontend/releases/download/v${MOVIEPILOT_FRONTEND_VERSION}/dist.zip" | busybox unzip -d / - \ + && FRONTEND_VERSION=$(curl -sL "https://api.github.com/repos/jxxghp/MoviePilot-Frontend/releases/latest" | jq -r .tag_name) \ + && curl -sL "https://github.com/jxxghp/MoviePilot-Frontend/releases/download/v${FRONTEND_VERSION}/dist.zip" | busybox unzip -d / - \ && mv /dist /public \ && apt-get remove -y build-essential \ && apt-get autoremove -y \