Merge branch 'dev'
All checks were successful
Docker Image CI / build (push) Successful in 6s

This commit is contained in:
2025-11-02 00:24:46 +08:00
2 changed files with 3 additions and 4 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/builder:v0.0.0 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

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/builder 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
@@ -21,11 +21,10 @@ 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:${TAG}" IMAGE_NAME="${HARBOR_URL}/release/$REPOSITORY:$GITHUB_REF_NAME"
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}"