From c4d282a77ef7701d79db2226136bfbd8e147d95d Mon Sep 17 00:00:00 2001 From: vharseko <vharseko@3a-systems.ru> Date: Tue, 17 May 2022 07:40:14 +0000 Subject: [PATCH] Docker refactoring (#229) --- opendj-packages/opendj-docker/Dockerfile | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/opendj-packages/opendj-docker/Dockerfile b/opendj-packages/opendj-docker/Dockerfile index e008b07..0d9e0ec 100644 --- a/opendj-packages/opendj-docker/Dockerfile +++ b/opendj-packages/opendj-docker/Dockerfile @@ -1,4 +1,4 @@ -FROM openjdk:11-jre-slim +FROM openjdk:11 MAINTAINER Open Identity Platform Community <open-identity-platform-opendj@googlegroups.com> @@ -20,10 +20,10 @@ WORKDIR /opt RUN apt-get update \ - && apt-get install -y --no-install-recommends wget unzip \ - && wget --quiet https://github.com/OpenIdentityPlatform/OpenDJ/releases/download/$VERSION/opendj-$VERSION.zip \ + && apt-get install -y --no-install-recommends curl unzip \ + && curl -L https://github.com/OpenIdentityPlatform/OpenDJ/releases/download/$VERSION/opendj-$VERSION.zip --output opendj-$VERSION.zip \ && unzip opendj-$VERSION.zip \ - && apt-get remove -y --purge unzip \ + && apt-get remove -y --purge curl unzip \ && rm -rf /var/lib/apt/lists/* \ && rm -r opendj-*.zip \ && groupadd $OPENDJ_USER \ @@ -41,4 +41,6 @@ USER $OPENDJ_USER -ENTRYPOINT ["/opt/opendj/run.sh"] +HEALTHCHECK --interval=30s --timeout=30s --start-period=1s --retries=3 CMD opendj/bin/ldapsearch --hostname localhost --port 1636 --bindDN "$ROOT_USER_DN" --bindPassword $ROOT_PASSWORD --useSsl --trustAll --baseDN "$BASE_DN" --searchScope base "(objectClass=*)" 1.1 || exit 1 + +ENTRYPOINT ["/opt/opendj/run.sh"] \ No newline at end of file -- Gitblit v1.10.0