external-software/github_OpenIdentityPlatform_OpenDJ.git

parent: 13f13ffc | patch | commit | show whitespace

fix: remove ENV ROOT_PASSWORD, add CDDL headers, fix HEALTHCHECK with shell...

copilot-swe-agent[bot]

3 days ago 78cb1ec9cd88d8d3746cd4fe56e5d5af2d2e2843

fix: remove ENV ROOT_PASSWORD, add CDDL headers, fix HEALTHCHECK with shell fallback

Agent-Logs-Url: https://github.com/OpenIdentityPlatform/OpenDJ/sessions/7f513901-fae9-4dfc-ad62-a2f5e56df4e7

Co-authored-by: vharseko <6818498+vharseko@users.noreply.github.com>

3 files modified

	opendj-packages/opendj-docker/Dockerfile	19 ●●●●● patch \| view \| raw \| blame \| history
	opendj-packages/opendj-docker/Dockerfile-alpine	19 ●●●●● patch \| view \| raw \| blame \| history
	opendj-packages/opendj-docker/run.sh	14 ●●●●● patch \| view \| raw \| blame \| history

 opendj-packages/opendj-docker/Dockerfile

@@ -1,3 +1,17 @@
# The contents of this file are subject to the terms of the Common Development and
# Distribution License (the License). You may not use this file except in compliance with the
# License.
#
# You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the
# specific language governing permission and limitations under the License.
#
# When distributing Covered Software, include this CDDL Header Notice in each file and include
# the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL
# Header, with the fields enclosed by brackets [] replaced by your own identifying
# information: "Portions copyright [year] [name of copyright owner]".
#
# Copyright 2026 3A Systems, LLC.

FROM eclipse-temurin:25-jre-jammy

LABEL org.opencontainers.image.authors="Open Identity Platform Community"
@@ -8,7 +22,8 @@
ENV ADMIN_PORT=4444
ENV BASE_DN="dc=example,dc=com"
ENV ROOT_USER_DN="cn=Directory Manager"
ENV ROOT_PASSWORD="password"
# ROOT_PASSWORD should be passed at runtime via: docker run -e ROOT_PASSWORD=...
# Default value if not provided: "password"
#ENV SECRET_VOLUME
ENV OPENDJ_SSL_OPTIONS="--generateSelfSignedCertificate"
#ENV MASTER_SERVER
@@ -50,6 +65,6 @@

USER $OPENDJ_USER

HEALTHCHECK --interval=30s --timeout=30s --start-period=1s --retries=3 CMD opendj/bin/ldapsearch --hostname localhost --port $LDAPS_PORT --bindDN "$ROOT_USER_DN" --bindPassword $ROOT_PASSWORD --useSsl --trustAll --baseDN "$BASE_DN" --searchScope base "(objectClass=*)" 1.1 || exit 1
HEALTHCHECK --interval=30s --timeout=30s --start-period=1s --retries=3 CMD opendj/bin/ldapsearch --hostname localhost --port $LDAPS_PORT --bindDN "$ROOT_USER_DN" --bindPassword "${ROOT_PASSWORD:-password}" --useSsl --trustAll --baseDN "$BASE_DN" --searchScope base "(objectClass=*)" 1.1 || exit 1

ENTRYPOINT ["/opt/opendj/run.sh"]

 opendj-packages/opendj-docker/Dockerfile-alpine

@@ -1,3 +1,17 @@
# The contents of this file are subject to the terms of the Common Development and
# Distribution License (the License). You may not use this file except in compliance with the
# License.
#
# You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the
# specific language governing permission and limitations under the License.
#
# When distributing Covered Software, include this CDDL Header Notice in each file and include
# the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL
# Header, with the fields enclosed by brackets [] replaced by your own identifying
# information: "Portions copyright [year] [name of copyright owner]".
#
# Copyright 2026 3A Systems, LLC.

FROM alpine:latest

LABEL org.opencontainers.image.authors="Open Identity Platform Community"
@@ -8,7 +22,8 @@
ENV ADMIN_PORT=4444
ENV BASE_DN="dc=example,dc=com"
ENV ROOT_USER_DN="cn=Directory Manager"
ENV ROOT_PASSWORD="password"
# ROOT_PASSWORD should be passed at runtime via: docker run -e ROOT_PASSWORD=...
# Default value if not provided: "password"
#ENV SECRET_VOLUME
ENV OPENDJ_SSL_OPTIONS="--generateSelfSignedCertificate"
#ENV MASTER_SERVER
@@ -52,6 +67,6 @@

USER $OPENDJ_USER

