diff --git a/.gitea/workflows/dev.yaml b/.gitea/workflows/dev.yaml index 966a11e..36a463d 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/builder:v0.0.0 + image: harbor.merlin.xin/testing/merlin/action_builder:471389b69e23417ab4e86981d109c79635d7219b steps: - name: Checkout code uses: actions/checkout@v4 diff --git a/.gitea/workflows/tag.yaml b/.gitea/workflows/tag.yaml index 22cb922..89cf697 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/builder + image: harbor.merlin.xin/testing/merlin/action_builder:471389b69e23417ab4e86981d109c79635d7219b steps: - name: Checkout code uses: actions/checkout@v4 @@ -21,11 +21,10 @@ jobs: - name: Build and push Docker images env: HARBOR_URL: ${{ vars.HARBOR_URL }} - TAG: ${{ github.sha }} REPOSITORY: ${{ github.repository }} run: | ROOT_DIR=$(pwd) - IMAGE_NAME="${HARBOR_URL}/release/$REPOSITORY:${TAG}" + IMAGE_NAME="${HARBOR_URL}/release/$REPOSITORY:$GITHUB_REF_NAME" echo "Building image: ${IMAGE_NAME}" docker build -t ${IMAGE_NAME} . echo "Pushing image: ${IMAGE_NAME}"