Merge pull request #99 from Rabithua/develop

Develop

Author: Rabithua

.github/workflows/develop-deploy.yml

@@ -1,12 +1,12 @@
-name: Deploy Rote Backend
+name: Deploy Rote (Backend & Frontend)
 
 on:
   push:
     branches:
       - develop
 
 jobs:
-  build-and-deploy:
+  build-backend:
     runs-on: ubuntu-latest
 
     steps:
@@ -15,20 +15,53 @@ jobs:
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
+        with:
+          platforms: linux/amd64,linux/arm64
 
       - name: Log in to Docker Hub
         uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
-      - name: Build and push Docker image
+      - name: Build and push backend Docker image
         uses: docker/build-push-action@v5
         with:
           context: ./server
           file: ./server/Dockerfile
+          platforms: linux/amd64,linux/arm64
           push: true
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/rote-backend:latest-dev
             ${{ secrets.DOCKERHUB_USERNAME }}/rote-backend:develop
             ${{ secrets.DOCKERHUB_USERNAME }}/rote-backend:develop-${{ github.sha }}
+
+  build-frontend:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+        with:
+          platforms: linux/amd64,linux/arm64
+
+      - name: Log in to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Build and push frontend Docker image
+        uses: docker/build-push-action@v5
+        with:
+          context: ./web
+          file: ./web/Dockerfile
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: |
+            ${{ secrets.DOCKERHUB_USERNAME }}/rote-frontend:latest-dev
+            ${{ secrets.DOCKERHUB_USERNAME }}/rote-frontend:develop
+            ${{ secrets.DOCKERHUB_USERNAME }}/rote-frontend:develop-${{ github.sha }}

.github/workflows/release-deploy.yml

@@ -1,4 +1,4 @@
-name: Release Deploy Rote Backend
+name: Release Deploy Rote (Backend & Frontend)
 
 on:
   push:
@@ -8,7 +8,7 @@ on:
     types: [published]
 
 jobs:
-  build-and-deploy:
+  build-backend:
     runs-on: ubuntu-latest
 
     steps:
@@ -17,19 +17,53 @@ jobs:
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
+        with:
+          platforms: linux/amd64,linux/arm64
+
+      - name: Log in to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Build and push backend Docker image
+        uses: docker/build-push-action@v5
+        with:
+          context: ./server
+          file: ./server/Dockerfile
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: |
+            ${{ secrets.DOCKERHUB_USERNAME }}/rote-backend:latest
+            ${{ secrets.DOCKERHUB_USERNAME }}/rote-backend:release
+            ${{ secrets.DOCKERHUB_USERNAME }}/rote-backend:${{ github.event.release.tag_name || github.ref_name || 'main' }}
+
+  build-frontend:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+        with:
+          platforms: linux/amd64,linux/arm64
 
       - name: Log in to Docker Hub
         uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
-      - name: Build and push Docker image
+      - name: Build and push frontend Docker image
         uses: docker/build-push-action@v5
         with:
           context: ./web
           file: ./web/Dockerfile
+          platforms: linux/amd64,linux/arm64
           push: true
           tags: |
-            ${{ secrets.DOCKERHUB_USERNAME }}/rote-backend:latest
-            ${{ secrets.DOCKERHUB_USERNAME }}/rote-backend:${{ github.ref_type == 'tag' && github.ref_name || 'main' }}
+            ${{ secrets.DOCKERHUB_USERNAME }}/rote-frontend:latest
+            ${{ secrets.DOCKERHUB_USERNAME }}/rote-frontend:release
+            ${{ secrets.DOCKERHUB_USERNAME }}/rote-frontend:${{ github.event.release.tag_name || github.ref_name || 'main' }}

README.md

@@ -8,8 +8,30 @@
 
 ## Deploy
 
-To Be Continue...
+### 快速开始
 
+#### 方式一：使用 Docker Hub 镜像（推荐）
+
+```bash
+# 使用最新版本（默认配置文件）
+docker-compose up -d
+
+# 使用特定版本
+IMAGE_TAG=v1.0.0 docker-compose up -d
+```
+
+#### 方式二：本地构建
+
+```bash
+# 从源码构建并启动
+# VITE_API_BASE 在构建时注入到前端代码中（可选，默认 http://localhost:3000）
+VITE_API_BASE=http://localhost:3000 docker-compose -f docker-compose.build.yml up -d --build
+```
+
+### 详细说明
+
+更多部署选项和配置说明，请查看 [Docker Compose 使用指南](doc/userguide/DOCKER-COMPOSE-GUIDE.md)。
 
 ## Technology stack
+
 ![Frame 1](https://github.com/Rabithua/Rote/assets/34543831/fc00f797-82bc-47fe-8c75-36ea0b1f6f76)