Issue 307 - Adding xms and xmx for Cantaloupe heap (#310)

* Issue 307 - Adding xms and xmx for Cantaloupe heap * Added with-contenv but still no joy * with-contenv added * Add missing libjpeg-turbo library * libjpeg-turbo library location --------- Co-authored-by: Noah W. Smith <[email protected]>
Islandora-Devops · Nov 30, 2023 · 13ae1df · 13ae1df
1 parent dec5144
commit 13ae1df
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/cantaloupe/Dockerfile b/cantaloupe/Dockerfile
@@ -36,7 +36,10 @@ RUN --mount=type=cache,id=cantaloupe-apk-${TARGETARCH},sharing=locked,target=/va
     apk add \
         ffmpeg \
         openjpeg-tools \
+        libjpeg-turbo \
     && \
+    mkdir -p /opt/libjpeg-turbo/lib && \
+    ln -s /usr/lib/libturbojpeg.so.0 /opt/libjpeg-turbo/lib/libturbojpeg.so && \
     create-service-user.sh --name cantaloupe --group jwt /data /opt/cantaloupe/logs && \
     cleanup.sh
 
@@ -97,6 +100,8 @@ ENV \
     CANTALOUPE_FILESYSTEMSOURCE_BASICLOOKUPSTRATEGY_PATH_SUFFIX= \
     CANTALOUPE_FILESYSTEMSOURCE_LOOKUP_STRATEGY="BasicLookupStrategy" \
     CANTALOUPE_GROKPROCESSOR_PATH_TO_BINARIES= \
+    CANTALOUPE_HEAP_MIN="3G" \
+    CANTALOUPE_HEAP_MAX="5G" \
     CANTALOUPE_HEAPCACHE_PERSIST_FILESYSTEM_PATHNAME="/data/heap.cache" \
     CANTALOUPE_HEAPCACHE_PERSIST="false" \
     CANTALOUPE_HEAPCACHE_TARGET_SIZE="2G" \

diff --git a/cantaloupe/README.md b/cantaloupe/README.md
@@ -83,6 +83,8 @@ additional settings, volumes, ports, etc.
 | CANTALOUPE_FILESYSTEMSOURCE_BASICLOOKUPSTRATEGY_PATH_SUFFIX                            |                                                                  |
 | CANTALOUPE_FILESYSTEMSOURCE_LOOKUP_STRATEGY                                            | "BasicLookupStrategy"                                            |
 | CANTALOUPE_GROKPROCESSOR_PATH_TO_BINARIES                                              |                                                                  |
+| CANTALOUPE_HEAP_MIN                                                                    | "3G"                                                             |
+| CANTALOUPE_HEAP_MAX                                                                    | "5G"                                                             |
 | CANTALOUPE_HEAPCACHE_PERSIST_FILESYSTEM_PATHNAME                                       | "/data/heap.cache"                                               |
 | CANTALOUPE_HEAPCACHE_PERSIST                                                           | "false"                                                          |
 | CANTALOUPE_HEAPCACHE_TARGET_SIZE                                                       | "2G"                                                             |

diff --git a/cantaloupe/rootfs/etc/s6-overlay/s6-rc.d/cantaloupe/run b/cantaloupe/rootfs/etc/s6-overlay/s6-rc.d/cantaloupe/run
@@ -1,8 +1,9 @@
-#!/usr/bin/env bash
+#!/command/with-contenv bash
+# shellcheck shell=bash
 set -e
 
 # When bind mounting we need to ensure that we
 # actually can write to the folder.
 chown cantaloupe:cantaloupe /data
 
-exec s6-setuidgid cantaloupe java -Dcantaloupe.config=/opt/cantaloupe/cantaloupe.properties -jar /opt/cantaloupe/cantaloupe.jar
+exec with-contenv s6-setuidgid cantaloupe java -Dcantaloupe.config=/opt/cantaloupe/cantaloupe.properties -Xms"${CANTALOUPE_HEAP_MIN}" -Xmx"${CANTALOUPE_HEAP_MAX}" -jar /opt/cantaloupe/cantaloupe.jar