From 0fcf1233655f6ee2f1a6768be6101984609fc20e Mon Sep 17 00:00:00 2001
From: casell <casell@users.noreply.github.com>
Date: Thu, 07 Apr 2022 10:58:20 +0000
Subject: [PATCH] Refactor Dockerfile debian and alpine (#216)

---
 opendj-packages/opendj-docker/Dockerfile |   60 +++++++++++++++++++++++++-----------------------------------
 1 files changed, 25 insertions(+), 35 deletions(-)

diff --git a/opendj-packages/opendj-docker/Dockerfile b/opendj-packages/opendj-docker/Dockerfile
index 0c30e04..201ed80 100644
--- a/opendj-packages/opendj-docker/Dockerfile
+++ b/opendj-packages/opendj-docker/Dockerfile
@@ -2,49 +2,39 @@
 
 MAINTAINER Open Identity Platform Community <open-identity-platform-opendj@googlegroups.com>
 
-ENV ADD_BASE_ENTRY="--addBaseEntry"
-
-ENV PORT=1389
-
-ENV LDAPS_PORT=1636
-
-ENV BASE_DN=${BASE_DN:-"dc=example,dc=com"}
-
-ENV ROOT_USER_DN=${ROOT_USER_DN:-"cn=Directory Manager"}
-
-ENV ROOT_PASSWORD=${ROOT_PASSWORD:-"password"}
-
-ENV SECRET_VOLUME=${SECRET_VOLUME}
-
-ENV OPENDJ_SSL_OPTIONS=${SSL_OPTIONS:-"--generateSelfSignedCertificate"}
-
-ENV MASTER_SERVER=${MASTER_SERVER}
-
-ENV OPENDJ_REPLICATION_TYPE=${OPENDJ_REPLICATION_TYPE}
-
-ENV OPENDJ_USER="opendj"
+ENV ADD_BASE_ENTRY="--addBaseEntry" \
+    PORT=1389 \
+    LDAPS_PORT=1636 \
+    BASE_DN=${BASE_DN:-"dc=example,dc=com"} \
+    ROOT_USER_DN=${ROOT_USER_DN:-"cn=Directory Manager"} \
+    ROOT_PASSWORD=${ROOT_PASSWORD:-"password"} \
+    SECRET_VOLUME=${SECRET_VOLUME} \
+    OPENDJ_SSL_OPTIONS=${SSL_OPTIONS:-"--generateSelfSignedCertificate"} \
+    MASTER_SERVER=${MASTER_SERVER} \
+    OPENDJ_REPLICATION_TYPE=${OPENDJ_REPLICATION_TYPE} \
+    OPENDJ_USER="opendj"
 
 WORKDIR /opt
 
 ADD target/opendj-*.zip .
 
-RUN apt-get update && apt-get install -y --no-install-recommends  unzip  && rm -rf /var/lib/apt/lists/*
-RUN unzip opendj-*.zip && rm -r opendj-*.zip
+RUN apt-get update \
+ && apt-get install -y --no-install-recommends unzip \
+ && unzip opendj-*.zip \
+ && apt-get remove -y --purge unzip \
+ && rm -rf /var/lib/apt/lists/* \
+ && rm -r opendj-*.zip \
+ && groupadd $OPENDJ_USER \
+ && useradd -m -r -u 1001 -g $OPENDJ_USER $OPENDJ_USER \
+ && install -d -o $OPENDJ_USER /opt/opendj/data \
+ && chown -R $OPENDJ_USER:$OPENDJ_USER /opt/opendj \
+ && chmod -R g=u /opt/opendj
 
-ADD bootstrap/ /opt/opendj/bootstrap/
+COPY --chown=$OPENDJ_USER:$OPENDJ_USER bootstrap/ /opt/opendj/bootstrap/
 
-ADD run.sh /opt/opendj/run.sh
+COPY --chown=$OPENDJ_USER:$OPENDJ_USER run.sh /opt/opendj/run.sh
 
-RUN groupadd $OPENDJ_USER 
-
-RUN useradd -m -r -u 1001 -g $OPENDJ_USER $OPENDJ_USER \
-    && install -d -o $OPENDJ_USER /opt/opendj/data
-
-RUN chown -R $OPENDJ_USER:$OPENDJ_USER /opt/opendj && \
-    chmod -R g=u /opt/opendj && \
-    chmod +x /opt/opendj/run.sh \
-     /opt/opendj/bootstrap/setup.sh \
-     /opt/opendj/bootstrap/replicate.sh
+RUN chmod +x /opt/opendj/run.sh /opt/opendj/bootstrap/setup.sh /opt/opendj/bootstrap/replicate.sh
 
 EXPOSE $PORT $LDAPS_PORT 4444
 

--
Gitblit v1.10.0