From cf69234effd39eacbd45152fefe2cd169ed0a127 Mon Sep 17 00:00:00 2001 From: Ffyyt <93867904+Fkbqf@users.noreply.github.com> Date: Mon, 8 May 2023 10:46:30 +0800 Subject: [PATCH] Add environment variable goproxy (#313) --- plugins/wasm-go/Dockerfile | 4 ++++ plugins/wasm-go/Makefile | 2 ++ 2 files changed, 6 insertions(+) diff --git a/plugins/wasm-go/Dockerfile b/plugins/wasm-go/Dockerfile index a309f63d9..9779e81a3 100644 --- a/plugins/wasm-go/Dockerfile +++ b/plugins/wasm-go/Dockerfile @@ -1,6 +1,10 @@ ARG BUILDER=higress-registry.cn-hangzhou.cr.aliyuncs.com/plugins/wasm-go-builder:go1.19-tinygo0.27.0-oras1.0.0 FROM $BUILDER as builder + +ARG GOPROXY +ENV GOPROXY=${GOPROXY} + ARG PLUGIN_NAME=hello-world WORKDIR /workspace diff --git a/plugins/wasm-go/Makefile b/plugins/wasm-go/Makefile index 9d5c178f4..6b7b59ab7 100644 --- a/plugins/wasm-go/Makefile +++ b/plugins/wasm-go/Makefile @@ -7,11 +7,13 @@ BUILDER ?= ${REGISTRY}wasm-go-builder:go${GO_VERSION}-tinygo${TINYGO_VERSION}-or BUILD_TIME := $(shell date "+%Y%m%d-%H%M%S") COMMIT_ID := $(shell git rev-parse --short HEAD 2>/dev/null) IMG ?= ${REGISTRY}${PLUGIN_NAME}:${BUILD_TIME}-${COMMIT_ID} +GOPROXY := $(shell go env GOPROXY) .DEFAULT: build: DOCKER_BUILDKIT=1 docker build --build-arg PLUGIN_NAME=${PLUGIN_NAME} \ --build-arg BUILDER=${BUILDER} \ + --build-arg GOPROXY=$(GOPROXY) \ -t ${IMG} \ --output extensions/${PLUGIN_NAME} \ .