From 35e3d85e773011e94e0d9d458ca0e0d2fcef0c4a Mon Sep 17 00:00:00 2001
From: DDSRem <1448139087@qq.com>
Date: Tue, 11 Jul 2023 11:36:24 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=E5=B7=A5?=
 =?UTF-8?q?=E4=BD=9C=E6=B5=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/build-docker.yml | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml
index a45c0fd1..0f622331 100644
--- a/.github/workflows/build-docker.yml
+++ b/.github/workflows/build-docker.yml
@@ -11,6 +11,12 @@ jobs:
         name: Checkout
         uses: actions/checkout@master
 
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v4
+        with:
+          images: ${{ secrets.DOCKER_USERNAME }}/moviepilot
+
       -
         name: Release version
         id: release_version
@@ -18,15 +24,16 @@ jobs:
           app_version=$(cat version.py |sed -ne "s/APP_VERSION\s=\s'v\(.*\)'/\1/gp")
           echo "app_version=$app_version" >> $GITHUB_ENV
 
+      -
+        name: Setup node
+        uses: actions/setup-node@v3
+        with:
+          node-version: '18'
+
       -
         name: Build frontend
         id: build_brontend
         run: |
-          curl -fsSL https://deb.nodesource.com/setup_18.x | sudo -E bash -
-          curl -sL https://dl.yarnpkg.com/debian/pubkey.gpg | gpg --dearmor | sudo tee /usr/share/keyrings/yarnkey.gpg >/dev/null
-          echo "deb [signed-by=/usr/share/keyrings/yarnkey.gpg] https://dl.yarnpkg.com/debian stable main" | sudo tee /etc/apt/sources.list.d/yarn.list
-          sudo apt-get update && sudo apt-get install -y nodejs yarn
-          node -v && yarn --version
           git clone https://github.com/jxxghp/MoviePilot-Frontend
           cd MoviePilot-Frontend
           yarn && yarn build
@@ -63,3 +70,4 @@ jobs:
           tags: |
             ${{ secrets.DOCKER_USERNAME }}/moviepilot:latest
             ${{ secrets.DOCKER_USERNAME }}/moviepilot:${{ env.app_version }}
+          labels: ${{ steps.meta.outputs.labels }}

From 55d5e12ca8f5db205cdd9794d81aad79c4912e38 Mon Sep 17 00:00:00 2001
From: DDSRem <1448139087@qq.com>
Date: Tue, 11 Jul 2023 12:03:06 +0800
Subject: [PATCH 2/2] fix: nginx errors

---
 nginx.conf | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nginx.conf b/nginx.conf
index d1e0b22d..dda72b6c 100644
--- a/nginx.conf
+++ b/nginx.conf
@@ -1,4 +1,4 @@
-#user  nobody;
+user  root;
 worker_processes auto;
 worker_cpu_affinity auto;
 
@@ -25,6 +25,7 @@ http {
         listen 3000;
         server_name moviepilot;
 
+        root /app/public
 
         location / {
             # 主目录