jiazhizhong/higress
1
0
Fork 0
mirror of https://github.com/alibaba/higress.git synced 2026-05-26 13:47:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore: load EXTRA_TAGS from plugin .buildrc file to avoid build issue. (#1852)

Browse Source
This commit is contained in:
Jacky Wu
2025-03-05 12:15:37 +08:00
committed by GitHub
parent 0905cd0fc0
commit d721c235cb
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/wasm-go/Makefile
View File

@@ -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}) IMAGE_TAG = $(if $(strip $(PLUGIN_VERSION)),${PLUGIN_VERSION},${BUILD_TIME}-${COMMIT_ID})
IMG ?= ${REGISTRY}${PLUGIN_NAME}:${IMAGE_TAG} IMG ?= ${REGISTRY}${PLUGIN_NAME}:${IMAGE_TAG}
GOPROXY := $(shell go env GOPROXY) GOPROXY := $(shell go env GOPROXY)
EXTRA_TAGS ?= EXTRA_TAGS := $(shell [ -f extensions/${PLUGIN_NAME}/.buildrc ] && . extensions/${PLUGIN_NAME}/.buildrc && echo $$EXTRA_TAGS || echo "")
.DEFAULT: .DEFAULT:
build: build:
DOCKER_BUILDKIT=1 docker build --build-arg PLUGIN_NAME=${PLUGIN_NAME} \ DOCKER_BUILDKIT=1 docker build --build-arg PLUGIN_NAME=${PLUGIN_NAME} \
--build-arg BUILDER=${BUILDER} \ --build-arg BUILDER=${BUILDER} \
--build-arg GOPROXY=$(GOPROXY) \ --build-arg GOPROXY=$(GOPROXY) \
--build-arg EXTRA_TAGS=$(EXTRA_TAGS) \ --build-arg EXTRA_TAGS=${EXTRA_TAGS} \
-t ${IMG} \ -t ${IMG} \
--output extensions/${PLUGIN_NAME} \ --output extensions/${PLUGIN_NAME} \
. .
@@ -30,7 +30,7 @@ build-image:
DOCKER_BUILDKIT=1 docker build --build-arg PLUGIN_NAME=${PLUGIN_NAME} \ DOCKER_BUILDKIT=1 docker build --build-arg PLUGIN_NAME=${PLUGIN_NAME} \
--build-arg BUILDER=${BUILDER} \ --build-arg BUILDER=${BUILDER} \
--build-arg GOPROXY=$(GOPROXY) \ --build-arg GOPROXY=$(GOPROXY) \
--build-arg EXTRA_TAGS=$(EXTRA_TAGS) \ --build-arg EXTRA_TAGS=${EXTRA_TAGS} \
-t ${IMG} \ -t ${IMG} \
. .
@echo "" @echo ""

2
plugins/wasm-go/README.md
View File

@@ -9,6 +9,8 @@
使用以下命令可以快速构建 wasm-go 插件: 使用以下命令可以快速构建 wasm-go 插件:
```bash ```bash
# NOTE: 如果你想在构建插件的时候设置额外的构建参数 EXTRA_TAGS
# 请更新 extensions/${PLUGIN_NAME} 插件目录对应的 .buildrc 文件
$ PLUGIN_NAME=request-block make build $ PLUGIN_NAME=request-block make build
``` ```

2
plugins/wasm-go/README_EN.md
View File

@@ -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: The wasm-go plugin can be built quickly with the following command:
```bash ```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 $ PLUGIN_NAME=request-block make build
``` ```