chore: update action docker

Author: cooderl

.github/workflows/docker-release.yml

@@ -59,52 +59,27 @@ jobs:
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Extract Docker metadata (web)
-        id: meta-web
+      - name: Extract Docker metadata
+        id: meta
         uses: docker/metadata-action@v5
         with:
           images: |
-            ${{ secrets.DOCKER_HUB_NAME }}/wewe-rss-web
-            ghcr.io/cooderl/wewe-rss-web
+            ${{ secrets.DOCKER_HUB_NAME }}/wewe-rss
+            ghcr.io/cooderl/wewe-rss
           tags: |
             type=raw,value=latest,enable=true
             type=raw,value=${{ github.ref_name }},enable=true
           flavor: latest=false
 
-      - name: Build and push Docker image (web)
-        id: build-and-push-web
+      - name: Build and push Docker image
+        id: build-and-push
         uses: docker/build-push-action@v5
         with:
           context: .
           push: true
-          tags: ${{ steps.meta-web.outputs.tags }}
-          labels: ${{ steps.meta-web.outputs.labels }}
-          target: web
-          platforms: linux/amd64,linux/arm64
-          cache-from: type=gha,scope=docker-release
-          cache-to: type=gha,mode=max,scope=docker-release
-
-      - name: Extract Docker metadata (server)
-        id: meta-server
-        uses: docker/metadata-action@v5
-        with:
-          images: |
-            ${{ secrets.DOCKER_HUB_NAME }}/wewe-rss-server
-            ghcr.io/cooderl/wewe-rss-server
-          tags: |
-            type=raw,value=latest,enable=true
-            type=raw,value=${{ github.ref_name }},enable=true
-          flavor: latest=false
-
-      - name: Build and push Docker image (server)
-        id: build-and-push-server
-        uses: docker/build-push-action@v5
-        with:
-          context: .
-          push: true
-          tags: ${{ steps.meta-server.outputs.tags }}
-          labels: ${{ steps.meta-server.outputs.labels }}
-          target: server
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          target: app
           platforms: linux/amd64,linux/arm64
           cache-from: type=gha,scope=docker-release
           cache-to: type=gha,mode=max,scope=docker-release
@@ -117,16 +92,9 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Docker Hub Description(web)
-        uses: peter-evans/dockerhub-description@v4
-        with:
-          username: ${{ secrets.DOCKER_HUB_NAME }}
-          password: ${{ secrets.DOCKER_HUB_PASSWORD }}
-          repository: ${{ secrets.DOCKER_HUB_NAME }}/wewe-rss-web
-
-      - name: Docker Hub Description(server)
+      - name: Docker Hub Description
         uses: peter-evans/dockerhub-description@v4
         with:
           username: ${{ secrets.DOCKER_HUB_NAME }}
           password: ${{ secrets.DOCKER_HUB_PASSWORD }}
-          repository: ${{ secrets.DOCKER_HUB_NAME }}/wewe-rss-server
+          repository: ${{ secrets.DOCKER_HUB_NAME }}/wewe-rss

Dockerfile

@@ -12,32 +12,16 @@ RUN --mount=type=cache,id=pnpm,target=/pnpm/store pnpm install --frozen-lockfile
 
 RUN pnpm run -r build
 
-RUN pnpm deploy --filter=web --prod /app/web
+RUN pnpm deploy --filter=server --prod /app
 
-RUN pnpm deploy --filter=server --prod /app/server
-RUN cd /app/server && pnpm exec prisma generate
+RUN cd /app && pnpm exec prisma generate
 
 
 
+FROM base AS app
+COPY --from=build /app /app
 
-FROM base AS web
-COPY --from=build /app/web /app/web
-
-WORKDIR /app/web
-
-EXPOSE 3000
-
-ENV NODE_ENV=production
-ENV NEXT_PUBLIC_SERVER_ORIGIN_URL="http://localhost:4000"
-ENV NEXT_PUBLIC_ENV=prod
-
-CMD ["npm", "run", "start"]
-
-
-FROM base AS server
-COPY --from=build /app/server /app/server
-
-WORKDIR /app/server
+WORKDIR /app
 
 EXPOSE 4000
 

apps/server/prisma/schema.prisma

@@ -4,7 +4,7 @@ datasource db {
 }
 
 generator client {
-  provider = "prisma-client-js"
+  provider      = "prisma-client-js"
   binaryTargets = ["native", "linux-musl"] // 生成linux可执行文件
 }
 
@@ -23,19 +23,19 @@ model Account {
 
 // 订阅源
 model Feed {
-  id       String @id @db.VarChar(255)
-  mpName   String @map("mp_name") @db.VarChar(512)
-  mpCover  String @map("mp_cover") @db.VarChar(1024)
-  mpIntro  String @map("mp_intro") @db.Text()
+  id      String @id @db.VarChar(255)
+  mpName  String @map("mp_name") @db.VarChar(512)
+  mpCover String @map("mp_cover") @db.VarChar(1024)
+  mpIntro String @map("mp_intro") @db.Text()
   // 状态 0:失效 1:启用 2:禁用
-  status   Int    @default(1) @map("status") @db.Int()
+  status  Int    @default(1) @map("status") @db.Int()
 
   // article最后同步时间
-  syncTime Int    @map("sync_time") @default(0)
+  syncTime Int @default(0) @map("sync_time")
 
   // 信息更新时间
-  updateTime Int  @map("update_time")
-  
+  updateTime Int @map("update_time")
+
   createdAt DateTime  @default(now()) @map("created_at")
   updatedAt DateTime? @default(now()) @updatedAt @map("updated_at")