fix: checkout 后显式 git fetch 切换触发分支,避免始终部署 main 代码;Dockerfile 添加 BuildKit cache mount 加速构建

This commit is contained in:
hhs
2026-06-20 17:43:32 +08:00
parent 6bb4773e07
commit 12e2d24f37
3 changed files with 28 additions and 7 deletions

View File

@@ -10,12 +10,19 @@ jobs:
steps: steps:
- name: Checkout - name: Checkout
uses: "http://8.161.227.145:3000/huanghaosheng/checkout@releases/v4" uses: "http://8.161.227.145:3000/huanghaosheng/checkout@releases/v4"
with:
ref: ${{ github.ref }}
- name: Install Docker CLI - name: Install Docker CLI
run: apk add --no-cache docker-cli docker-cli-compose rsync run: apk add --no-cache docker-cli docker-cli-compose rsync
- name: Switch to trigger branch
run: |
git config --global --add safe.directory "$(pwd)"
echo "触发分支: ${GITHUB_REF_NAME}"
git fetch origin "${GITHUB_REF_NAME}" --depth=1
git checkout "${GITHUB_REF_NAME}"
git reset --hard "origin/${GITHUB_REF_NAME}"
echo "当前提交: $(git log -1 --oneline)"
- name: Sync to deploy directory - name: Sync to deploy directory
run: | run: |
mkdir -p /root/camtalk mkdir -p /root/camtalk

View File

@@ -8,11 +8,19 @@ ENV GOPROXY=https://goproxy.cn,https://goproxy.io,direct
# 先复制依赖清单,利用 Docker 缓存层 # 先复制依赖清单,利用 Docker 缓存层
COPY go.mod go.sum ./ COPY go.mod go.sum ./
RUN go mod download
# --mount=type=cache 复用 Go module 缓存,依赖不变时跳过下载
RUN --mount=type=cache,target=/go/pkg/mod \
go mod download
# 复制源码并构建 # 复制源码并构建
COPY . . COPY . .
RUN CGO_ENABLED=0 GOOS=linux go build -o /camtalk ./cmd/server
# 复用 module 缓存 + 编译缓存;-ldflags="-s -w" 裁剪符号表减小 ~30% 体积
RUN --mount=type=cache,target=/go/pkg/mod \
--mount=type=cache,target=/root/.cache/go-build \
CGO_ENABLED=0 GOOS=linux \
go build -ldflags="-s -w" -o /camtalk ./cmd/server
# ---- 运行阶段 ---- # ---- 运行阶段 ----
FROM alpine:3.20 FROM alpine:3.20

View File

@@ -8,11 +8,17 @@ RUN npm config set registry https://registry.npmmirror.com
# 先复制依赖清单,利用 Docker 缓存层 # 先复制依赖清单,利用 Docker 缓存层
COPY package.json package-lock.json ./ COPY package.json package-lock.json ./
RUN npm ci
# 复制源码并构建 # --mount=type=cache 复用 npm 缓存,依赖不变时跳过下载
# --no-audit 跳过安全审计,提速明显
RUN --mount=type=cache,target=/root/.npm \
npm ci --no-audit
# 复制源码并构建Vite 构建缓存也复用)
COPY . . COPY . .
RUN npm run build RUN --mount=type=cache,target=/root/.npm \
--mount=type=cache,target=/app/node_modules/.vite \
npm run build
# ---- 运行阶段 ---- # ---- 运行阶段 ----
FROM nginx:stable-alpine FROM nginx:stable-alpine