This is an automated email from the ASF dual-hosted git repository.
spacewander 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 662a15e feat: Add openldap-devel dependency for the support of the
plugin ldap-auth (#222)
662a15e is described below
commit 662a15e50629b749b4d48fc8dbee237b3f29c8ec
Author: jpgouin <[email protected]>
AuthorDate: Mon Oct 11 09:34:41 2021 +0200
feat: Add openldap-devel dependency for the support of the plugin ldap-auth
(#222)
---
all-in-one/apisix/Dockerfile | 3 ++-
alpine-dev/Dockerfile | 3 ++-
alpine-local/Dockerfile | 3 ++-
alpine/Dockerfile | 3 ++-
centos/Dockerfile | 2 +-
5 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/all-in-one/apisix/Dockerfile b/all-in-one/apisix/Dockerfile
index 6064ba6..cc8939b 100644
--- a/all-in-one/apisix/Dockerfile
+++ b/all-in-one/apisix/Dockerfile
@@ -21,6 +21,7 @@ RUN set -x \
git \
pcre \
pcre-dev \
+ openldap-dev \
&& mkdir ~/.luarocks \
&& luarocks config variables.OPENSSL_LIBDIR
/usr/local/openresty/openssl/lib \
&& luarocks config variables.OPENSSL_INCDIR
/usr/local/openresty/openssl/include \
@@ -49,7 +50,7 @@ ARG ENABLE_PROXY
# add runtime for Apache APISIX
RUN set -x \
&& (test "${ENABLE_PROXY}" != "true" || /bin/sed -i
's,http://dl-cdn.alpinelinux.org,https://mirrors.aliyun.com,g'
/etc/apk/repositories) \
- && apk add --no-cache bash libstdc++ curl
+ && apk add --no-cache bash libstdc++ curl openldap-dev
WORKDIR /usr/local/apisix
diff --git a/alpine-dev/Dockerfile b/alpine-dev/Dockerfile
index 30414fa..f4dd1a2 100644
--- a/alpine-dev/Dockerfile
+++ b/alpine-dev/Dockerfile
@@ -14,6 +14,7 @@ RUN set -x \
git \
pcre \
pcre-dev \
+ openldap-dev \
&& mkdir ~/.luarocks \
&& luarocks config variables.OPENSSL_LIBDIR
/usr/local/openresty/openssl/lib \
&& luarocks config variables.OPENSSL_INCDIR
/usr/local/openresty/openssl/include \
@@ -28,7 +29,7 @@ ARG ENABLE_PROXY
# add runtime for Apache APISIX
RUN set -x \
&& (test "${ENABLE_PROXY}" != "true" || /bin/sed -i
's,http://dl-cdn.alpinelinux.org,https://mirrors.aliyun.com,g'
/etc/apk/repositories) \
- && apk add --no-cache bash libstdc++ curl tzdata
+ && apk add --no-cache bash libstdc++ curl tzdata openldap-dev
WORKDIR /usr/local/apisix
diff --git a/alpine-local/Dockerfile b/alpine-local/Dockerfile
index 2bd0048..4aee426 100644
--- a/alpine-local/Dockerfile
+++ b/alpine-local/Dockerfile
@@ -16,6 +16,7 @@ RUN set -x \
git \
pcre \
pcre-dev \
+ openldap-dev \
&& cd apisix \
&& make deps \
&& cp -v bin/apisix /usr/bin/ \
@@ -28,7 +29,7 @@ ARG ENABLE_PROXY
# add runtime for Apache APISIX
RUN set -x \
&& (test "${ENABLE_PROXY}" != "true" || /bin/sed -i
's,http://dl-cdn.alpinelinux.org,https://mirrors.aliyun.com,g'
/etc/apk/repositories) \
- && apk add --no-cache bash libstdc++ curl tzdata
+ && apk add --no-cache bash libstdc++ curl tzdata openldap-dev
WORKDIR /usr/local/apisix
diff --git a/alpine/Dockerfile b/alpine/Dockerfile
index a41419f..9c52e8d 100644
--- a/alpine/Dockerfile
+++ b/alpine/Dockerfile
@@ -17,6 +17,7 @@ RUN set -x \
git \
pcre \
pcre-dev \
+ openldap-dev \
&& mkdir ~/.luarocks \
&& luarocks config variables.OPENSSL_LIBDIR
/usr/local/openresty/openssl/lib \
&& luarocks config variables.OPENSSL_INCDIR
/usr/local/openresty/openssl/include \
@@ -32,7 +33,7 @@ ARG ENABLE_PROXY
# add runtime for Apache APISIX
RUN set -x \
&& (test "${ENABLE_PROXY}" != "true" || /bin/sed -i
's,http://dl-cdn.alpinelinux.org,https://mirrors.aliyun.com,g'
/etc/apk/repositories) \
- && apk add --no-cache bash libstdc++ curl tzdata
+ && apk add --no-cache bash libstdc++ curl tzdata openldap-dev
WORKDIR /usr/local/apisix
diff --git a/centos/Dockerfile b/centos/Dockerfile
index e26f8b7..63b6b31 100644
--- a/centos/Dockerfile
+++ b/centos/Dockerfile
@@ -5,7 +5,7 @@ LABEL apisix_version="${APISIX_VERSION}"
RUN yum -y install yum-utils\
&& yum-config-manager --add-repo
https://openresty.org/package/centos/openresty.repo \
- && yum install -y pcre openresty which tzdata \
+ && yum install -y pcre openresty which tzdata openldap-devel \
&& yum install -y
https://github.com/apache/apisix/releases/download/$APISIX_VERSION/apisix-$APISIX_VERSION-0.el7.x86_64.rpm
\
&& yum clean all \
&& sed -i 's/PASS_MAX_DAYS\t99999/PASS_MAX_DAYS\t60/g' /etc/login.defs
