Compare commits

1 Commits

Author SHA1 Message Date
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 4 additions and 14 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/builder:v0.0.0
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/builder:v0.0.0
steps: steps:
- name: Checkout code - name: Checkout code
uses: actions/checkout@v4 uses: actions/checkout@v4
@@ -21,14 +21,13 @@ jobs:
- name: Build and push Docker images - name: Build and push Docker images
env: env:
HARBOR_URL: ${{ vars.HARBOR_URL }} HARBOR_URL: ${{ vars.HARBOR_URL }}
TAG: ${{ github.sha }}
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}/release/$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}"
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" ]