Is there a commit link? Thanks, Ming Wen, Apache APISIX Twitter: _WenMing
Lang Wang <[email protected]> 于2019年11月11日周一 下午4:22写道： > *git diff doc/install-dependencies.md* > > ++<<<<<<< HEAD > +Debian 9 && 10 > +======== > ++======= > + Debian 9 & 10 > + ============= > ++>>>>>>> upstream/master > > ```shell > # optional > @@@ -56,6 -90,7 +95,10 @@@ sed -i 's|^deb http://deb.debian.org/de > sed -i 's|^deb http://security.debian.org/debian-security|deb > http://mirrors.huaweicloud.com/debian-security|g' /etc/apt/sources.list > apt update > apt install wget gnupg -y > ++<<<<<<< HEAD > ++======= > + > ++>>>>>>> upstream/master > # add openresty source > wget -qO - https://openresty.org/package/pubkey.gpg | sudo apt-key add - > sudo apt-get -y install software-properties-common > @@@ -69,23 -104,7 +112,27 @@@ tar -xvf etcd-v3.3.13-linux-amd64.tar.g > sudo cp -a etcd etcdctl /usr/bin/ > > # install openresty and some compilation tools > ++<<<<<<< HEAD > + > +sudo apt-get install -y git openresty cmake curl \ > + check libpcre3 libpcre3-dev libjemalloc-dev \ > + build-essential libtool automake autoconf pkg-config > + > +# install luarocks > +# (the version must > 3.0, --lua-dir was first introduced in the luarocks > 3.0 release) > + > +wget https://luarocks.org/releases/luarocks-3.1.3.tar.gz > +tar zxpf luarocks-3.1.3.tar.gz > +cd luarocks-3.1.3 > + > +* Run `./configure --with-lua=/usr/local/openresty/luajit/`. (This will > attempt to detect your installation of Lua. If you get any error messages, > see the section "Customizing your settings", below.) > +* Run `make build`. > +* As superuser, run `make install`. > +ln -s /usr/local/bin/luarocks /usr/bin/luarocks > + > ++======= > + sudo apt-get install -y git openresty curl luarocks make > ++>>>>>>> upstream/master >
