[apisix-docker] branch master updated: chore: dashboard release 2.7 (#186)

[ch...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

chenjunxu 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 00c23cf  chore: dashboard release 2.7 (#186)
00c23cf is described below

commit 00c23cf6c96f910567a076f072602dad0c92033d
Author: nic-chen <33...@users.noreply.github.com>
AuthorDate: Wed Jun 16 20:37:41 2021 +0800

    chore: dashboard release 2.7 (#186)
---
 .github/workflows/dashboard-docker-test.yaml |  2 +-
 Makefile                                     |  2 +-
 all-in-one/apisix-dashboard/Dockerfile       | 13 ++-----------
 dashboard/Dockerfile                         |  2 +-
 4 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/dashboard-docker-test.yaml b/.github/workflows/dashboard-docker-test.yaml
index 8e7c97f..30bf838 100644
--- a/.github/workflows/dashboard-docker-test.yaml
+++ b/.github/workflows/dashboard-docker-test.yaml
@@ -13,7 +13,7 @@ jobs:
     name: build dashboard & test
     runs-on: ubuntu-latest
     env:
-      APISIX_DASHBOARD_TAG: 2.6
+      APISIX_DASHBOARD_TAG: 2.7
     steps:
       - name: Checkout
         uses: actions/checkout@v2
diff --git a/Makefile b/Makefile
index e5729f9..d3e9cb7 100644
--- a/Makefile
+++ b/Makefile
@@ -20,7 +20,7 @@ APISIX_VERSION ?= 2.6
 IMAGE_NAME = apache/apisix
 IMAGE_TAR_NAME = apache_apisix
 
-APISIX_DASHBOARD_VERSION ?= 2.6
+APISIX_DASHBOARD_VERSION ?= 2.7
 APISIX_DASHBOARD_IMAGE_NAME = apache/apisix-dashboard
 APISIX_DASHBOARD_IMAGE_TAR_NAME = apache_apisix_dashboard
 
diff --git a/all-in-one/apisix-dashboard/Dockerfile b/all-in-one/apisix-dashboard/Dockerfile
index de9b9cd..e65b9fc 100644
--- a/all-in-one/apisix-dashboard/Dockerfile
+++ b/all-in-one/apisix-dashboard/Dockerfile
@@ -61,18 +61,9 @@ WORKDIR /usr/local/apisix-dashboard
 
 COPY --from=pre-build /usr/local/apisix-dashboard .
 
-WORKDIR /usr/local/apisix-dashboard/api
-
-RUN mkdir -p ../output/conf \
-    && cp ./conf/*.json ../output/conf \
-    && wget https://github.com/api7/dag-to-lua/archive/v1.1.tar.gz -O /tmp/v1.1.tar.gz \
-    && mkdir /tmp/dag-to-lua \
-    && tar -xvf /tmp/v1.1.tar.gz -C /tmp/dag-to-lua --strip 1 \
-    && mkdir -p ../output/dag-to-lua \
-    && mv /tmp/dag-to-lua/lib/* ../output/dag-to-lua/ \
-    && if [ "$ENABLE_PROXY" = "true" ] ; then go env -w GOPROXY=https://goproxy.io,direct ; fi \
+RUN if [ "$ENABLE_PROXY" = "true" ] ; then go env -w GOPROXY=https://goproxy.io,direct ; fi \
     && go env -w GO111MODULE=on \
-    && 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;
+    && CGO_ENABLED=0 ./api/build.sh
 
 # Build APISIX Dashboard - 3. build dashboard web-UI from source code
 FROM node:14-alpine as fe-builder
diff --git a/dashboard/Dockerfile b/dashboard/Dockerfile
index 372685d..4b4af07 100644
--- a/dashboard/Dockerfile
+++ b/dashboard/Dockerfile
@@ -16,7 +16,7 @@
 #
 FROM alpine:latest as pre-build
 
-ARG APISIX_DASHBOARD_VERSION=release/2.6
+ARG APISIX_DASHBOARD_VERSION=release/2.7
 
 RUN set -x \
     && apk add --no-cache --virtual .builddeps git \