From 1e795f8a25e5ccb8b1481db992a78e7c9d22f4c4 Mon Sep 17 00:00:00 2001 From: Maxim Thomas <maxim.thomas@gmail.com> Date: Tue, 25 Mar 2025 10:00:50 +0000 Subject: [PATCH] move Java args to java.properties, upgrade docker alpine (#502) --- opendj-packages/opendj-docker/Dockerfile-alpine | 6 +++--- opendj-server-legacy/resource/config/java.properties | 9 +++++++-- opendj-packages/opendj-docker/Dockerfile | 2 +- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/opendj-packages/opendj-docker/Dockerfile b/opendj-packages/opendj-docker/Dockerfile index 8d153f1..3f0683f 100644 --- a/opendj-packages/opendj-docker/Dockerfile +++ b/opendj-packages/opendj-docker/Dockerfile @@ -14,7 +14,7 @@ #ENV MASTER_SERVER #ENV OPENDJ_REPLICATION_TYPE ENV OPENDJ_USER="opendj" -ENV OPENDJ_JAVA_ARGS="-server" +#ENV OPENDJ_JAVA_ARGS="" ENV BACKEND_TYPE="je" ENV BACKEND_DB_DIRECTORY="db" #ENV SETUP_ARGS diff --git a/opendj-packages/opendj-docker/Dockerfile-alpine b/opendj-packages/opendj-docker/Dockerfile-alpine index ba7aca4..eccca03 100644 --- a/opendj-packages/opendj-docker/Dockerfile-alpine +++ b/opendj-packages/opendj-docker/Dockerfile-alpine @@ -1,4 +1,4 @@ -FROM openjdk:8-jre-alpine +FROM alpine:latest LABEL org.opencontainers.image.authors="Open Identity Platform Community" @@ -14,7 +14,7 @@ #ENV MASTER_SERVER #ENV OPENDJ_REPLICATION_TYPE ENV OPENDJ_USER="opendj" -ENV OPENDJ_JAVA_ARGS="-server -XX:+UseG1GC -XX:+UseContainerSupport" +#ENV OPENDJ_JAVA_ARGS="" ENV BACKEND_TYPE="je" ENV BACKEND_DB_DIRECTORY="db" #ENV SETUP_ARGS @@ -25,7 +25,7 @@ RUN apk add --update --no-cache --virtual builddeps curl unzip \ && apk upgrade --update --no-cache \ - && apk add bash \ + && apk add bash openjdk8 \ && if [ -z "$VERSION" ] ; then VERSION="$(curl -i -o - --silent https://api.github.com/repos/OpenIdentityPlatform/OpenDJ/releases/latest | grep -m1 "\"name\"" | cut -d\" -f4)"; fi \ && curl -L https://github.com/OpenIdentityPlatform/OpenDJ/releases/download/$VERSION/opendj-$VERSION.zip --output opendj-$VERSION.zip \ && unzip opendj-$VERSION.zip \ diff --git a/opendj-server-legacy/resource/config/java.properties b/opendj-server-legacy/resource/config/java.properties index 91f7ed7..a93d988 100644 --- a/opendj-server-legacy/resource/config/java.properties +++ b/opendj-server-legacy/resource/config/java.properties @@ -56,7 +56,12 @@ # # Specify to use the -client argument for all the command-lines that have not # an associated property defined: -# default.java-args=-server +# default.java-args=-client default.java-home=$JAVA_HOME -default.java-args=-server \ No newline at end of file +default.java-args=-client + +import-ldif.offline.java-args=-server +rebuild-index.offline.java-args=-server +start-ds.java-args=-server +ldifdiff.java-args=-server \ No newline at end of file -- Gitblit v1.10.0