fix: require ldap as runtime dependency (#161)

Author: spacewander

.github/workflows/package-apisix-deb-ubuntu20.04.yml

@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 60
     env:
-      PACKAGE_APISIX_VERSION: 2.9
+      PACKAGE_APISIX_VERSION: 2.12.0
 
     steps:
       - uses: actions/checkout@v2
@@ -30,8 +30,6 @@ jobs:
 
       - name: run apisix packaging
         run: |
-          make package type=deb app=apisix version=2.3 checkout=2.3 image_base=ubuntu image_tag=20.04
-          make package type=deb app=apisix version=2.2 checkout=v2.2 image_base=ubuntu image_tag=20.04
           make package type=deb app=apisix version=master checkout=master image_base=ubuntu image_tag=20.04
           make package type=deb app=apisix version=${PACKAGE_APISIX_VERSION} checkout=${PACKAGE_APISIX_VERSION}
 

package-apisix.sh

@@ -5,6 +5,12 @@ mkdir /output
 dist=$(cat /tmp/dist)
 
 # Determine the dependencies
+dep_ldap="openldap-devel"
+if [ "$PACKAGE_TYPE" == "deb" ]
+then
+    # the pkg contains the so library could be libldap-2.5 or libldap-2.4-2
+	dep_ldap="libldap2-dev"
+fi
 dep_pcre="pcre"
 if [ "$PACKAGE_TYPE" == "deb" ]
 then
@@ -43,6 +49,7 @@ fpm -f -s dir -t "$PACKAGE_TYPE" \
 	-v "$PACKAGE_VERSION" \
 	--iteration "$ITERATION" \
 	-d "$OPENRESTY >= $or_version" \
+	-d "$dep_ldap" \
 	-d "$dep_pcre" \
 	-d "$dep_which" \
 	--description 'Apache APISIX is a distributed gateway for APIs and Microservices, focused on high performance and reliability.' \

test/apisix/Dockerfile.test.apisix.deb.ubuntu20.04

@@ -21,6 +21,7 @@ RUN /install-common.sh install_etcd
 
 # install apisix
 RUN set -x \
+    && apt install -y libldap2-dev \
     && dpkg -i /apisix_${APISIX_VERSION}-0~${IMAGE_BASE}${IMAGE_TAG}_amd64.deb
 
 # start etcd and test