Compare commits

4 Commits

Author SHA1 Message Date
f2cfcf68dd Merge branch 'dev'
All checks were successful
Docker Image CI / build (push) Successful in 6s
2025-11-02 00:24:46 +08:00
c5f6e2a2d5 Merge pull request 'feat: build basic builder' (#2) from merlin-patch-1 into main
Reviewed-on: #2
2025-11-01 16:09:44 +00:00
2b79cea3f5 feat: build basic builder 2025-11-01 16:09:25 +00:00
8ea43e5561 Merge pull request 'dev' (#1) from dev into main
Reviewed-on: #1
2025-10-22 09:53:22 +00:00
3 changed files with 2 additions and 13 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: harbor.merlin.xin/testing/merlin/action_builder:471389b69e23417ab4e86981d109c79635d7219b
steps: steps:
- name: Checkout code - name: Checkout code
uses: actions/checkout@v4 uses: actions/checkout@v4
@@ -31,6 +31,3 @@ jobs:
echo "Pushing image: ${IMAGE_NAME}" echo "Pushing image: ${IMAGE_NAME}"
docker push ${IMAGE_NAME} docker push ${IMAGE_NAME}
echo "Successfully pushed: ${IMAGE_NAME}" echo "Successfully pushed: ${IMAGE_NAME}"
docker rmi ${IMAGE_NAME}
echo "cleaned up local image"

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: harbor.merlin.xin/testing/merlin/action_builder:471389b69e23417ab4e86981d109c79635d7219b
steps: steps:
- name: Checkout code - name: Checkout code
uses: actions/checkout@v4 uses: actions/checkout@v4
@@ -30,5 +30,3 @@ jobs:
echo "Pushing image: ${IMAGE_NAME}" echo "Pushing image: ${IMAGE_NAME}"
docker push ${IMAGE_NAME} docker push ${IMAGE_NAME}
echo "Successfully pushed: ${IMAGE_NAME}" echo "Successfully pushed: ${IMAGE_NAME}"
docker rmi ${IMAGE_NAME}
echo "cleaned up local image"

View File

@@ -3,12 +3,6 @@ FROM harbor.merlin.xin/mirrors/docker.io/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
# 安装 helm CLI
RUN curl -fsSL https://get.helm.sh/helm-v3.13.2-linux-amd64.tar.gz -o helm.tar.gz \
&& tar -zxvf helm.tar.gz \
&& mv linux-amd64/helm /usr/local/bin/helm \
&& rm -rf linux-amd64 helm.tar.gz
WORKDIR /workspace WORKDIR /workspace
ENTRYPOINT [ "/bin/bash" ] ENTRYPOINT [ "/bin/bash" ]