diff --git a/Dockerfile b/Dockerfile index 15e43f4..5ec0f54 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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 @@ -167,12 +166,23 @@ COPY --link --chown=$CANTALOUPE_UID:$CANTALOUPE_GID actual_cantaloupe.properties WORKDIR /var/cache/cantaloupe WORKDIR /var/log/cantaloupe +# renovate: datasource=github-release-attachments depName=prometheus/jmx_exporter +ARG JMX_EXPORTER_VERSION=1.4.0 +ARG JMX_EXPORTER_DIGEST=sha256:db1492e95a7ee95cd5e0a969875c0d4f0ef6413148d750351a41cc71d775f59a +WORKDIR /jmx +ADD \ + --link \ + --chmod=644 \ + --checksum=$JMX_EXPORTER_DIGEST \ + https://github.com/prometheus/jmx_exporter/releases/download/$JMX_EXPORTER_VERSION/jmx_prometheus_javaagent-$JMX_EXPORTER_VERSION.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 diff --git a/jmx.yml b/jmx.yml new file mode 100644 index 0000000..772c2a4 --- /dev/null +++ b/jmx.yml @@ -0,0 +1,2 @@ +rules: +- pattern: ".*"