Skip to content

Commit 500f1f4

Browse files
committed
chore: load EXTRA_TAGS from plugin .buildrc file to avoid build issue.
1 parent 0905cd0 commit 500f1f4

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

plugins/wasm-go/Makefile

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@ COMMIT_ID := $(shell git rev-parse --short HEAD 2>/dev/null)
1212
IMAGE_TAG = $(if $(strip $(PLUGIN_VERSION)),${PLUGIN_VERSION},${BUILD_TIME}-${COMMIT_ID})
1313
IMG ?= ${REGISTRY}${PLUGIN_NAME}:${IMAGE_TAG}
1414
GOPROXY := $(shell go env GOPROXY)
15-
EXTRA_TAGS ?=
15+
EXTRA_TAGS := $(shell [ -f extensions/${PLUGIN_NAME}/.buildrc ] && . extensions/${PLUGIN_NAME}/.buildrc && echo $$EXTRA_TAGS || echo "")
1616

1717
.DEFAULT:
1818
build:
1919
DOCKER_BUILDKIT=1 docker build --build-arg PLUGIN_NAME=${PLUGIN_NAME} \
2020
--build-arg BUILDER=${BUILDER} \
2121
--build-arg GOPROXY=$(GOPROXY) \
22-
--build-arg EXTRA_TAGS=$(EXTRA_TAGS) \
22+
--build-arg EXTRA_TAGS=${EXTRA_TAGS} \
2323
-t ${IMG} \
2424
--output extensions/${PLUGIN_NAME} \
2525
.
@@ -30,7 +30,7 @@ build-image:
3030
DOCKER_BUILDKIT=1 docker build --build-arg PLUGIN_NAME=${PLUGIN_NAME} \
3131
--build-arg BUILDER=${BUILDER} \
3232
--build-arg GOPROXY=$(GOPROXY) \
33-
--build-arg EXTRA_TAGS=$(EXTRA_TAGS) \
33+
--build-arg EXTRA_TAGS=${EXTRA_TAGS} \
3434
-t ${IMG} \
3535
.
3636
@echo ""

plugins/wasm-go/README.md

+2
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99
使用以下命令可以快速构建 wasm-go 插件:
1010

1111
```bash
12+
# NOTE: 如果你想在构建插件的时候设置额外的构建参数 EXTRA_TAGS
13+
# 请更新 extensions/${PLUGIN_NAME} 插件目录对应的 .buildrc 文件
1214
$ PLUGIN_NAME=request-block make build
1315
```
1416

plugins/wasm-go/README_EN.md

+2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ This SDK is used to develop the WASM Plugins for Higress in Go.
77
The wasm-go plugin can be built quickly with the following command:
88

99
```bash
10+
# NOTE: if you want to set EXTRA_TAGS for the wasm plugin
11+
# please set them in the .buildrc file under extensions/${PLUGIN_NAME} directory
1012
$ PLUGIN_NAME=request-block make build
1113
```
1214

0 commit comments

Comments
 (0)