Skip to content
Open
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
9 changes: 6 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -127,8 +127,7 @@ ENV CANTALOUPE_CONFIGS=$CANTALOUPE_CONFIGS
ENV CANTALOUPE_PROPERTIES=${CANTALOUPE_CONFIGS}/actual_cantaloupe.properties
ARG GEM_PATH
ENV GEM_PATH=$GEM_PATH
ENV CANTALOUPE_MEM=1g
ENV JAVA_OPTS="-Xms${CANTALOUPE_MEM} -Xmx${CANTALOUPE_MEM} -server -Djava.awt.headless=true -Dcantaloupe.config=${CANTALOUPE_PROPERTIES}"
ENV JAVA_MEMORY="-Xms1g -Xmx1g"
ARG CANTALOUPE_UID
ARG CANTALOUPE_GID

Expand Down Expand Up @@ -167,12 +166,16 @@ COPY --link --chown=$CANTALOUPE_UID:$CANTALOUPE_GID actual_cantaloupe.properties
WORKDIR /var/cache/cantaloupe
WORKDIR /var/log/cantaloupe

WORKDIR /jmx
ADD --link --chmod=644 https://github.com/prometheus/jmx_exporter/releases/download/1.4.0/jmx_prometheus_javaagent-1.4.0.jar jmx_prometheus_javaagent.jar
COPY --chmod=644 jmx.yml ./

# Get and unpack Cantaloupe release archive
WORKDIR /cantaloupe
COPY --link --chown=$CANTALOUPE_UID:$CANTALOUPE_GID --from=cantaloupe-build /build/cantaloupe/target/cantaloupe-${CANTALOUPE_VERSION}.jar cantaloupe.jar
COPY --link --chown=$CANTALOUPE_UID:$CANTALOUPE_GID --chmod=500 <<-'EOS' entrypoint.sh
#!/bin/bash
exec java $JAVA_OPTS -jar cantaloupe.jar
exec java $JAVA_MEMORY -javaagent:/jmx/jmx_prometheus_javaagent.jar=3001:/jmx/jmx.yml -server -Djava.awt.headless=true -Dcantaloupe.config=${CANTALOUPE_PROPERTIES} -jar cantaloupe.jar

EOS

Expand Down
2 changes: 2 additions & 0 deletions jmx.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
rules:
- pattern: ".*"
Loading