From aa7b777a2eb40ae16e889eb85bd5d3adba53d3e9 Mon Sep 17 00:00:00 2001 From: merlin Date: Sat, 1 Nov 2025 16:39:38 +0000 Subject: [PATCH 1/5] fix(ci): add clean logic --- .gitea/workflows/dev.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitea/workflows/dev.yaml b/.gitea/workflows/dev.yaml index 36a463d..77244ea 100644 --- a/.gitea/workflows/dev.yaml +++ b/.gitea/workflows/dev.yaml @@ -31,3 +31,6 @@ jobs: echo "Pushing image: ${IMAGE_NAME}" docker push ${IMAGE_NAME} echo "Successfully pushed: ${IMAGE_NAME}" + - name: Clean env + run: docker rmi $(docker images -q) + From 3ca5a6e0ec34d85afbd4b2322d8c62d1e61bd23f Mon Sep 17 00:00:00 2001 From: merlin Date: Sat, 1 Nov 2025 16:41:17 +0000 Subject: [PATCH 2/5] fix(ci): fix clean logic --- .gitea/workflows/dev.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/dev.yaml b/.gitea/workflows/dev.yaml index 77244ea..dbc31ca 100644 --- a/.gitea/workflows/dev.yaml +++ b/.gitea/workflows/dev.yaml @@ -32,5 +32,5 @@ jobs: docker push ${IMAGE_NAME} echo "Successfully pushed: ${IMAGE_NAME}" - name: Clean env - run: docker rmi $(docker images -q) + run: docker rmi -f $(docker images -q) From 8a1c11746cd51a1a9777141717b81f4e8908cc40 Mon Sep 17 00:00:00 2001 From: merlin Date: Sun, 2 Nov 2025 01:00:09 +0800 Subject: [PATCH 3/5] fix(ci): fix cleaning logic --- .gitea/workflows/dev.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/dev.yaml b/.gitea/workflows/dev.yaml index dbc31ca..10b95c0 100644 --- a/.gitea/workflows/dev.yaml +++ b/.gitea/workflows/dev.yaml @@ -31,6 +31,6 @@ jobs: echo "Pushing image: ${IMAGE_NAME}" docker push ${IMAGE_NAME} echo "Successfully pushed: ${IMAGE_NAME}" - - name: Clean env - run: docker rmi -f $(docker images -q) + docker rmi ${IMAGE_NAME} + echo "cleaned up local image" From ac03276f0e67184e1fac9b15f3d11fddc941fa7f Mon Sep 17 00:00:00 2001 From: merlin Date: Sun, 2 Nov 2025 01:03:44 +0800 Subject: [PATCH 4/5] feat(ci): update builder to release version --- .gitea/workflows/dev.yaml | 2 +- .gitea/workflows/tag.yaml | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/dev.yaml b/.gitea/workflows/dev.yaml index 10b95c0..be17ec3 100644 --- a/.gitea/workflows/dev.yaml +++ b/.gitea/workflows/dev.yaml @@ -8,7 +8,7 @@ jobs: build: runs-on: gitea-official-runner container: - image: harbor.merlin.xin/testing/merlin/action_builder:471389b69e23417ab4e86981d109c79635d7219b + image: harbor.merlin.xin/release/merlin/action_builder:v0.0.1 steps: - name: Checkout code uses: actions/checkout@v4 diff --git a/.gitea/workflows/tag.yaml b/.gitea/workflows/tag.yaml index 89cf697..1f70955 100644 --- a/.gitea/workflows/tag.yaml +++ b/.gitea/workflows/tag.yaml @@ -8,7 +8,7 @@ jobs: build: runs-on: gitea-official-runner container: - image: harbor.merlin.xin/testing/merlin/action_builder:471389b69e23417ab4e86981d109c79635d7219b + image: harbor.merlin.xin/release/merlin/action_builder:v0.0.1 steps: - name: Checkout code uses: actions/checkout@v4 @@ -30,3 +30,5 @@ jobs: echo "Pushing image: ${IMAGE_NAME}" docker push ${IMAGE_NAME} echo "Successfully pushed: ${IMAGE_NAME}" + docker rmi ${IMAGE_NAME} + echo "cleaned up local image" From b4a18dd4850546a80dd4e5aabd40fa1b09472bc1 Mon Sep 17 00:00:00 2001 From: merlin Date: Thu, 6 Nov 2025 11:49:49 +0800 Subject: [PATCH 5/5] feat: add helm package ability --- Dockerfile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Dockerfile b/Dockerfile index 8798c88..2e15977 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,6 +3,12 @@ FROM harbor.merlin.xin/mirrors/docker.io/library/docker:24.0.6-dind # 安装 Node.js 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 ENTRYPOINT [ "/bin/bash" ] \ No newline at end of file