diff --git a/.gitea/workflows/dev.yaml b/.gitea/workflows/dev.yaml index 36a463d..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 @@ -31,3 +31,6 @@ jobs: echo "Pushing image: ${IMAGE_NAME}" docker push ${IMAGE_NAME} echo "Successfully pushed: ${IMAGE_NAME}" + docker rmi ${IMAGE_NAME} + echo "cleaned up local image" + 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" 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