Include the client-side CLI utils in the image

The image can now be used to run an ldap client command rather than the
slapd server. If so, skip slapd-specific configuration and setup logic
and do not require the environment variables used by this setup. This
approach is inspired by other Docker entrypoint scripts used for initial
setup such as in the Docker Hub-official MySQL and Postgres images, but
uses an alternative exit point for the script instead of an if clause
that spans most of the logic.

Author: fedde-s

Dockerfile

@@ -4,11 +4,12 @@ MAINTAINER Fedde Schaeffer <fedde@thehyve.nl>
 
 ENV OPENLDAP_VERSION 2.4.44
 
-RUN apt-get update && \
-    DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
-        slapd=${OPENLDAP_VERSION}* && \
-    apt-get clean && \
-    rm -rf /var/lib/apt/lists/*
+RUN apt-get update \
+    && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
+        slapd=${OPENLDAP_VERSION}* \
+        ldap-utils=${OPENLDAP_VERSION}* \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
 
 RUN mv /etc/ldap /etc/ldap.dist
 

entrypoint.sh

@@ -7,6 +7,16 @@ ulimit -n 8192
 
 set -e
 
+# if command starts with an option, prepend slapd
+if [ "${1:0:1}" = '-' ]; then
+    set -- slapd "$@"
+fi
+
+# skip setup if running something other than slapd
+if [ "$1" != 'slapd' ]; then
+    exec "$@"
+fi
+
 SLAPD_FORCE_RECONFIGURE="${SLAPD_FORCE_RECONFIGURE:-false}"
 
 first_run=true