Compare commits

..

10 Commits

Author SHA1 Message Date
d4993c37e7 update README
Some checks failed
CI - Build and Push Docker Image & Update Helm Chart / build-and-deploy (push) Failing after 1m41s
2025-07-07 12:50:42 +08:00
GitHub Actions
0c28af8b88 CI: Update image tag to 390b0b90e2 2025-07-07 04:48:22 +00:00
390b0b90e2 change chart folder name 2025-07-07 12:47:31 +08:00
GitHub Actions
f3d5ae07f1 CI: Update image tag to 6d67df70ef 2025-07-07 03:46:29 +00:00
6d67df70ef update ingress.yaml 2025-07-07 11:45:32 +08:00
GitHub Actions
9b23bfb3aa CI: Update image tag to bc560d4f50 2025-07-07 03:29:05 +00:00
bc560d4f50 update docker-ci.yml 2025-07-07 11:28:07 +08:00
8cbd8f8746 add github action yaml 2025-07-07 11:26:28 +08:00
12a9449ba9 add ingress 2025-07-07 11:14:20 +08:00
TeamCity CI
c246e71c81 CI: Update mark_word_fastapi image to build 55 2025-07-07 03:13:31 +00:00
8 changed files with 109 additions and 2 deletions

82
.github/workflows/docker-ci.yml vendored Normal file
View File

@@ -0,0 +1,82 @@
# .github/workflows/ci-cd.yml
name: CI - Build and Push Docker Image & Update Helm Chart
# 当有代码推送到 main 分支时触发此工作流
on:
push:
branches: [ "main" ]
jobs:
build-and-deploy:
runs-on: ubuntu-latest # 使用最新的 Ubuntu 运行环境
steps:
# 步骤 1: 检出你的代码
# 使用 actions/checkout@v4 来获取仓库代码
- name: Checkout repository
uses: actions/checkout@v4
# 为了能推送回git仓库我们需要获取提交的权限
# GITHUB_TOKEN 是由 GitHub 自动生成的,你需要在仓库设置中给予它写权限
with:
token: ${{ secrets.GITHUB_TOKEN }}
# 步骤 2: 登录到 Docker Hub
# 使用 docker/login-action它会安全地处理你的凭据
- name: Log in to Docker Hub
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
# 步骤 3: 设置 Docker Buildx
# 这是 docker/build-push-action 的推荐设置
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
# 步骤 4: 构建并推送 Docker 镜像
# 这个 Action 会将构建和推送合并为一步
# 我们使用 github.sha (当前提交的SHA值) 作为镜像标签,这是最佳实践,保证了标签的唯一性和可追溯性
- name: Build and push Docker image
id: build-and-push
uses: docker/build-push-action@v5
with:
context: . # Dockerfile 所在的上下文路径
file: ./Dockerfile # Dockerfile 的路径 (如果不是默认名)
push: true # 确认要推送
tags: ${{ secrets.DOCKER_REGISTRY_URL }}/mark_word_fastapi:${{ github.sha }}, ${{ secrets.DOCKER_REGISTRY_URL }}/mark_word_fastapi:latest
# 步骤 5: 更新 Helm values.yaml 文件
- name: Update Helm values file
# 这个复合步骤包含了安装yq、修改文件、配置git和提交推送的所有操作
run: |
# 定义新镜像的标签为当前 commit SHA
IMAGE_TAG=${{ github.sha }}
echo "New image tag is: $IMAGE_TAG"
# 1. 安装 yq 工具 (使用社区提供的 Action 会更简洁,但这里为了和您的脚本保持一致,采用手动安装)
echo "Installing yq..."
sudo wget https://github.com/mikefarah/yq/releases/latest/download/yq_linux_amd64 -O /usr/local/bin/yq
sudo chmod +x /usr/local/bin/yq
yq --version
# 2. 使用 yq 更新 values.yaml
echo "Updating Helm chart values..."
yq e '.image.tag = "'$IMAGE_TAG'"' -i kubernetes/mark-word-fastapi-chart/values.yaml
# 3. 配置 Git 用户信息
echo "Configuring Git..."
git config user.name "GitHub Actions"
git config user.email "actions@github.com"
# 4. 提交并推送变更
echo "Committing and pushing changes..."
git add kubernetes/mark-word-fastapi-chart/values.yaml
# 检查是否有文件变更,避免在没有变更时创建空的 commit
if ! git diff --staged --quiet; then
git commit -m "CI: Update image tag to ${IMAGE_TAG}"
git push
else
echo "No changes to commit."
fi

View File

@@ -18,7 +18,7 @@ WordMark 是一个基于 FastAPI 和 THULAC 的词性标注工具。用户可以
```
project/
├── app.py # FastAPI 项目入口
├── main.py # FastAPI 项目入口
├── Dockerfile # Docker 配置文件
├── requirements.txt # Python 包依赖文件
├── templates/ # HTML 模板文件夹

View File

@@ -0,0 +1,25 @@
# kubernetes/mark-word-fastapi-chart/templates/ingress.yaml
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
name: {{ include "mark-word-fastapi.fullname" . }}
labels:
{{- include "mark-word-fastapi.labels" . | nindent 4 }}
annotations:
# 可以添加 Traefik 特定的 annotation例如强制重定向到 HTTPS
# traefik.ingress.kubernetes.io/router.entrypoints: web, websecure
# traefik.ingress.kubernetes.io/router.tls: "true"
# traefik.ingress.kubernetes.io/router.middlewares: default-redirect-https@kubernetescrd
spec:
ingressClassName: {{ .Values.ingress.className }}
rules:
- host: {{ .Values.ingress.host | quote }}
http:
paths:
- path: /
pathType: Prefix
backend:
service:
name: {{ include "mark-word-fastapi.fullname" . }}
port:
number: {{ .Values.service.port }}

View File

@@ -2,7 +2,7 @@ replicaCount: 1
image:
repository: docker.io/lostecho6174/mark_word_fastapi # <-- 替换为你的容器注册表路径和镜像名称
pullPolicy: IfNotPresent
tag: "54" # <-- TeamCity 将会更新这个标签
tag: "390b0b90e23ee3d685cf520ca42559ff38162e2c" # <-- TeamCity 将会更新这个标签
service:
type: ClusterIP # 或 LoadBalancer根据你的需求
port: 8000