From dcb7977338a2af58b416000c261cce8781d0e12b Mon Sep 17 00:00:00 2001 From: "Zaiming (Stone) Shi" Date: Fri, 14 Jan 2022 11:56:10 +0100 Subject: [PATCH] feat: show config doc in dashboard --- Makefile | 2 +- build | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index fcebe29ef..2364b596d 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,7 @@ export EMQX_DEFAULT_BUILDER = ghcr.io/emqx/emqx-builder/4.4-2:23.3.4.9-3-alpine3 export EMQX_DEFAULT_RUNNER = alpine:3.14 export OTP_VSN ?= $(shell $(CURDIR)/scripts/get-otp-vsn.sh) export PKG_VSN ?= $(shell $(CURDIR)/pkg-vsn.sh) -export EMQX_DASHBOARD_VERSION ?= v0.17.0 +export EMQX_DASHBOARD_VERSION ?= v0.18.0 export DOCKERFILE := deploy/docker/Dockerfile export DOCKERFILE_TESTING := deploy/docker/Dockerfile.testing ifeq ($(OS),Windows_NT) diff --git a/build b/build index a0c7b4f85..b6bd62cbc 100755 --- a/build +++ b/build @@ -64,7 +64,7 @@ make_doc() { libs_dir2="$("$FIND" "_build/$PROFILE/lib/" -maxdepth 2 -name ebin -type d)" # shellcheck disable=SC2086 erl -noshell -pa $libs_dir1 $libs_dir2 -eval \ - "F = filename:join(['_build', '${PROFILE}', lib, emqx_dashboard, priv, 'config.md']), \ + "F = filename:join(['_build', '${PROFILE}', lib, emqx_dashboard, priv, www, static, 'config.md']), \ io:format(\"===< Generating: ~s~n\", [F]), ok = emqx_conf:gen_doc(F), \ halt(0)."