luarocks: support to install apisix without dashboard. (#686)

* luarocks: support to install apisix without dashboard.
apache · Oct 14, 2019 · d4ff56e · d4ff56e
1 parent 13f9b11
commit d4ff56e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/.travis/linux_runner.sh b/.travis/linux_runner.sh
@@ -17,7 +17,7 @@ export_or_prefix() {
 }
 
 create_lua_deps() {
-    sudo luarocks make --lua-dir=${OPENRESTY_PREFIX}/luajit rockspec/apisix-dev-1.0-0.rockspec --tree=deps --only-deps --local
+    WITHOUT_DASHBOARD=1 sudo luarocks make --lua-dir=${OPENRESTY_PREFIX}/luajit rockspec/apisix-dev-1.0-0.rockspec --tree=deps --only-deps --local
     sudo luarocks install --lua-dir=${OPENRESTY_PREFIX}/luajit lua-resty-libr3 --tree=deps --local
     echo "Create lua deps cache"
     sudo rm -rf build-cache/deps

diff --git a/Makefile b/Makefile
@@ -28,7 +28,7 @@ dev:
 ifeq ($(UNAME),Darwin)
 	luarocks install --lua-dir=$(LUA_JIT_DIR) rockspec/apisix-dev-1.0-0.rockspec --tree=deps --only-deps --local
 else ifneq ($(LUAROCKS_VER),'luarocks 3.')
-	luarocks install rockspec/apisix-dev-1.0-0.rockspec --tree=deps --only-deps --local
+	WITHOUT_DASHBOARD=1 luarocks install rockspec/apisix-dev-1.0-0.rockspec --tree=deps --only-deps --local
 else
 	luarocks install --lua-dir=/usr/local/openresty/luajit rockspec/apisix-dev-1.0-0.rockspec --tree=deps --only-deps --local
 endif
@@ -99,13 +99,15 @@ reload:
 ### install:      Install the apisix
 .PHONY: install
 install:
+ifneq ($(WITHOUT_DASHBOARD),1)
 	$(INSTALL) -d /usr/local/apisix/dashboard
 	cd `mktemp -d /tmp/apisix.XXXXXX` && \
 		git clone https://github.com/iresty/apisix.git && \
 		cd apisix && \
 		git submodule update --init --recursive && \
 		cp -r dashboard/* /usr/local/apisix/dashboard
 	chmod -R 755 /usr/local/apisix/dashboard
+endif
 
 	$(INSTALL) -d /usr/local/apisix/logs/
 	$(INSTALL) -d /usr/local/apisix/conf/cert