Merge pull request 'dev' (#5) from dev into main
All checks were successful
Docker Image CI / build (push) Successful in 4s

Reviewed-on: #5
This commit is contained in:
2025-11-06 03:52:20 +00:00
3 changed files with 13 additions and 2 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/testing/merlin/action_builder:471389b69e23417ab4e86981d109c79635d7219b image: harbor.merlin.xin/release/merlin/action_builder:v0.0.1
steps: steps:
- name: Checkout code - name: Checkout code
uses: actions/checkout@v4 uses: actions/checkout@v4
@@ -31,3 +31,6 @@ 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/testing/merlin/action_builder:471389b69e23417ab4e86981d109c79635d7219b image: harbor.merlin.xin/release/merlin/action_builder:v0.0.1
steps: steps:
- name: Checkout code - name: Checkout code
uses: actions/checkout@v4 uses: actions/checkout@v4
@@ -30,3 +30,5 @@ 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,6 +3,12 @@ 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" ]