Skip to content

Commit

Permalink
move installation of java 17 to the main install location
Browse files Browse the repository at this point in the history
  • Loading branch information
tuxmea committed Dec 14, 2023
1 parent 5c540f7 commit 815fc1d
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions puppetdb/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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" && \
Expand All @@ -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/
Expand Down

0 comments on commit 815fc1d

Please sign in to comment.