From 5f0f8223f703963dec0da8139b820a6daf88daa4 Mon Sep 17 00:00:00 2001 From: Mauro Torrez Date: Mon, 30 Sep 2019 18:09:39 -0300 Subject: [PATCH] keep entrypoint from eumau/debian, run setup as a start.d script instead --- Dockerfile | 4 +--- entrypoint.sh => setup.sh | 5 ----- 2 files changed, 1 insertion(+), 8 deletions(-) rename entrypoint.sh => setup.sh (99%) diff --git a/Dockerfile b/Dockerfile index 9f46b18..134f5f2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -28,13 +28,11 @@ RUN apt-get update \ apt-get clean && \ rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* -ADD entrypoint.sh / +ADD setup.sh /start.d EXPOSE 389 VOLUME ["/etc/ldap/schema", "/etc/ldap/slapd.d", "/var/lib/ldap", "/var/backups/ldap"] -ENTRYPOINT ["/entrypoint.sh"] - # log level info: CMD ["slapd", "-d", "32768", "-u", "openldap", "-g", "openldap"] diff --git a/entrypoint.sh b/setup.sh similarity index 99% rename from entrypoint.sh rename to setup.sh index 9d0b6d2..18a9906 100755 --- a/entrypoint.sh +++ b/setup.sh @@ -248,8 +248,3 @@ kill -INT $(cat ${PIDFILE}) # unset sensitive variables unset LDAP_ADMIN_PASSWORD LDAP_CONFIG_PASSWORD LDAP_ADMIN_PWHASH \ LDAP_CONFIG_PWHASH LOADED_SCHEMAS PIDFILE - -# run Dockerfile CMD -echo "Running CMD $@" -set -e -exec "$@"