Compare commits
37 Commits
08bd6397c8
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
24265ac20d | ||
|
|
294241a7fd | ||
|
|
839e321fb7 | ||
|
|
e08759b869 | ||
|
|
ad41866e88 | ||
|
|
f26cd1a739 | ||
|
|
9b24ef50d7 | ||
|
|
5ce21e2008 | ||
|
|
0d6d6117ea | ||
|
|
f6670372a1 | ||
|
|
4e8b660213 | ||
|
|
fd5efabd76 | ||
|
|
02f48c2955 | ||
|
|
76c03f95f1 | ||
|
|
9a1285b4cc | ||
|
|
0201b5336e | ||
|
|
b6b0c229ef | ||
|
|
a83de0cc0d | ||
|
|
31ca44dbc3 | ||
|
|
771920afbc | ||
|
|
0a87cf8939 | ||
|
|
097658606b | ||
|
|
e394358946 | ||
|
|
7889037b0e | ||
|
|
45e3542558 | ||
|
|
af159b6b4f | ||
|
|
6323f6b361 | ||
|
|
1a921c725e | ||
| 48aaea7773 | |||
|
|
a632d48590 | ||
|
|
e98c726796 | ||
|
|
c5e08b5632 | ||
|
|
a82144a676 | ||
|
|
a211da4468 | ||
|
|
9c93e324dd | ||
|
|
fbe88764e5 | ||
|
|
42501148b9 |
@@ -5,10 +5,6 @@ on:
|
|||||||
branches:
|
branches:
|
||||||
- main
|
- main
|
||||||
|
|
||||||
env:
|
|
||||||
PNPM_VERSION: 9
|
|
||||||
NODE_VERSION: 20
|
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build:
|
build:
|
||||||
name: Build Check
|
name: Build Check
|
||||||
@@ -19,14 +15,11 @@ jobs:
|
|||||||
|
|
||||||
- name: Setup pnpm
|
- name: Setup pnpm
|
||||||
uses: pnpm/action-setup@v4
|
uses: pnpm/action-setup@v4
|
||||||
with:
|
|
||||||
version: ${{ env.PNPM_VERSION }}
|
|
||||||
|
|
||||||
- name: Setup Node.js
|
- name: Setup Node.js
|
||||||
uses: actions/setup-node@v4
|
uses: actions/setup-node@v4
|
||||||
with:
|
with:
|
||||||
node-version: ${{ env.NODE_VERSION }}
|
node-version-file: '.nvmrc'
|
||||||
cache: pnpm
|
|
||||||
|
|
||||||
- name: Install dependencies
|
- name: Install dependencies
|
||||||
run: pnpm install --frozen-lockfile
|
run: pnpm install --frozen-lockfile
|
||||||
|
|||||||
@@ -6,17 +6,24 @@ on:
|
|||||||
- main
|
- main
|
||||||
|
|
||||||
env:
|
env:
|
||||||
PNPM_VERSION: 9
|
|
||||||
NODE_VERSION: 20
|
|
||||||
REGISTRY: gitea.tegical.world
|
|
||||||
IMAGE_PREFIX: tegical/seclusion
|
IMAGE_PREFIX: tegical/seclusion
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build-and-push:
|
generate-tag:
|
||||||
name: Build and Push Images
|
name: Generate Image Tag
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
outputs:
|
outputs:
|
||||||
image_tag: ${{ steps.meta.outputs.tag }}
|
image_tag: ${{ steps.meta.outputs.tag }}
|
||||||
|
steps:
|
||||||
|
- name: Generate image tag
|
||||||
|
id: meta
|
||||||
|
run: |
|
||||||
|
echo "tag=$(date +%Y%m%d%H%M%S)-${GITHUB_SHA::8}" >> $GITHUB_OUTPUT
|
||||||
|
|
||||||
|
build-web:
|
||||||
|
name: Build and Push Web Image
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
needs: generate-tag
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
@@ -24,17 +31,12 @@ jobs:
|
|||||||
- name: Set up Docker Buildx
|
- name: Set up Docker Buildx
|
||||||
uses: docker/setup-buildx-action@v3
|
uses: docker/setup-buildx-action@v3
|
||||||
|
|
||||||
- name: Generate image tag
|
- name: Login to Harbor Registry
|
||||||
id: meta
|
|
||||||
run: |
|
|
||||||
echo "tag=$(date +%Y%m%d%H%M%S)-${GITHUB_SHA::8}" >> $GITHUB_OUTPUT
|
|
||||||
|
|
||||||
- name: Login to Gitea Container Registry
|
|
||||||
uses: docker/login-action@v3
|
uses: docker/login-action@v3
|
||||||
with:
|
with:
|
||||||
registry: ${{ env.REGISTRY }}
|
registry: ${{ vars.IMAGE_REGISTRY }}
|
||||||
username: ${{ secrets.REGISTRY_USERNAME }}
|
username: ${{ secrets.IMAGE_REGISTRY_ROBOT_USERNAME }}
|
||||||
password: ${{ secrets.REGISTRY_PASSWORD }}
|
password: ${{ secrets.IMAGE_REGISTRY_ROBOT_PASSWORD }}
|
||||||
|
|
||||||
- name: Build and push Web image
|
- name: Build and push Web image
|
||||||
uses: docker/build-push-action@v6
|
uses: docker/build-push-action@v6
|
||||||
@@ -43,10 +45,28 @@ jobs:
|
|||||||
file: ./apps/web/Dockerfile
|
file: ./apps/web/Dockerfile
|
||||||
push: true
|
push: true
|
||||||
tags: |
|
tags: |
|
||||||
${{ env.REGISTRY }}/${{ env.IMAGE_PREFIX }}-web:${{ steps.meta.outputs.tag }}
|
${{ vars.IMAGE_REGISTRY }}/${{ env.IMAGE_PREFIX }}-web:${{ needs.generate-tag.outputs.image_tag }}
|
||||||
${{ env.REGISTRY }}/${{ env.IMAGE_PREFIX }}-web:latest
|
${{ vars.IMAGE_REGISTRY }}/${{ env.IMAGE_PREFIX }}-web:latest
|
||||||
cache-from: type=gha
|
cache-from: type=registry,ref=${{ vars.IMAGE_REGISTRY }}/${{ env.IMAGE_PREFIX }}-web:buildcache
|
||||||
cache-to: type=gha,mode=max
|
cache-to: type=registry,ref=${{ vars.IMAGE_REGISTRY }}/${{ env.IMAGE_PREFIX }}-web:buildcache,mode=max
|
||||||
|
|
||||||
|
build-api:
|
||||||
|
name: Build and Push API Image
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
needs: generate-tag
|
||||||
|
steps:
|
||||||
|
- name: Checkout
|
||||||
|
uses: actions/checkout@v4
|
||||||
|
|
||||||
|
- name: Set up Docker Buildx
|
||||||
|
uses: docker/setup-buildx-action@v3
|
||||||
|
|
||||||
|
- name: Login to Harbor Registry
|
||||||
|
uses: docker/login-action@v3
|
||||||
|
with:
|
||||||
|
registry: ${{ vars.IMAGE_REGISTRY }}
|
||||||
|
username: ${{ secrets.IMAGE_REGISTRY_ROBOT_USERNAME }}
|
||||||
|
password: ${{ secrets.IMAGE_REGISTRY_ROBOT_PASSWORD }}
|
||||||
|
|
||||||
- name: Build and push API image
|
- name: Build and push API image
|
||||||
uses: docker/build-push-action@v6
|
uses: docker/build-push-action@v6
|
||||||
@@ -55,15 +75,15 @@ jobs:
|
|||||||
file: ./apps/api/Dockerfile
|
file: ./apps/api/Dockerfile
|
||||||
push: true
|
push: true
|
||||||
tags: |
|
tags: |
|
||||||
${{ env.REGISTRY }}/${{ env.IMAGE_PREFIX }}-api:${{ steps.meta.outputs.tag }}
|
${{ vars.IMAGE_REGISTRY }}/${{ env.IMAGE_PREFIX }}-api:${{ needs.generate-tag.outputs.image_tag }}
|
||||||
${{ env.REGISTRY }}/${{ env.IMAGE_PREFIX }}-api:latest
|
${{ vars.IMAGE_REGISTRY }}/${{ env.IMAGE_PREFIX }}-api:latest
|
||||||
cache-from: type=gha
|
cache-from: type=registry,ref=${{ vars.IMAGE_REGISTRY }}/${{ env.IMAGE_PREFIX }}-api:buildcache
|
||||||
cache-to: type=gha,mode=max
|
cache-to: type=registry,ref=${{ vars.IMAGE_REGISTRY }}/${{ env.IMAGE_PREFIX }}-api:buildcache,mode=max
|
||||||
|
|
||||||
deploy:
|
deploy:
|
||||||
name: Deploy to Knative
|
name: Deploy to Knative
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
needs: build-and-push
|
needs: [generate-tag, build-web, build-api]
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
@@ -79,8 +99,10 @@ jobs:
|
|||||||
|
|
||||||
- name: Update image tags in manifests
|
- name: Update image tags in manifests
|
||||||
run: |
|
run: |
|
||||||
IMAGE_TAG=${{ needs.build-and-push.outputs.image_tag }}
|
IMAGE_TAG=${{ needs.generate-tag.outputs.image_tag }}
|
||||||
|
IMAGE_REGISTRY=${{ vars.IMAGE_REGISTRY }}
|
||||||
sed -i "s|IMAGE_TAG_PLACEHOLDER|${IMAGE_TAG}|g" deploy/k8s/*.yaml
|
sed -i "s|IMAGE_TAG_PLACEHOLDER|${IMAGE_TAG}|g" deploy/k8s/*.yaml
|
||||||
|
sed -i "s|IMAGE_REGISTRY_PLACEHOLDER|${IMAGE_REGISTRY}|g" deploy/k8s/*.yaml
|
||||||
|
|
||||||
- name: Deploy to Knative
|
- name: Deploy to Knative
|
||||||
run: |
|
run: |
|
||||||
|
|||||||
2
.npmrc
2
.npmrc
@@ -1,2 +1,4 @@
|
|||||||
|
registry=https://verdaccio.tegical.world
|
||||||
|
|
||||||
auto-install-peers=true
|
auto-install-peers=true
|
||||||
strict-peer-dependencies=false
|
strict-peer-dependencies=false
|
||||||
|
|||||||
@@ -1,10 +1,18 @@
|
|||||||
# syntax=docker/dockerfile:1
|
|
||||||
|
|
||||||
# ============================================
|
# ============================================
|
||||||
# Base stage: Install dependencies
|
# Base stage: Install dependencies
|
||||||
# ============================================
|
# ============================================
|
||||||
FROM node:20-alpine AS base
|
FROM harbor.tegical.world/docker.io/node:24.11.1-alpine AS base
|
||||||
RUN corepack enable && corepack prepare pnpm@9 --activate
|
# 配置阿里云 Alpine 镜像源
|
||||||
|
RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories
|
||||||
|
|
||||||
|
# 配置镜像源
|
||||||
|
ENV COREPACK_NPM_REGISTRY=https://verdaccio.tegical.world
|
||||||
|
RUN corepack enable
|
||||||
|
RUN pnpm config set registry https://verdaccio.tegical.world
|
||||||
|
|
||||||
|
# 安装构建工具 (bcrypt 等 native modules 在无法下载预编译二进制时需要从源代码编译)
|
||||||
|
RUN apk add --no-cache python3 make g++
|
||||||
|
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
|
|
||||||
# ============================================
|
# ============================================
|
||||||
@@ -50,16 +58,22 @@ COPY apps/api/prisma ./apps/api/prisma/
|
|||||||
COPY packages/shared/package.json ./packages/shared/
|
COPY packages/shared/package.json ./packages/shared/
|
||||||
COPY packages/eslint-config/package.json ./packages/eslint-config/
|
COPY packages/eslint-config/package.json ./packages/eslint-config/
|
||||||
COPY packages/typescript-config/package.json ./packages/typescript-config/
|
COPY packages/typescript-config/package.json ./packages/typescript-config/
|
||||||
RUN pnpm install --frozen-lockfile --prod
|
|
||||||
|
|
||||||
# Generate Prisma Client for production
|
# Install all dependencies first (including devDependencies for Prisma generation)
|
||||||
|
RUN pnpm install --frozen-lockfile
|
||||||
|
|
||||||
|
# Generate Prisma Client
|
||||||
WORKDIR /app/apps/api
|
WORKDIR /app/apps/api
|
||||||
RUN pnpm db:generate
|
RUN pnpm db:generate
|
||||||
|
|
||||||
|
# Remove devDependencies to reduce image size
|
||||||
|
WORKDIR /app
|
||||||
|
RUN pnpm prune --prod
|
||||||
|
|
||||||
# ============================================
|
# ============================================
|
||||||
# Runner stage: Production image
|
# Runner stage: Production image
|
||||||
# ============================================
|
# ============================================
|
||||||
FROM node:20-alpine AS runner
|
FROM base AS runner
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
|
|
||||||
ENV NODE_ENV=production
|
ENV NODE_ENV=production
|
||||||
|
|||||||
@@ -1,10 +1,18 @@
|
|||||||
# syntax=docker/dockerfile:1
|
|
||||||
|
|
||||||
# ============================================
|
# ============================================
|
||||||
# Base stage: Install dependencies
|
# Base stage: Install dependencies
|
||||||
# ============================================
|
# ============================================
|
||||||
FROM node:20-alpine AS base
|
FROM harbor.tegical.world/docker.io/node:24.11.1-alpine AS base
|
||||||
RUN corepack enable && corepack prepare pnpm@9 --activate
|
# 配置阿里云 Alpine 镜像源
|
||||||
|
RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories
|
||||||
|
|
||||||
|
# 配置镜像源
|
||||||
|
ENV COREPACK_NPM_REGISTRY=https://verdaccio.tegical.world
|
||||||
|
RUN corepack enable
|
||||||
|
RUN pnpm config set registry https://verdaccio.tegical.world
|
||||||
|
|
||||||
|
# 安装构建工具 (native modules 在无法下载预编译二进制时需要从源代码编译)
|
||||||
|
RUN apk add --no-cache python3 make g++
|
||||||
|
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
|
|
||||||
# ============================================
|
# ============================================
|
||||||
@@ -39,7 +47,7 @@ RUN pnpm build
|
|||||||
# ============================================
|
# ============================================
|
||||||
# Runner stage: Production image
|
# Runner stage: Production image
|
||||||
# ============================================
|
# ============================================
|
||||||
FROM node:20-alpine AS runner
|
FROM base AS runner
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
|
|
||||||
ENV NODE_ENV=production
|
ENV NODE_ENV=production
|
||||||
|
|||||||
0
apps/web/public/.gitkeep
Normal file
0
apps/web/public/.gitkeep
Normal file
@@ -33,10 +33,10 @@ deploy/k8s/
|
|||||||
|
|
||||||
| Secret 名称 | 说明 | 生成方式 |
|
| Secret 名称 | 说明 | 生成方式 |
|
||||||
|------------|------|---------|
|
|------------|------|---------|
|
||||||
| `REGISTRY_USERNAME` | Gitea 容器镜像仓库用户名 | - |
|
|
||||||
| `REGISTRY_PASSWORD` | Gitea 容器镜像仓库密码 | Token 或密码 |
|
|
||||||
| `KUBECONFIG` | Base64 编码的 kubeconfig | `cat ~/.kube/config \| base64` |
|
| `KUBECONFIG` | Base64 编码的 kubeconfig | `cat ~/.kube/config \| base64` |
|
||||||
|
|
||||||
|
**注意**:容器镜像推送使用 Gitea Actions 内置的认证变量(`${{ github.actor }}` 和 `${{ secrets.GITHUB_TOKEN }}`),无需手动配置镜像仓库凭证。
|
||||||
|
|
||||||
## 配置修改
|
## 配置修改
|
||||||
|
|
||||||
### 1. ConfigMap (`deploy/k8s/configmap.yaml`)
|
### 1. ConfigMap (`deploy/k8s/configmap.yaml`)
|
||||||
@@ -111,26 +111,29 @@ resources:
|
|||||||
### 手动部署
|
### 手动部署
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
# 1. 构建镜像
|
# 1. 登录 Gitea 容器镜像仓库
|
||||||
|
docker login gitea.tegical.world
|
||||||
|
|
||||||
|
# 2. 构建镜像
|
||||||
docker build -f apps/web/Dockerfile -t gitea.tegical.world/tegical/seclusion-web:latest .
|
docker build -f apps/web/Dockerfile -t gitea.tegical.world/tegical/seclusion-web:latest .
|
||||||
docker build -f apps/api/Dockerfile -t gitea.tegical.world/tegical/seclusion-api:latest .
|
docker build -f apps/api/Dockerfile -t gitea.tegical.world/tegical/seclusion-api:latest .
|
||||||
|
|
||||||
# 2. 推送镜像
|
# 3. 推送镜像
|
||||||
docker push gitea.tegical.world/tegical/seclusion-web:latest
|
docker push gitea.tegical.world/tegical/seclusion-web:latest
|
||||||
docker push gitea.tegical.world/tegical/seclusion-api:latest
|
docker push gitea.tegical.world/tegical/seclusion-api:latest
|
||||||
|
|
||||||
# 3. 部署到 Knative
|
# 4. 部署到 Knative
|
||||||
kubectl apply -f deploy/k8s/namespace.yaml
|
kubectl apply -f deploy/k8s/namespace.yaml
|
||||||
kubectl apply -f deploy/k8s/configmap.yaml
|
kubectl apply -f deploy/k8s/configmap.yaml
|
||||||
kubectl apply -f deploy/k8s/secret.yaml
|
kubectl apply -f deploy/k8s/secret.yaml
|
||||||
kubectl apply -f deploy/k8s/web-ksvc.yaml
|
kubectl apply -f deploy/k8s/web-ksvc.yaml
|
||||||
kubectl apply -f deploy/k8s/api-ksvc.yaml
|
kubectl apply -f deploy/k8s/api-ksvc.yaml
|
||||||
|
|
||||||
# 4. 等待服务就绪
|
# 5. 等待服务就绪
|
||||||
kubectl wait --for=condition=Ready ksvc/seclusion-web -n seclusion --timeout=300s
|
kubectl wait --for=condition=Ready ksvc/seclusion-web -n seclusion --timeout=300s
|
||||||
kubectl wait --for=condition=Ready ksvc/seclusion-api -n seclusion --timeout=300s
|
kubectl wait --for=condition=Ready ksvc/seclusion-api -n seclusion --timeout=300s
|
||||||
|
|
||||||
# 5. 查看服务 URL
|
# 6. 查看服务 URL
|
||||||
kubectl get ksvc -n seclusion
|
kubectl get ksvc -n seclusion
|
||||||
```
|
```
|
||||||
|
|
||||||
|
|||||||
@@ -16,10 +16,12 @@ spec:
|
|||||||
# 每个实例的并发请求数
|
# 每个实例的并发请求数
|
||||||
autoscaling.knative.dev/target: "100"
|
autoscaling.knative.dev/target: "100"
|
||||||
spec:
|
spec:
|
||||||
|
imagePullSecrets:
|
||||||
|
- name: harbor-registry-secret
|
||||||
containerConcurrency: 0
|
containerConcurrency: 0
|
||||||
containers:
|
containers:
|
||||||
- name: api
|
- name: api
|
||||||
image: gitea.tegical.world/tegical/seclusion-api:IMAGE_TAG_PLACEHOLDER
|
image: IMAGE_REGISTRY_PLACEHOLDER/tegical/seclusion-api:IMAGE_TAG_PLACEHOLDER
|
||||||
ports:
|
ports:
|
||||||
- containerPort: 4000
|
- containerPort: 4000
|
||||||
envFrom:
|
envFrom:
|
||||||
|
|||||||
@@ -16,10 +16,12 @@ spec:
|
|||||||
# 每个实例的并发请求数
|
# 每个实例的并发请求数
|
||||||
autoscaling.knative.dev/target: "100"
|
autoscaling.knative.dev/target: "100"
|
||||||
spec:
|
spec:
|
||||||
|
imagePullSecrets:
|
||||||
|
- name: harbor-registry-secret
|
||||||
containerConcurrency: 0
|
containerConcurrency: 0
|
||||||
containers:
|
containers:
|
||||||
- name: web
|
- name: web
|
||||||
image: gitea.tegical.world/tegical/seclusion-web:IMAGE_TAG_PLACEHOLDER
|
image: IMAGE_REGISTRY_PLACEHOLDER/tegical/seclusion-web:IMAGE_TAG_PLACEHOLDER
|
||||||
ports:
|
ports:
|
||||||
- containerPort: 3000
|
- containerPort: 3000
|
||||||
envFrom:
|
envFrom:
|
||||||
|
|||||||
Reference in New Issue
Block a user