chore: change for fitting new server system

This commit is contained in:
merlin
2026-03-05 14:57:08 +08:00
parent b4a18dd485
commit 8cad9e0651
4 changed files with 86 additions and 88 deletions

View File

@@ -8,7 +8,7 @@ jobs:
build: build:
runs-on: gitea-official-runner runs-on: gitea-official-runner
container: container:
image: harbor.merlin.xin/release/merlin/action_builder:v0.0.1 image: registry.merlin.xin/candlelight/action_builder:v0.0.1
steps: steps:
- name: Checkout code - name: Checkout code
uses: actions/checkout@v4 uses: actions/checkout@v4
@@ -25,7 +25,7 @@ jobs:
REPOSITORY: ${{ github.repository }} REPOSITORY: ${{ github.repository }}
run: | run: |
ROOT_DIR=$(pwd) ROOT_DIR=$(pwd)
IMAGE_NAME="${HARBOR_URL}/testing/$REPOSITORY:${TAG}" IMAGE_NAME="${HARBOR_URL}/testing/candlelight/$REPOSITORY:${TAG}"
echo "Building image: ${IMAGE_NAME}" echo "Building image: ${IMAGE_NAME}"
docker build -t ${IMAGE_NAME} . docker build -t ${IMAGE_NAME} .
echo "Pushing image: ${IMAGE_NAME}" echo "Pushing image: ${IMAGE_NAME}"

View File

@@ -8,7 +8,7 @@ jobs:
build: build:
runs-on: gitea-official-runner runs-on: gitea-official-runner
container: container:
image: harbor.merlin.xin/release/merlin/action_builder:v0.0.1 image: registry.merlin.xin/candlelight/action_builder:v0.0.1
steps: steps:
- name: Checkout code - name: Checkout code
uses: actions/checkout@v4 uses: actions/checkout@v4
@@ -24,7 +24,7 @@ jobs:
REPOSITORY: ${{ github.repository }} REPOSITORY: ${{ github.repository }}
run: | run: |
ROOT_DIR=$(pwd) ROOT_DIR=$(pwd)
IMAGE_NAME="${HARBOR_URL}/release/$REPOSITORY:$GITHUB_REF_NAME" IMAGE_NAME="${HARBOR_URL}/candlelight/$REPOSITORY:$GITHUB_REF_NAME"
echo "Building image: ${IMAGE_NAME}" echo "Building image: ${IMAGE_NAME}"
docker build -t ${IMAGE_NAME} . docker build -t ${IMAGE_NAME} .
echo "Pushing image: ${IMAGE_NAME}" echo "Pushing image: ${IMAGE_NAME}"

View File

@@ -1,4 +1,4 @@
FROM harbor.merlin.xin/mirrors/docker.io/library/docker:24.0.6-dind FROM registry.merlin.xin/library/docker:24.0.6-dind
# 安装 Node.js # 安装 Node.js
RUN apk add --no-cache bash curl git nodejs npm RUN apk add --no-cache bash curl git nodejs npm

View File

@@ -1,5 +1,3 @@
# action_builder # action_builder for gitea_action
自己构建的一个方便使用的docker构建器 全量的镜像构建器可以独立构建应用镜像和chart包
他一定不是最快的,但是一定是最方便、最直观的