Aeraki support for multi-architecture image (#333)

Signed-off-by: chentanjun <tanjunchen20@gmail.com>

Makefile

@@ -23,18 +23,16 @@ GOBIN?=$(GOPATH)/bin
 GOMOD?=$(GOCMD) mod
 
 OUT?=./out
-IMAGE_TMP?=$(OUT)/image_temp/
 IMAGE_REPO?=ghcr.io/aeraki-mesh
 IMAGE_NAME?=aeraki
 IMAGE_TAG?=latest
 IMAGE?=$(IMAGE_REPO)/$(IMAGE_NAME):$(IMAGE_TAG)
 IMAGE_E2E_TAG?=`git log --format="%H" -n 1`
 IMAGE_E2E?=$(IMAGE_REPO)/$(IMAGE_NAME):$(IMAGE_E2E_TAG)
-BINARY_NAME?=$(OUT)/aeraki
-BINARY_NAME_DARWIN?=$(BINARY_NAME)-darwin
-MAIN_PATH_AERAKI=./cmd/aeraki/main.go
-GOOS?=linux
-GOARCH?=amd64
+MAIN_PATH=./cmd/aeraki/main.go
+IMAGE_OS?=linux
+IMAGE_ARCH?=amd64
+IMAGE_DOCKERFILE_PATH?=docker/Dockerfile
 
 .DEFAULT_GOAL := build
 
@@ -45,7 +43,7 @@ install-for-tcm:
 demo:
 	bash demo/install-demo.sh default
 uninstall-aeraki:
-	bash demo/uninstall-aeraki.sh 
+	bash demo/uninstall-aeraki.sh
 uninstall-demo:
 	bash demo/uninstall-demo.sh default
 demo-kafka:
@@ -60,30 +58,17 @@ test: style-check
 	$(GOMOD) tidy
 	$(GOTEST) -race  `go list ./... | grep -v e2e`
 build: test
-	CGO_ENABLED=0 GOOS=${GOOS} GOARCH=${GOARCH} $(GOBUILD) -o $(BINARY_NAME) $(MAIN_PATH_AERAKI)
-build-mac: test
-	CGO_ENABLED=0 GOOS=darwin GOARCH=${GOARCH} $(GOBUILD) -o $(BINARY_NAME_DARWIN) $(MAIN_PATH_AERAKI)
+	CGO_ENABLED=0 GOOS=$(IMAGE_OS) GOARCH=$(IMAGE_ARCH) $(GOBUILD) -o $(OUT)/$(IMAGE_ARCH)/$(IMAGE_OS)/$(IMAGE_NAME) $(MAIN_PATH)
 docker-build: build
-	rm -rf $(IMAGE_TMP)
-	mkdir $(IMAGE_TMP)
-	cp ./docker/Dockerfile $(IMAGE_TMP)
-	cp $(BINARY_NAME) $(IMAGE_TMP)
-	docker build -t $(IMAGE) $(IMAGE_TMP)
-	docker build --platform=${GOOS}/${GOARCH} -t $(IMAGE) $(IMAGE_TMP)
-	rm -rf $(IMAGE_TMP)
+	docker build --build-arg AERAKI_ROOT_BIN_DIR=${OUT} --build-arg ARCH=${IMAGE_ARCH} --build-arg OS=${IMAGE_OS} \
+	--no-cache --platform=${IMAGE_OS}/${IMAGE_ARCH} -t ${IMAGE} -f ${IMAGE_DOCKERFILE_PATH} .
 docker-push: docker-build
 	docker push $(IMAGE)
 docker-build-e2e: build
-	rm -rf $(IMAGE_TMP)
-	mkdir $(IMAGE_TMP)
-	cp ./docker/Dockerfile $(IMAGE_TMP)
-	cp $(BINARY_NAME) $(IMAGE_TMP)
-	docker build --platform=${GOOS}/${GOARCH} -t $(IMAGE_E2E) $(IMAGE_TMP)
-	rm -rf $(IMAGE_TMP)
-
+	docker build --build-arg AERAKI_ROOT_BIN_DIR=${OUT} --build-arg ARCH=${IMAGE_ARCH} --build-arg OS=${IMAGE_OS} \
+  	--no-cache --platform=${IMAGE_OS}/${IMAGE_ARCH} -t ${IMAGE_E2E} -f ${IMAGE_DOCKERFILE_PATH} .
 cross_build_images:
 	bash hack/make-rules/cross_build_images.sh
-
 clean:
 	rm -rf $(OUT)
 style-check:
@@ -103,4 +88,4 @@ e2e-redis:
 e2e-metaprotocol:
 	go test -v github.com/aeraki-mesh/aeraki/test/e2e/metaprotocol/...
 e2e: e2e-dubbo e2e-thrift e2e-kafka-zookeeper e2e-redis e2e-metaprotocol
-.PHONY: build docker-build docker-push clean style-check lint e2e-dubbo e2e-thrift e2e-kafka-zookeeper e2e install demo uninstall-demo
+.PHONY: build docker-build docker-push clean style-check lint e2e-dubbo e2e-thrift e2e-kafka-zookeeper e2e install demo uninstall-demo

README.md

@@ -137,7 +137,7 @@ https://www.aeraki.net/docs/v1.x/install/
 make build
 
 # build aeraki binary on darwin
-make build-mac
+make build IMAGE_OS=darwin
 ```
 
 ### Build Aeraki Image
@@ -147,7 +147,7 @@ make build-mac
 make docker-build
 
 # build aeraki docker image with xxx tag
-make docker-build tag=xxx
+make docker-build IMAGE_TAG=xxx
 
 # build aeraki e2e docker image
 make docker-build-e2e