fix dirty is not added in docker image tag
Signed-off-by: yingjinhui <yingjinhui@didiglobal.com>
This commit is contained in:
parent
63a67d7cbd
commit
d64d82c62f
16
Makefile
16
Makefile
|
@ -1,6 +1,6 @@
|
||||||
GOOS ?= $(shell go env GOOS)
|
GOOS ?= $(shell go env GOOS)
|
||||||
GOARCH ?= $(shell go env GOARCH)
|
GOARCH ?= $(shell go env GOARCH)
|
||||||
LDFLAGS='$(shell hack/version.sh)'
|
VERSION ?= '$(shell hack/version.sh)'
|
||||||
|
|
||||||
# Images management
|
# Images management
|
||||||
REGISTRY?="docker.io/karmada"
|
REGISTRY?="docker.io/karmada"
|
||||||
|
@ -8,18 +8,6 @@ REGISTRY_USER_NAME?=""
|
||||||
REGISTRY_PASSWORD?=""
|
REGISTRY_PASSWORD?=""
|
||||||
REGISTRY_SERVER_ADDRESS?=""
|
REGISTRY_SERVER_ADDRESS?=""
|
||||||
|
|
||||||
# Set your version by env or using latest tags from git
|
|
||||||
VERSION?=""
|
|
||||||
ifeq ($(VERSION), "")
|
|
||||||
LATEST_TAG=$(shell git describe --tags)
|
|
||||||
ifeq ($(LATEST_TAG),)
|
|
||||||
# Forked repo may not sync tags from upstream, so give it a default tag to make CI happy.
|
|
||||||
VERSION="unknown"
|
|
||||||
else
|
|
||||||
VERSION=$(LATEST_TAG)
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
|
|
||||||
TARGETS := karmada-aggregated-apiserver \
|
TARGETS := karmada-aggregated-apiserver \
|
||||||
karmada-controller-manager \
|
karmada-controller-manager \
|
||||||
karmada-scheduler \
|
karmada-scheduler \
|
||||||
|
@ -50,7 +38,7 @@ all: $(CMD_TARGET)
|
||||||
|
|
||||||
.PHONY: $(CMD_TARGET)
|
.PHONY: $(CMD_TARGET)
|
||||||
$(CMD_TARGET):
|
$(CMD_TARGET):
|
||||||
LDFLAGS=$(LDFLAGS) BUILD_PLATFORMS=$(GOOS)/$(GOARCH) hack/build.sh $@
|
BUILD_PLATFORMS=$(GOOS)/$(GOARCH) hack/build.sh $@
|
||||||
|
|
||||||
# Build image.
|
# Build image.
|
||||||
#
|
#
|
||||||
|
|
|
@ -23,6 +23,8 @@ set -o pipefail
|
||||||
REPO_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
|
REPO_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
|
||||||
source "${REPO_ROOT}/hack/util.sh"
|
source "${REPO_ROOT}/hack/util.sh"
|
||||||
|
|
||||||
|
LDFLAGS="$(util::version_ldflags) ${LDFLAGS:-}"
|
||||||
|
|
||||||
function build_binary() {
|
function build_binary() {
|
||||||
local -r target=$1
|
local -r target=$1
|
||||||
|
|
||||||
|
|
|
@ -622,9 +622,13 @@ function util::get_macos_ipaddress() {
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
function util::get_GO_LDFLAGS() {
|
function util::get_version() {
|
||||||
|
git describe --tags --dirty
|
||||||
|
}
|
||||||
|
|
||||||
|
function util::version_ldflags() {
|
||||||
# Git information
|
# Git information
|
||||||
GIT_VERSION=$(git describe --tags --dirty)
|
GIT_VERSION=$(util::get_version)
|
||||||
GIT_COMMIT_HASH=$(git rev-parse HEAD)
|
GIT_COMMIT_HASH=$(git rev-parse HEAD)
|
||||||
if git_status=$(git status --porcelain 2>/dev/null) && [[ -z ${git_status} ]]; then
|
if git_status=$(git status --porcelain 2>/dev/null) && [[ -z ${git_status} ]]; then
|
||||||
GIT_TREESTATE="clean"
|
GIT_TREESTATE="clean"
|
||||||
|
|
|
@ -7,4 +7,4 @@ set -o pipefail
|
||||||
KARMADA_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd -P)"
|
KARMADA_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd -P)"
|
||||||
source "${KARMADA_ROOT}/hack/util.sh"
|
source "${KARMADA_ROOT}/hack/util.sh"
|
||||||
|
|
||||||
util::get_GO_LDFLAGS
|
util::get_version
|
||||||
|
|
Loading…
Reference in New Issue