| commit | 95c25c2054586f6ef408659764098acb91f8d273 | [log] [tgz] |
|---|---|---|
| author | kv <gxthrj@163.com> | Mon Jan 11 19:03:01 2021 +0800 |
| committer | kv <gxthrj@163.com> | Mon Jan 11 19:03:01 2021 +0800 |
| tree | 698ec7459c23a7d0e081ae17e929d34490ac7ef8 | |
| parent | 12ea1ebb8de8ef58b960bb73a63f6c03a3530268 [diff] |
merge conflict
diff --git a/Makefile b/Makefile index cfebc23..cfe2643 100644 --- a/Makefile +++ b/Makefile
@@ -18,7 +18,7 @@ VERSION ?= 0.2.0 RELEASE_SRC = apache-apisix-ingress-controller-${VERSION}-src -IMAGE_TAG ?= "latest" +IMAGE_TAG ?= "dev" GITSHA ?= $(shell git rev-parse --short=7 HEAD) OSNAME ?= $(shell uname -s | tr A-Z a-z)