Skip to content

Commit 3db273f

Browse files
committed
Merge pull request dinkel#18
ignore set -e at grep SLAPD_ Because "set -e option in entrypoint.sh" if `env | grep SLAPD_` (don't set SLAPD_* env) returned an error, shell script stops.
2 parents e363594 + ee02757 commit 3db273f

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

entrypoint.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,9 @@ EOF
107107

108108
chown -R openldap:openldap /etc/ldap/slapd.d/
109109
else
110+
set +e
110111
slapd_configs_in_env=`env | grep 'SLAPD_'`
112+
set -e
111113

112114
if [ -n "${slapd_configs_in_env:+x}" ]; then
113115
echo "Info: Container already configured, therefore ignoring SLAPD_xxx environment variables and preseed files"

0 commit comments

Comments
 (0)