HEALTHCHECK --interval=30s --timeout=30s --start-period=1s --retries=3 CMD opendj/bin/ldapsearch --hostname localhost --port $LDAPS_PORT --bindDN "$ROOT_USER_DN" --bindPassword $ROOT_PASSWORD --useSsl --trustAll --baseDN "$BASE_DN" --searchScope base "(objectClass=*)" 1.1 || exit 1
HEALTHCHECK --interval=30s --timeout=30s --start-period=1s --retries=3 CMD opendj/bin/ldapsearch --hostname localhost --port $LDAPS_PORT --bindDN "$ROOT_USER_DN" --bindPassword "${ROOT_PASSWORD:-password}" --useSsl --trustAll --baseDN "$BASE_DN" --searchScope base "(objectClass=*)" 1.1 || exit 1

ENTRYPOINT ["/opt/opendj/run.sh"]

 opendj-packages/opendj-docker/run.sh

@@ -1,4 +1,18 @@
#!/usr/bin/env bash
# The contents of this file are subject to the terms of the Common Development and
# Distribution License (the License). You may not use this file except in compliance with the
# License.
#
# You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the
# specific language governing permission and limitations under the License.
#
# When distributing Covered Software, include this CDDL Header Notice in each file and include
# the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL
# Header, with the fields enclosed by brackets [] replaced by your own identifying
# information: "Portions copyright [year] [name of copyright owner]".
#
# Portions copyright 2026 3A Systems, LLC.

# Run the OpenDJ server
# The idea is to consolidate all of the writable DJ directories to
# a single instance directory root, and update DJ's instance.loc file to point to that root

			@@ -1,3 +1,17 @@
			# The contents of this file are subject to the terms of the Common Development and
			# Distribution License (the License). You may not use this file except in compliance with the
			# License.
			#
			# You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the
			# specific language governing permission and limitations under the License.
			#
			# When distributing Covered Software, include this CDDL Header Notice in each file and include
			# the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL
			# Header, with the fields enclosed by brackets [] replaced by your own identifying
			# information: "Portions copyright [year] [name of copyright owner]".
			#
			# Copyright 2026 3A Systems, LLC.

			FROM eclipse-temurin:25-jre-jammy

			LABEL org.opencontainers.image.authors="Open Identity Platform Community"
			@@ -8,7 +22,8 @@
			ENV ADMIN_PORT=4444
			ENV BASE_DN="dc=example,dc=com"
			ENV ROOT_USER_DN="cn=Directory Manager"
			ENV ROOT_PASSWORD="password"
			# ROOT_PASSWORD should be passed at runtime via: docker run -e ROOT_PASSWORD=...
			# Default value if not provided: "password"
			#ENV SECRET_VOLUME
			ENV OPENDJ_SSL_OPTIONS="--generateSelfSignedCertificate"
			#ENV MASTER_SERVER
			@@ -50,6 +65,6 @@

			USER $OPENDJ_USER

			HEALTHCHECK --interval=30s --timeout=30s --start-period=1s --retries=3 CMD opendj/bin/ldapsearch --hostname localhost --port $LDAPS_PORT --bindDN "$ROOT_USER_DN" --bindPassword $ROOT_PASSWORD --useSsl --trustAll --baseDN "$BASE_DN" --searchScope base "(objectClass=*)" 1.1 \|\| exit 1
			HEALTHCHECK --interval=30s --timeout=30s --start-period=1s --retries=3 CMD opendj/bin/ldapsearch --hostname localhost --port $LDAPS_PORT --bindDN "$ROOT_USER_DN" --bindPassword "${ROOT_PASSWORD:-password}" --useSsl --trustAll --baseDN "$BASE_DN" --searchScope base "(objectClass=*)" 1.1 \|\| exit 1

			ENTRYPOINT ["/opt/opendj/run.sh"]

			@@ -1,4 +1,18 @@
			#!/usr/bin/env bash
			# The contents of this file are subject to the terms of the Common Development and
			# Distribution License (the License). You may not use this file except in compliance with the
			# License.
			#
			# You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the
			# specific language governing permission and limitations under the License.
			#
			# When distributing Covered Software, include this CDDL Header Notice in each file and include
			# the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL
			# Header, with the fields enclosed by brackets [] replaced by your own identifying
			# information: "Portions copyright [year] [name of copyright owner]".
			#
			# Portions copyright 2026 3A Systems, LLC.

			# Run the OpenDJ server
			# The idea is to consolidate all of the writable DJ directories to
			# a single instance directory root, and update DJ's instance.loc file to point to that root