Merge pull request #204 from xuewenG/dev-image

修改构建和发布流水线

Author: kingwrcy

.github/workflows/deploy.yml

@@ -0,0 +1,42 @@
+name: Build And Upload Image For Dev
+on:
+  push:
+    branches:
+      - dev
+concurrency:
+  group: ${{ github.workflow }}
+  cancel-in-progress: false
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Extract Version
+        run: |
+          BUILD_TIME=$(TZ='Asia/Shanghai' date +'%Y%m%d%H%M')
+          COMMIT_ID=${GITHUB_SHA:0:7}
+          VERSION=dev.$BUILD_TIME.$COMMIT_ID
+          echo VERSION=$VERSION >> $GITHUB_ENV
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      - name: Login to DockerHub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKER_USER_NAME }}
+          password: ${{ secrets.DOCKER_ACCESS_TOKEN }}
+      - name: Build and Push Image
+        uses: docker/build-push-action@v6
+        with:
+          push: true
+          context: .
+          platforms: |
+            linux/amd64
+            linux/arm64
+          tags: |
+            ${{ secrets.DOCKER_USER_NAME }}/moments:dev
+            ${{ secrets.DOCKER_USER_NAME }}/moments:${{ env.VERSION }}
+          build-args: |
+            VERSION=${{ env.VERSION }}

.github/workflows/dev.yml

@@ -0,0 +1,40 @@
+name: Build And Upload Image For Release
+on:
+  push:
+    tags:
+      - v*
+concurrency:
+  group: ${{ github.workflow }}
+  cancel-in-progress: false
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Extract Version
+        run: |
+          VERSION=${GITHUB_REF#refs/tags/v}
+          echo VERSION=$VERSION >> $GITHUB_ENV
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      - name: Login to DockerHub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKER_USER_NAME }}
+          password: ${{ secrets.DOCKER_ACCESS_TOKEN }}
+      - name: Build and Push Image
+        uses: docker/build-push-action@v6
+        with:
+          push: true
+          context: .
+          platforms: |
+            linux/amd64
+            linux/arm64
+          tags: |
+            ${{ secrets.DOCKER_USER_NAME }}/moments:latest
+            ${{ secrets.DOCKER_USER_NAME }}/moments:${{ env.VERSION }}
+          build-args: |
+            VERSION=${{ env.VERSION }}

.github/workflows/release.yml

@@ -1,32 +1,31 @@
-FROM node:22.2.0-alpine as front
+FROM node:22.2.0-alpine AS front
 WORKDIR /app
-COPY front/package*.json ./
-RUN npm install
+RUN npm install -g pnpm
+COPY front/package.json .
+COPY front/pnpm-lock.yaml .
+RUN pnpm install
 COPY front/. .
-RUN npm run generate
+RUN pnpm run generate
 
-FROM golang:1.22.5-alpine as backend
-ENV CGO_ENABLED 1
-RUN apk add build-base
+FROM golang:1.22.5-alpine AS backend
 WORKDIR /app
+ENV CGO_ENABLED=1
+RUN apk add --no-cache build-base tzdata
 COPY backend/go.mod .
 COPY backend/go.sum .
 RUN go mod download
-RUN go mod tidy
 COPY backend/. .
 COPY --from=front /app/.output/public /app/public
-RUN apk update --no-cache && apk add --no-cache tzdata
 RUN go build -tags prod -ldflags="-s -w" -o /app/moments
 
 FROM alpine
-ARG VERSION
-RUN apk update --no-cache && apk add --no-cache ca-certificates
-COPY --from=backend /usr/share/zoneinfo/Asia/Shanghai /usr/share/zoneinfo/Asia/Shanghai
-ENV TZ Asia/Shanghai
 WORKDIR /app/data
-ENV VERSION $VERSION
+RUN apk update --no-cache && apk add --no-cache ca-certificates tzdata
+ARG VERSION
+ENV PORT=3000
+ENV TZ=Asia/Shanghai
+ENV VERSION=$VERSION
 COPY --from=backend /app/moments /app/moments
-ENV PORT 3000
-EXPOSE 3000
 RUN chmod +x /app/moments
-CMD ["/app/moments"]
+EXPOSE 3000
+CMD ["/app/moments"]

Dockerfile

@@ -1,6 +1,6 @@
 module github.com/kingwrcy/moments
 
-go 1.22.4
+go 1.22.5
 
 require (
 	github.com/PuerkitoBio/goquery v1.9.2

backend/go.mod

@@ -7,7 +7,7 @@
     </div>
 
     <div class="flex justify-end text-xs text-gray-400">
-      <div v-if="version">版本号:v{{version }}</div>
+      <div v-if="version">版本号: {{ version }}</div>
     </div>
     <UFormGroup label="管理员账号" name="adminUserName" :ui="{label:{base:'font-bold'}}">
       <UInput v-model="state.adminUserName"/>