This is an automated email from the ASF dual-hosted git repository.
juzhiyuan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/apisix-docker.git
The following commit(s) were added to refs/heads/master by this push:
new 7209ac5 fix: Character escape (#114)
7209ac5 is described below
commit 7209ac500acf0c53503523575ea762728071f110
Author: kv <[email protected]>
AuthorDate: Wed Jan 6 10:40:54 2021 +0800
fix: Character escape (#114)
---
all-in-one/apisix-dashboard/Dockerfile | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/all-in-one/apisix-dashboard/Dockerfile
b/all-in-one/apisix-dashboard/Dockerfile
index 3ea60da..13a3927 100644
--- a/all-in-one/apisix-dashboard/Dockerfile
+++ b/all-in-one/apisix-dashboard/Dockerfile
@@ -43,6 +43,7 @@ RUN set -x \
FROM golang:1.14 as api-builder
ARG ENABLE_PROXY=false
+ARG APISIX_DASHBOARD_VERSION=master
WORKDIR /usr/local/apisix-dashboard
@@ -62,7 +63,7 @@ RUN wget
https://github.com/api7/dag-to-lua/archive/v1.1.tar.gz -O /tmp/v1.1.tar
RUN if [ "$ENABLE_PROXY" = "true" ] ; then go env -w
GOPROXY=https://goproxy.io,direct ; fi
RUN go env -w GO111MODULE=on \
- && CGO_ENABLED=0 go build -o ../output/manager-api .
+ && if [ "$APISIX_DASHBOARD_VERSION" = "master" ] || [
"$APISIX_DASHBOARD_VERSION" \> "v2.2" ]; then CGO_ENABLED=0 go build -o
../output/manager-api ./cmd/manager; else CGO_ENABLED=0 go build -o
../output/manager-api . ; fi;
FROM node:14-alpine as fe-builder
