[apisix-docker] branch master updated: fix: pcre will based on apisix-base's version (#287)

[bzp2010]

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

bzp2010 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 9ba22a2  fix: pcre will based on apisix-base's version (#287)
9ba22a2 is described below

commit 9ba22a23f6cd2d881be0555043e941197580f02f
Author: Zeping Bai <bzp2...@apache.org>
AuthorDate: Tue Feb 22 09:28:25 2022 +0800

    fix: pcre will based on apisix-base's version (#287)
---
 alpine/Dockerfile | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/alpine/Dockerfile b/alpine/Dockerfile
index c968840..628fcda 100644
--- a/alpine/Dockerfile
+++ b/alpine/Dockerfile
@@ -38,10 +38,8 @@ RUN set -x \
         curl \
         openssl \
         git \
-        pcre \
-        pcre-dev \
         openldap-dev \
-    && luarocks install 
https://github.com/apache/apisix/raw/master/rockspec/apisix-${APISIX_VERSION}-0.rockspec
 --tree=/usr/local/apisix/deps \
+    && luarocks install 
https://github.com/apache/apisix/raw/master/rockspec/apisix-${APISIX_VERSION}-0.rockspec
 --tree=/usr/local/apisix/deps PCRE_DIR=/usr/local/openresty/pcre \
     && cp -v 
/usr/local/apisix/deps/lib/luarocks/rocks-5.1/apisix/${APISIX_VERSION}-0/bin/apisix
 /usr/bin/ \
     && (function ver_lt { [ "$1" = "$2" ] && return 1 || [ "$1" = "`echo -e 
"$1\n$2" | sort -V | head -n1`" ]; };  if [ "$APISIX_VERSION" = "master" ] || 
ver_lt 2.2.0 $APISIX_VERSION; then echo 'use shell ';else bin='#! 
/usr/local/openresty/luajit/bin/luajit\npackage.path = 
"/usr/local/apisix/?.lua;" .. package.path'; sed -i "1s@.*@$bin@" 
/usr/bin/apisix ; fi;) \
     && mv /usr/local/apisix/deps/share/lua/5.1/apisix /usr/local/apisix \