From 9df0c0351216575123c607a39c5c7ec453bae64b Mon Sep 17 00:00:00 2001
From: maximthomas <maxim.thomas@gmail.com>
Date: Tue, 29 Apr 2025 07:55:53 +0000
Subject: [PATCH] Merge branch 'master' into update-jdk-11

---
 opendj-packages/opendj-docker/bootstrap/setup.sh |   28 ++++++++++++++++++++++++----
 1 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/opendj-packages/opendj-docker/bootstrap/setup.sh b/opendj-packages/opendj-docker/bootstrap/setup.sh
index c36fbe6..084fd2b 100755
--- a/opendj-packages/opendj-docker/bootstrap/setup.sh
+++ b/opendj-packages/opendj-docker/bootstrap/setup.sh
@@ -21,7 +21,6 @@
 /opt/opendj/setup \
   --cli \
   -h localhost \
-  --baseDN $BASE_DN \
   --ldapPort $PORT \
   --ldapsPort $LDAPS_PORT \
   --enableStartTLS $OPENDJ_SSL_OPTIONS \
@@ -31,10 +30,31 @@
   --acceptLicense \
   --no-prompt \
   --noPropertiesFile \
-  --doNotStart \
-  $ADD_BASE_ENTRY #--sampleData 1
+  $SETUP_ARGS
 
-/opt/opendj/bin/start-ds
+BACKEND_TYPE=${BACKEND_TYPE:-je}
+BACKEND_DB_DIRECTORY=${BACKEND_DB_DIRECTORY:-db}
+echo "creating backend: $BACKEND_TYPE db-directory: ${BACKEND_DB_DIRECTORY}"
+
+/opt/opendj/bin/dsconfig create-backend -h localhost -p $ADMIN_PORT --bindDN "$ROOT_USER_DN" --bindPassword "$ROOT_PASSWORD" \
+  --backend-name=userRoot --type $BACKEND_TYPE --set base-dn:$BASE_DN --set "db-directory:$BACKEND_DB_DIRECTORY" \
+  --set enabled:true --no-prompt --trustAll
+
+if [ "$ADD_BASE_ENTRY" = "--addBaseEntry" ]; then
+
+  DC=$(echo "$BASE_DN" | awk -F',|=' '{print $2}')
+
+  /opt/opendj/bin/ldapmodify --hostname localhost \
+    --port 1636 --bindDN "$ROOT_USER_DN" --bindPassword "$ROOT_PASSWORD" \
+    --useSsl --trustAll <<EOF
+dn: $BASE_DN
+dc: $DC
+objectClass: domain
+objectClass: top
+EOF
+
+fi
+
 
 # There are multiple types of ldif files.
 # The steps below import ldifs via `ldapmodify`.

--
Gitblit v1.10.0