chore: clean up useless dependencies (#361)

Author: AlinsRan

.circleci/config.yml

@@ -26,12 +26,6 @@ jobs:
           name: run ubi8 docker and mapping apisix-runtime rpm into container
           command: |
             docker run -itd -v /home/runner/work/apisix-build-tools/apisix-build-tools/output:/output --name ubiInstance --net="host" registry.access.redhat.com/ubi8/ubi:8.6 /bin/bash
-      - run:
-          name: install dependencies in container
-          command: |
-            docker exec ubiInstance bash -c "dnf install -y yum-utils"
-            docker exec ubiInstance bash -c "yum-config-manager --add-repo https://openresty.org/package/centos/openresty.repo"
-            docker exec ubiInstance bash -c "yum -y install openresty-openssl111 openresty-pcre openresty-zlib"
       - run:
           name: install rpm in container
           command: |

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

@@ -35,16 +35,6 @@ jobs:
         run: |
           docker run -itd -v /home/runner/work/apisix-build-tools/apisix-build-tools/output:/output --name ubuntu20.04Instance --net="host" docker.io/ubuntu:20.04 /bin/bash
 
-      - name: install dependencies in container
-        run: |
-          docker exec ubuntu20.04Instance bash -c "DEBIAN_FRONTEND=noninteractive apt-get update"
-          docker exec ubuntu20.04Instance bash -c "DEBIAN_FRONTEND=noninteractive apt-get install -y libreadline-dev lsb-release libssl-dev perl build-essential"
-          docker exec ubuntu20.04Instance bash -c "DEBIAN_FRONTEND=noninteractive apt-get -y install --no-install-recommends wget gnupg ca-certificates"
-          docker exec ubuntu20.04Instance bash -c "wget -O - https://openresty.org/package/pubkey.gpg | apt-key add -"
-          docker exec ubuntu20.04Instance bash -c 'echo "deb http://openresty.org/package/ubuntu $(lsb_release -sc) main" | tee /etc/apt/sources.list.d/openresty.list'
-          docker exec ubuntu20.04Instance bash -c "DEBIAN_FRONTEND=noninteractive apt-get update"
-          docker exec ubuntu20.04Instance bash -c "DEBIAN_FRONTEND=noninteractive apt-get -y install openresty-pcre openresty-zlib"
-
       - name: install deb in container
         run: |
           docker exec ubuntu20.04Instance bash -c "dpkg -i /output/apisix-runtime_${BUILD_APISIX_RUNTIME_VERSION}-0~ubuntu20.04_amd64.deb"

.github/workflows/package-apisix-runtime-rpm-el7.yml

@@ -35,11 +35,6 @@ jobs:
         run: |
           docker run -itd -v /home/runner/work/apisix-build-tools/apisix-build-tools/output:/output --name centos7Instance --net="host" docker.io/centos:7 /bin/bash
 
-      - name: install dependencies in container
-        run: |
-          docker exec centos7Instance bash -c "yum-config-manager --add-repo https://openresty.org/package/centos/openresty.repo"
-          docker exec centos7Instance bash -c "yum -y install openresty-pcre openresty-zlib"
-
       - name: install rpm in container
         run: |
           docker exec centos7Instance bash -c "yum -y localinstall /output/apisix-runtime-${BUILD_APISIX_RUNTIME_VERSION}-0.el7.x86_64.rpm"

.github/workflows/package-apisix-runtime-rpm-el8.yml

@@ -42,10 +42,7 @@ jobs:
           docker exec centos8Instance bash -c "dnf install -y centos-release-stream"
           docker exec centos8Instance bash -c "dnf swap -y centos-{linux,stream}-repos"
           docker exec centos8Instance bash -c "dnf distro-sync -y"
-
           docker exec centos8Instance bash -c "dnf install -y yum-utils"
-          docker exec centos8Instance bash -c "yum-config-manager --add-repo https://openresty.org/package/centos/openresty.repo"
-          docker exec centos8Instance bash -c "yum -y install openresty-pcre openresty-zlib"
 
       - name: install rpm in container
         run: |

.github/workflows/package-apisix-runtime-rpm-ubi.yml

@@ -33,12 +33,6 @@ jobs:
         run: |
           docker run -itd -v /home/runner/work/apisix-build-tools/apisix-build-tools/output:/output --name ubiInstance --net="host" registry.access.redhat.com/ubi8/ubi:8.6 /bin/bash
 
-      - name: install dependencies in container
-        run: |
-          docker exec ubiInstance bash -c "dnf install -y yum-utils"
-          docker exec ubiInstance bash -c "yum-config-manager --add-repo https://openresty.org/package/centos/openresty.repo"
-          docker exec ubiInstance bash -c "yum -y install openresty-pcre openresty-zlib"
-
       - name: install rpm in container
         run: |
           docker exec ubiInstance bash -c "ls -la /output"

package-apisix-runtime.sh

@@ -14,24 +14,12 @@ fi
 
 ARCH=${ARCH:-`(uname -m | tr '[:upper:]' '[:lower:]')`}
 
-openresty_zlib_version="1.2.12-1"
-openresty_pcre_version="8.45-1"
-if [ "$PACKAGE_TYPE" == "deb" ]; then
-    pkg_suffix="${codename}1"
-    openresty_zlib_version="$openresty_zlib_version~$pkg_suffix"
-    openresty_pcre_version="$openresty_pcre_version~$pkg_suffix"
-fi
-
 fpm -f -s dir -t "$PACKAGE_TYPE" \
     --"$PACKAGE_TYPE"-dist "$dist" \
     -n "$artifact" \
     -a "$(uname -i)" \
     -v "$RUNTIME_VERSION" \
     --iteration "$ITERATION" \
-    -x openresty/zlib \
-    -x openresty/pcre \
-    -d "openresty-zlib >= $openresty_zlib_version" \
-    -d "openresty-pcre >= $openresty_pcre_version" \
     --post-install post-install-apisix-runtime.sh \
     --description "APISIX's OpenResty distribution." \
     --license "ASL 2.0" \

utils/install-common.sh

@@ -35,20 +35,13 @@ install_dependencies_deb() {
 }
 
 install_openresty_deb() {
-    # install openresty and openssl111
-    arch_path=""
-    if [[ $ARCH == "arm64" ]] || [[ $ARCH == "aarch64" ]]; then
-        arch_path="arm64/"
-    fi
     DEBIAN_FRONTEND=noninteractive apt-get update
-    DEBIAN_FRONTEND=noninteractive apt-get install -y libreadline-dev lsb-release libpcre3 libpcre3-dev libldap2-dev libssl-dev perl build-essential
+    DEBIAN_FRONTEND=noninteractive apt-get install -y libreadline-dev lsb-release libpcre3 libpcre3-dev libldap2-dev perl build-essential
     DEBIAN_FRONTEND=noninteractive apt-get -y install --no-install-recommends wget gnupg ca-certificates
 }
 
 install_openresty_rpm() {
-    yum-config-manager --add-repo https://openresty.org/package/centos/openresty.repo
-    yum-config-manager --add-repo https://repos.apiseven.com/packages/centos/apache-apisix.repo
-    yum install -y openresty-openssl111-devel pcre pcre-devel openldap-devel
+    yum install -y pcre pcre-devel openldap-devel
 }
 
 install_luarocks() {