From 9995c0b959e1b2da63a7e043f6167f14cc8ebeaa Mon Sep 17 00:00:00 2001
From: Adar Nimrod <nimrod@shore.co.il>
Date: Sat, 11 May 2019 21:17:11 +0300
Subject: [PATCH] A little touchup.
---
slapd/Dockerfile | 2 +-
slapd/entrypoint | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/slapd/Dockerfile b/slapd/Dockerfile
index 6a254ad..7c7e9ea 100644
--- a/slapd/Dockerfile
+++ b/slapd/Dockerfile
@@ -8,7 +8,7 @@ RUN echo 'deb http://deb.debian.org/debian stretch-backports main' > /etc/apt/so
&& \
mkdir -p /run/slapd && \
rm -rf /tmp/* /var/tmp/* /var/lib/apt/lists/* /var/cache/apt/archives/*
-COPY entrypoint /
+COPY --chown=root:root entrypoint /
EXPOSE 389 636
VOLUME [ "/var/lib/ldap" ]
ENV LDAP_URLS="ldap:/// ldapi:/// ldaps:///" \
diff --git a/slapd/entrypoint b/slapd/entrypoint
index b92073b..a1ea36e 100755
--- a/slapd/entrypoint
+++ b/slapd/entrypoint
@@ -1,8 +1,8 @@
#!/bin/sh
set -eux
-chown -R openldap:openldap /run/slapd
-chown -R openldap:openldap /var/lib/ldap
+install -d -o openldap -g openldap /run/slapd
+install -d -o openldap -g openldap /var/lib/ldap
cat << EOF | debconf-set-selections -v
slapd slapd/internal/generated_adminpw password ${LDAP_ROOTPASS:-}
@@ -13,6 +13,6 @@ slapd slapd/domain string ${LDAP_DOMAIN:-}
slapd shared/organization string ${LDAP_ORGANIZATION:-}
EOF
-dpkg-reconfigure -f noninteractive slapd
+DEBIAN_FRONTEND=noninteractive dpkg-reconfigure -f noninteractive slapd
eval exec "$@"
--
GitLab