From 5c540f77235eeb04192e55b5d7e8c28c96ae32b3 Mon Sep 17 00:00:00 2001 From: Martin Alfke Date: Thu, 14 Dec 2023 10:38:38 +0100 Subject: [PATCH 1/2] puppetdb on java 17 --- puppetdb/Dockerfile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/puppetdb/Dockerfile b/puppetdb/Dockerfile index 9bb631d89..a6f0e804b 100644 --- a/puppetdb/Dockerfile +++ b/puppetdb/Dockerfile @@ -30,7 +30,7 @@ ENV PUPPETDB_POSTGRES_HOSTNAME="postgres" \ USE_PUPPETSERVER=true \ # this value may be set by users, keeping in mind that some of these values are mandatory # -Djavax.net.debug=ssl may be particularly useful to set for debugging SSL - PUPPETDB_JAVA_ARGS="-Djava.net.preferIPv4Stack=true -Xms256m -Xmx256m -XX:+UseParallelGC -Xlog:gc:file=$LOGDIR/puppetdb_gc.log -Djdk.tls.ephemeralDHKeySize=2048" + PUPPETDB_JAVA_ARGS="-Djava.net.preferIPv4Stack=true -Xms256m -Xmx256m -XX:+UseParallelGC -Xlog:gc*:file=$LOGDIR/puppetdb_gc.log -Djdk.tls.ephemeralDHKeySize=2048" # puppetdb data and generated certs VOLUME /opt/puppetlabs/server/data/puppetdb @@ -112,11 +112,15 @@ RUN dpkg -i /${PUPPET_DEB} && \ apt autoremove && \ rm -rf /var/lib/apt/lists/* && \ mkdir -p "$LOGDIR" && \ + chown puppetdb:puppetdb "$LOGDIR" && \ # We want to use the HOCON database.conf and config.conf files, so get rid # of the packaged files rm -f /etc/puppetlabs/puppetdb/conf.d/database.ini && \ rm -f /etc/puppetlabs/puppetdb/conf.d/config.ini +RUN apt update && \ + apt install --no-install-recommends -y openjdk-17-jre-headless + COPY logback.xml \ request-logging.xml \ /etc/puppetlabs/puppetdb/ From 815fc1dbacfd967e0444f8d61b916f2cfee2d008 Mon Sep 17 00:00:00 2001 From: Martin Alfke Date: Thu, 14 Dec 2023 10:51:43 +0100 Subject: [PATCH 2/2] move installation of java 17 to the main install location --- puppetdb/Dockerfile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/puppetdb/Dockerfile b/puppetdb/Dockerfile index a6f0e804b..328db0a54 100644 --- a/puppetdb/Dockerfile +++ b/puppetdb/Dockerfile @@ -109,6 +109,7 @@ RUN dpkg -i /${PUPPET_DEB} && \ rm /${PUPPET_DEB} && \ apt update && \ apt install --no-install-recommends -y puppetdb=${PUPPETDB_VERSION}-1${UBUNTU_CODENAME} && \ + apt install --no-install-recommends -y openjdk-17-jre-headless && \ apt autoremove && \ rm -rf /var/lib/apt/lists/* && \ mkdir -p "$LOGDIR" && \ @@ -118,9 +119,6 @@ RUN dpkg -i /${PUPPET_DEB} && \ rm -f /etc/puppetlabs/puppetdb/conf.d/database.ini && \ rm -f /etc/puppetlabs/puppetdb/conf.d/config.ini -RUN apt update && \ - apt install --no-install-recommends -y openjdk-17-jre-headless - COPY logback.xml \ request-logging.xml \ /etc/puppetlabs/puppetdb/