Skip to content

Commit 9e87102

Browse files
testing metrics
1 parent 4dcfcca commit 9e87102

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

Dockerfile

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,6 @@ ENV CANTALOUPE_PROPERTIES=${CANTALOUPE_CONFIGS}/actual_cantaloupe.properties
128128
ARG GEM_PATH
129129
ENV GEM_PATH=$GEM_PATH
130130
ENV CANTALOUPE_MEM=1g
131-
ENV JAVA_OPTS="-Xms${CANTALOUPE_MEM} -Xmx${CANTALOUPE_MEM} -server -Djava.awt.headless=true -Dcantaloupe.config=${CANTALOUPE_PROPERTIES}"
132131
ARG CANTALOUPE_UID
133132
ARG CANTALOUPE_GID
134133

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

169+
WORKDIR /jmx
170+
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
171+
COPY --chmod=644 jmx.yml ./
172+
170173
# Get and unpack Cantaloupe release archive
171174
WORKDIR /cantaloupe
172175
COPY --link --chown=$CANTALOUPE_UID:$CANTALOUPE_GID --from=cantaloupe-build /build/cantaloupe/target/cantaloupe-${CANTALOUPE_VERSION}.jar cantaloupe.jar
173176
COPY --link --chown=$CANTALOUPE_UID:$CANTALOUPE_GID --chmod=500 <<-'EOS' entrypoint.sh
174177
#!/bin/bash
175-
exec java $JAVA_OPTS -jar cantaloupe.jar
178+
exec java -Xms${CANTALOUPE_MEM} -Xmx${CANTALOUPE_MEM} -javaagent:/jmx/jmx_prometheus_javaagent.jar=3001:/jmx/jmx.yml -server -Djava.awt.headless=true -Dcantaloupe.config=${CANTALOUPE_PROPERTIES} -jar cantaloupe.jar
176179

177180
EOS
178181

jmx.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
rules:
2+
- pattern: ".*"

0 commit comments

Comments
 (0)