From 7f02e3bc97ae0992f857ea3cf7fd3d9cc4f9bbb1 Mon Sep 17 00:00:00 2001
From: luoer <luoer@szbeihai.com>
Date: Wed, 1 Nov 2023 09:32:57 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=E9=83=A8=E7=BD=B2?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitea/workflows/deploy.yaml | 43 +++++++++++++++++-------------------
 Dockerfile                   | 13 ++++++-----
 2 files changed, 27 insertions(+), 29 deletions(-)

diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml
index a9ae0d3..5d564a5 100644
--- a/.gitea/workflows/deploy.yaml
+++ b/.gitea/workflows/deploy.yaml
@@ -32,7 +32,7 @@ env:
   # 部署服务器密码, 例如: 123456
   deploy_pass: ${{ secrets.DEPLOY_PASS }}
   # 要更新的 docker 服务名称, 例如: demo_web
-  deploy_name: demo_web
+  deploy_name: appnify_web
 
 jobs:
   build:
@@ -42,43 +42,40 @@ jobs:
     steps:
       - name: 检出代码
         id: checkout
-        uses: https://git.dev.juetan.cn/mirror/checkout@v3
+        uses: actions/checkout@v3
 
-      - name: 设置环境
-        uses: https://git.dev.juetan.cn/mirror/setup-node@v2
+      # - name: 设置NodeJS环境
+      #   uses: actions/setup-node@v2
 
-      - name: 安装依赖
-        run: |
-          npm install --registry https://registry.npmmirror.com/
+      # - name: 安装Npm依赖
+      #   run: npm install --registry https://registry.npmmirror.com/
 
-      - name: 构建产物
-        run: npm run build
+      # - name: 构建产物
+      #   run: npm run build
 
-      - name: 打印目录
-        run: ls ./dist
+      # - name: 打印产物目录
+      #   run: ls ./dist
 
-      - name: 构建镜像
-        run: |
-          docker build -t ${{ env.docker_name }}:latest .
+      - name: 构建Docker镜像
+        run: docker build -t ${{ env.docker_name }}:latest .
 
-      - name: 登陆镜像
-        run: |
-          docker login -u "${{ env.docker_user }}" -p "${{ env.docker_pass }}" ${{ env.docker_host }}
+      - name: 登陆Docker镜像仓库
+        run: docker login -u "${{ env.docker_user }}" -p "${{ env.docker_pass }}" ${{ env.docker_host }}
 
-      - name: 推送镜像
+      - name: 推送Docker镜像到仓库
         shell: bash
-        run: |
-          docker push ${{ env.docker_name }}:latest
+        run: docker push ${{ env.docker_name }}:latest
 
-      - name: 标记镜像
+      - name: 打上Docker镜像版本标签并推送到仓库
         if: gitea.ref_type == 'tag'
         run: |
           echo "当前推送版本：${{ gitea.ref_name }}"
           docker tag ${{ env.docker_name }}:latest ${{ env.docker_name }}:${{ gitea.ref_name }}
           docker push ${{ env.docker_name }}:${{ gitea.ref_name }}
 
-      - name: 更新服务
-        uses: https://git.dev.juetan.cn/mirror/ssh-action@v1.0.0
+      - name: 登陆到部署环境执行更新命令
+        uses: appleboy/ssh-action@v1.0.0
+        if: false
         with:
           host: ${{ env.deploy_host }}
           port: ${{ env.deploy_port }}
diff --git a/Dockerfile b/Dockerfile
index 384b3b0..8a30e19 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,15 +1,16 @@
-FROM node:20-alpine as build
+FROM node:20-alpine as builder
 WORKDIR /app
-COPY ./package.json .
-COPY ./pnpm-lock.yaml .
+COPY package.json .
+COPY pnpm-lock.yaml .
+COPY .npmrc .
 RUN corepack enable
-RUN pnpm install --registry https://registry.npmmirror.com/
+RUN pnpm install
 COPY . .
 RUN pnpm build
 
 FROM nginx:alpine
-COPY --from=build /app/dist /usr/share/nginx/html
-COPY --from=build /app/.github/nginx.conf /etc/nginx/conf.d/default.conf
+COPY --from=builder /app/dist /usr/share/nginx/html
+COPY --from=builder /app/.github/nginx.conf /etc/nginx/conf.d/default.conf
 
 EXPOSE 80
 CMD ["nginx", "-g", "daemon off;"]
\ No newline at end of file