Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

luarocks: support to install apisix without dashboard. #686

Merged
merged 5 commits into from
Oct 14, 2019
Merged

luarocks: support to install apisix without dashboard. #686

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
391c179
luarocks: support to install apisix without dashboard.
membphis Oct 14, 2019
04e151f
change: only for test.
membphis Oct 14, 2019
2c737df
change: removed debug code.
membphis Oct 14, 2019
9a9ea35
makefile: reverted some code.
membphis Oct 14, 2019
bdda88e
change: name style.
membphis Oct 14, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis/linux_runner.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down