Skip to content

Commit 4308d1b

Browse files
committed
fix: remove openldap dependencies from apisix
1 parent 4f9301c commit 4308d1b

File tree

7 files changed

+7
-28
lines changed

7 files changed

+7
-28
lines changed

.github/workflows/fuzzing-ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
sudo apt-get -y install software-properties-common
5151
sudo add-apt-repository -y "deb http://openresty.org/package/ubuntu $(lsb_release -sc) main"
5252
sudo apt-get update
53-
sudo apt-get install -y git openresty curl openresty-openssl111-dev unzip make gcc libldap2-dev
53+
sudo apt-get install -y git openresty curl openresty-openssl111-dev unzip make gcc
5454
./utils/linux-install-luarocks.sh
5555
5656
make deps

ci/centos7-ci.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ install_dependencies() {
2323

2424
# install build & runtime deps
2525
yum install -y wget tar gcc automake autoconf libtool make unzip \
26-
git sudo openldap-devel which ca-certificates openssl-devel \
26+
git sudo which ca-certificates openssl-devel \
2727
epel-release
2828

2929
# install newer curl

ci/common.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,5 +146,5 @@ GRPC_SERVER_EXAMPLE_VER=20210819
146146

147147
linux_get_dependencies () {
148148
apt update
149-
apt install -y cpanminus build-essential libncurses5-dev libreadline-dev libssl-dev perl libpcre3 libpcre3-dev libldap2-dev
149+
apt install -y cpanminus build-essential libncurses5-dev libreadline-dev libssl-dev perl libpcre3 libpcre3-dev
150150
}

ci/performance_test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ set -ex
2222

2323
install_dependencies() {
2424
apt-get -y update --fix-missing
25-
apt-get -y install lua5.1 liblua5.1-0-dev libldap2-dev
25+
apt-get -y install lua5.1 liblua5.1-0-dev
2626
export_or_prefix
2727
export OPENRESTY_VERSION=source
2828
./ci/linux-install-openresty.sh

ci/pod/docker-compose.plugin.yml

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -123,26 +123,6 @@ services:
123123
networks:
124124
skywalk_net:
125125

126-
127-
## OpenLDAP
128-
openldap:
129-
image: bitnami/openldap:2.5.8
130-
environment:
131-
- LDAP_ADMIN_USERNAME=amdin
132-
- LDAP_ADMIN_PASSWORD=adminpassword
133-
- LDAP_USERS=user01,user02
134-
- LDAP_PASSWORDS=password1,password2
135-
- LDAP_ENABLE_TLS=yes
136-
- LDAP_TLS_CERT_FILE=/certs/localhost_slapd_cert.pem
137-
- LDAP_TLS_KEY_FILE=/certs/localhost_slapd_key.pem
138-
- LDAP_TLS_CA_FILE=/certs/apisix.crt
139-
ports:
140-
- "1389:1389"
141-
- "1636:1636"
142-
volumes:
143-
- ./t/certs:/certs
144-
145-
146126
## Grafana Loki
147127
loki:
148128
image: grafana/loki:2.8.0

t/chaos/utils/Dockerfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ RUN set -x \
3131
pkgconfig \
3232
cmake \
3333
git \
34-
openldap-dev \
3534
pcre-dev \
3635
sudo \
3736
&& cd apisix \

utils/install-dependencies.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ function install_dependencies_with_aur() {
4646
function install_dependencies_with_yum() {
4747
sudo yum install -y yum-utils
4848

49-
local common_dep="curl wget git gcc openresty-openssl111-devel unzip pcre pcre-devel openldap-devel"
49+
local common_dep="curl wget git gcc openresty-openssl111-devel unzip pcre pcre-devel"
5050
if [ "${1}" == "centos" ]; then
5151
# add APISIX source
5252
local apisix_pkg=apache-apisix-repo-1.0-1.noarch
@@ -84,13 +84,13 @@ function install_dependencies_with_apt() {
8484
sudo apt-get update
8585

8686
# install OpenResty and some compilation tools
87-
sudo apt-get install -y git openresty curl openresty-openssl111-dev make gcc libpcre3 libpcre3-dev libldap2-dev unzip
87+
sudo apt-get install -y git openresty curl openresty-openssl111-dev make gcc libpcre3 libpcre3-dev unzip
8888
}
8989

9090
# Install dependencies on mac osx
9191
function install_dependencies_on_mac_osx() {
9292
# install OpenResty, etcd and some compilation tools
93-
brew install openresty/brew/openresty luarocks [email protected] wget curl git pcre openldap
93+
brew install openresty/brew/openresty luarocks [email protected] wget curl git pcre
9494
}
9595

9696
# Identify the different distributions and call the corresponding function

0 commit comments

Comments
 (0)