guanyuankai
/
bonus-edge-proxy
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改build文件

This commit is contained in:
GuanYuankai 2025-11-11 13:39:01 +08:00
parent 8947356d3d
commit 5a6fa4e368
1 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
.gitea/workflows/build-push.yml
View File

@ -1,10 +1,15 @@
# 步骤 1: 手动检出代码 (更新为克隆到 'repo' 子目录) jobs:
build-and-push:
runs-on: arm64
steps:
# 步骤 1: 手动检出代码
- name: Manual Checkout - name: Manual Checkout
run: | run: |
set -e
echo "正在手动检出代码..." echo "正在手动检出代码..."
# 1. 创建一个干净的目录
# 我们不再尝试清理 '..'，而是克隆到一个新的子目录
REPO_DIR="repo" REPO_DIR="repo"
rm -rf $REPO_DIR rm -rf $REPO_DIR
mkdir $REPO_DIR mkdir $REPO_DIR
@ -15,11 +20,9 @@
exit 1 exit 1
fi fi
# 2. 构造认证 URL
REPO_URL_AUTH=$(echo "$GITEA_REPOSITORY_URL" | sed "s|://|://${GITEA_ACTOR}:${{ secrets.cicd }}@|") REPO_URL_AUTH=$(echo "$GITEA_REPOSITORY_URL" | sed "s|://|://${GITEA_ACTOR}:${{ secrets.cicd }}@|")
REPO_URL_WITH_CREDS="${REPO_URL_AUTH}.git" REPO_URL_WITH_CREDS="${REPO_URL_AUTH}.git"
# 3. 执行 Git Clone (克隆到 './repo' 目录)
echo "开始克隆分支 $GITEA_REF_NAME 到 $REPO_DIR 目录..." echo "开始克隆分支 $GITEA_REF_NAME 到 $REPO_DIR 目录..."
git clone --quiet --branch $GITEA_REF_NAME $REPO_URL_WITH_CREDS $REPO_DIR git clone --quiet --branch $GITEA_REF_NAME $REPO_URL_WITH_CREDS $REPO_DIR
@ -30,25 +33,23 @@
ls -la $REPO_DIR/docker ls -la $REPO_DIR/docker
echo "---" echo "---"
# 步骤 2: 登录 Gitea 容器注册表 (保持不变) # 步骤 2: 登录 Gitea 容器注册表
- name: Login to Gitea Container Registry - name: Login to Gitea Container Registry
run: | run: | # <--- 修复：这里也必须有 '|'
echo ${{ secrets.cicd }} | docker login http://192.168.0.75:3000 -u ${{ gitea.actor }} --password-stdin echo ${{ secrets.cicd }} | docker login http://192.168.0.75:3000 -u ${{ gitea.actor }} --password-stdin
# 步骤 3: 构建并推送镜像 (更新：增加了 cd repo) # 步骤 3: 构建并推送镜像
- name: Build and Push Image - name: Build and Push Image
run: | run: | # <--- 修复：这里也必须有 '|'
# ---------------------------------------------------- set -e
# 关键修复：进入我们检出代码的 'repo' 目录
echo "切换工作目录到 ./repo" echo "切换工作目录到 ./repo"
cd repo cd repo
# 确认我们现在在正确的目录中 echo "已成功切换目录。当前工作目录 (pwd):"
echo "当前工作目录 (pwd):"
pwd pwd
echo "当前目录内容 (ls -la):" echo "当前目录内容 (ls -la):"
ls -la ls -la
# ----------------------------------------------------
VERSION=$(echo ${{ gitea.ref_name }} | sed 's/v//') VERSION=$(echo ${{ gitea.ref_name }} | sed 's/v//')
IMAGE_PATH="192.168.0.75:3000/guanyuankai/bonus-edge-proxy:${VERSION}" IMAGE_PATH="192.168.0.75:3000/guanyuankai/bonus-edge-proxy:${VERSION}"
@ -56,8 +57,6 @@
echo "Building and pushing $IMAGE_PATH..." echo "Building and pushing $IMAGE_PATH..."
# 这里的路径 -f docker/Dockerfile.prod .
# 现在是相对于 './repo' 目录的，这是正确的
docker buildx build \ docker buildx build \
--platform linux/arm64 \ --platform linux/arm64 \
-t $IMAGE_PATH \ -t $IMAGE_PATH \