Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

move Java args to java.properties, upgrade docker alpine #502

Merged
merged 2 commits into from
Mar 25, 2025
Merged

move Java args to java.properties, upgrade docker alpine #502

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ef33ddf
move Java args to java.properties, upgrade docker alpine
maximthomas Mar 21, 2025
87caae9
Set -server argument for specific tools
maximthomas Mar 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion opendj-packages/opendj-docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ ENV OPENDJ_SSL_OPTIONS="--generateSelfSignedCertificate"
#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
Expand Down
6 changes: 3 additions & 3 deletions opendj-packages/opendj-docker/Dockerfile-alpine
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM openjdk:8-jre-alpine
FROM alpine:latest

LABEL org.opencontainers.image.authors="Open Identity Platform Community"

Expand All @@ -14,7 +14,7 @@ ENV OPENDJ_SSL_OPTIONS="--generateSelfSignedCertificate"
#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
Expand All @@ -25,7 +25,7 @@ WORKDIR /opt

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 \
Expand Down
9 changes: 7 additions & 2 deletions opendj-server-legacy/resource/config/java.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
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