From d721c235cb7b0f9bafd3f261c48da5b11ee9e480 Mon Sep 17 00:00:00 2001 From: Jacky Wu Date: Wed, 5 Mar 2025 12:15:37 +0800 Subject: [PATCH] chore: load EXTRA_TAGS from plugin .buildrc file to avoid build issue. (#1852) --- plugins/wasm-go/Makefile | 6 +++--- plugins/wasm-go/README.md | 2 ++ plugins/wasm-go/README_EN.md | 2 ++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/plugins/wasm-go/Makefile b/plugins/wasm-go/Makefile index 45e10abe69..18e4b7c750 100644 --- a/plugins/wasm-go/Makefile +++ b/plugins/wasm-go/Makefile @@ -12,14 +12,14 @@ COMMIT_ID := $(shell git rev-parse --short HEAD 2>/dev/null) IMAGE_TAG = $(if $(strip $(PLUGIN_VERSION)),${PLUGIN_VERSION},${BUILD_TIME}-${COMMIT_ID}) IMG ?= ${REGISTRY}${PLUGIN_NAME}:${IMAGE_TAG} GOPROXY := $(shell go env GOPROXY) -EXTRA_TAGS ?= +EXTRA_TAGS := $(shell [ -f extensions/${PLUGIN_NAME}/.buildrc ] && . extensions/${PLUGIN_NAME}/.buildrc && echo $$EXTRA_TAGS || echo "") .DEFAULT: build: DOCKER_BUILDKIT=1 docker build --build-arg PLUGIN_NAME=${PLUGIN_NAME} \ --build-arg BUILDER=${BUILDER} \ --build-arg GOPROXY=$(GOPROXY) \ - --build-arg EXTRA_TAGS=$(EXTRA_TAGS) \ + --build-arg EXTRA_TAGS=${EXTRA_TAGS} \ -t ${IMG} \ --output extensions/${PLUGIN_NAME} \ . @@ -30,7 +30,7 @@ build-image: DOCKER_BUILDKIT=1 docker build --build-arg PLUGIN_NAME=${PLUGIN_NAME} \ --build-arg BUILDER=${BUILDER} \ --build-arg GOPROXY=$(GOPROXY) \ - --build-arg EXTRA_TAGS=$(EXTRA_TAGS) \ + --build-arg EXTRA_TAGS=${EXTRA_TAGS} \ -t ${IMG} \ . @echo "" diff --git a/plugins/wasm-go/README.md b/plugins/wasm-go/README.md index 41fd06d6e9..00656f7ad7 100644 --- a/plugins/wasm-go/README.md +++ b/plugins/wasm-go/README.md @@ -9,6 +9,8 @@ 使用以下命令可以快速构建 wasm-go 插件: ```bash +# NOTE: 如果你想在构建插件的时候设置额外的构建参数 EXTRA_TAGS +# 请更新 extensions/${PLUGIN_NAME} 插件目录对应的 .buildrc 文件 $ PLUGIN_NAME=request-block make build ``` diff --git a/plugins/wasm-go/README_EN.md b/plugins/wasm-go/README_EN.md index cc640154d9..675bf0bb26 100644 --- a/plugins/wasm-go/README_EN.md +++ b/plugins/wasm-go/README_EN.md @@ -7,6 +7,8 @@ This SDK is used to develop the WASM Plugins for Higress in Go. The wasm-go plugin can be built quickly with the following command: ```bash +# NOTE: if you want to set EXTRA_TAGS for the wasm plugin +# please set them in the .buildrc file under extensions/${PLUGIN_NAME} directory $ PLUGIN_NAME=request-block make build ```