From 0ff28afc3dca87f56c1586b3b57520cde3109480 Mon Sep 17 00:00:00 2001 From: "Zaiming (Stone) Shi" Date: Thu, 28 Sep 2023 23:37:02 +0200 Subject: [PATCH] test: use pre-build openldap base image --- .ci/docker-compose-file/docker-compose-ldap.yaml | 2 -- .ci/docker-compose-file/openldap/Dockerfile | 14 +------------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/.ci/docker-compose-file/docker-compose-ldap.yaml b/.ci/docker-compose-file/docker-compose-ldap.yaml index f92df47a0..03627c763 100644 --- a/.ci/docker-compose-file/docker-compose-ldap.yaml +++ b/.ci/docker-compose-file/docker-compose-ldap.yaml @@ -6,8 +6,6 @@ services: build: context: ../.. dockerfile: .ci/docker-compose-file/openldap/Dockerfile - args: - LDAP_TAG: ${LDAP_TAG} image: openldap #ports: # - 389:389 diff --git a/.ci/docker-compose-file/openldap/Dockerfile b/.ci/docker-compose-file/openldap/Dockerfile index e6c319bca..9eba7b3a5 100644 --- a/.ci/docker-compose-file/openldap/Dockerfile +++ b/.ci/docker-compose-file/openldap/Dockerfile @@ -1,16 +1,4 @@ -FROM ubuntu:20.04 - -ARG LDAP_TAG=2.5.16 - -ENV DEBIAN_FRONTEND noninteractive - -RUN apt-get update -y -RUN apt-get install -y groff groff-base curl build-essential -RUN curl -o openldap-${LDAP_TAG}.tgz https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-${LDAP_TAG}.tgz \ - && tar xvzf openldap-${LDAP_TAG}.tgz \ - && cd openldap-${LDAP_TAG} \ - && ./configure && make depend && make && make install \ - && cd .. && rm -rf openldap-${LDAP_TAG} +FROM docker.io/zmstone/openldap:2.5.16 COPY .ci/docker-compose-file/openldap/slapd.conf /usr/local/etc/openldap/slapd.conf COPY apps/emqx_ldap/test/data/emqx.io.ldif /usr/local/etc/openldap/schema/emqx.io.ldif