From 16338380174bc4f6edb372ab541403d8041f791d Mon Sep 17 00:00:00 2001
From: Yuxing Deng <jxfa0043379@hotmail.com>
Date: Mon, 21 Oct 2024 20:59:39 +0800
Subject: [PATCH] fix: aliyun-metadata should have registry name for image
---
.github/workflows/push.yaml | 14 ++++++++------
.goreleaser.yaml | 1 +
scripts/build | 16 ++++++++++++++--
3 files changed, 23 insertions(+), 8 deletions(-)
diff --git a/.github/workflows/push.yaml b/.github/workflows/push.yaml
index 13d2fc2..45e9aa9 100644
--- a/.github/workflows/push.yaml
+++ b/.github/workflows/push.yaml
@@ -8,6 +8,9 @@ on:
tags:
- "v*.*.*" # Matches any tag that starts with 'v' and follows semantic versioning
+env:
+ ALIYUN_REGISTRY: ${{ vars.ALIYUN_REGISTRY || '' }}
+
jobs:
build-and-deploy:
runs-on: ubuntu-latest
@@ -18,36 +21,35 @@ jobs:
fetch-depth: 0
- name: CI
env:
- CROSS: push
SKIP_PACKAGE: "true"
run: make ci
- name: Prepare for packaging image
run: cp dist/* package/
# aliyun image to test the docker build is ok
- name: Login to Aliyun ACR
+ if: ${{ vars.ALIYUN_REGISTRY != '' }}
uses: docker/login-action@v3
with:
- registry: registry.cn-shenzhen.aliyuncs.com
+ registry: ${{ env.ALIYUN_REGISTRY }}
username: ${{ secrets.ACR_USERNAME }}
password: ${{ secrets.ACR_TOKEN }}
- if: ${{ vars.ALIYUN == 'true' }}
- name: Aliyun image docker meta
- if: ${{ vars.ALIYUN == 'true' }}
+ if: ${{ vars.ALIYUN_REGISTRY != '' }}
id: aliyun-meta
uses: docker/metadata-action@v5
with:
- images: ${{ vars.REPO || 'cnrancher' }}/${{ vars.IMAGE || 'kube-explorer' }}
+ images: ${{ env.ALIYUN_REGISTRY }}/${{ vars.REPO || 'cnrancher' }}/${{ vars.IMAGE || 'kube-explorer' }}
tags: |
type=ref,event=tag
type=ref,event=branch,suffix=-head
- name: Build to Aliyun
+ if: ${{ vars.ALIYUN_REGISTRY != '' }}
uses: docker/build-push-action@v6
with:
labels: ${{ steps.aliyun-meta.outputs.labels }}
tags: "${{ steps.aliyun-meta.outputs.tags }}"
context: package
push: true
- if: ${{ vars.ALIYUN == 'true' }}
# docker hub multi-arch image
- name: Login to Dockerhub
diff --git a/.goreleaser.yaml b/.goreleaser.yaml
index 9a18dcc..fe68028 100644
--- a/.goreleaser.yaml
+++ b/.goreleaser.yaml
@@ -44,6 +44,7 @@ builds:
- CGO_ENABLED=0
targets:
- "linux_amd64"
+ - "linux_arm64"
flags:
- -tags=embed
binary: '{{ .ProjectName }}-{{ .Os }}-{{ .Arch }}'
diff --git a/scripts/build b/scripts/build
index fd6d710..d4269d8 100755
--- a/scripts/build
+++ b/scripts/build
@@ -7,11 +7,23 @@ cd "$(dirname $0)/.."
rm -rf ./bin/* ./dist/*
BUILD_TARGET="${BUILD_TARGET:-dev}"
+CROSS=${CROSS:-}
-if [ -n "$CROSS" ]; then
- BUILD_TARGET="prod"
+if [[ $GITHUB_REF == refs/tags/* ]]; then
+ CROSS=tag
fi
+case "$CROSS" in
+ "tag")
+ BUILD_TARGET="prod"
+ ;;
+ "push")
+ ;;
+ *)
+ BUILD_ARG="${BUILD_ARG} --single-target"
+ ;;
+esac
+
BUILD_ARG="${BUILD_ARG:-} --skip validate --id ${BUILD_TARGET}"
mkdir -p "./bin"