cantaloupe java opts to fix jai processor for tiffs (#326)

* cantaloupe java opts to fix jai processor for tiffs * Update cantaloupe/rootfs/etc/s6-overlay/s6-rc.d/cantaloupe/run allow java opts params Co-authored-by: Joe Corall <[email protected]> * Add Cantaloupe_Java_opts variable * CANTALOUPE_JAVA_OPTS add to readme * Update cantaloupe/rootfs/etc/s6-overlay/s6-rc.d/cantaloupe/run remove quotes around new variable Co-authored-by: Joe Corall <[email protected]> --------- Co-authored-by: Joe Corall <[email protected]>
Islandora-Devops · Apr 19, 2024 · d7d2e1d · d7d2e1d
1 parent 3ad2d55
commit d7d2e1d
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/cantaloupe/Dockerfile b/cantaloupe/Dockerfile
@@ -129,6 +129,7 @@ ENV \
     CANTALOUPE_HTTPSOURCE_CHUNKING_ENABLED="true" \
     CANTALOUPE_HTTPSOURCE_LOOKUP_STRATEGY="BasicLookupStrategy" \
     CANTALOUPE_HTTPSOURCE_REQUEST_TIMEOUT= \
+    CANTALOUPE_JAVA_OPTS= \
     CANTALOUPE_JDBCCACHE_CONNECTION_TIMEOUT="10" \
     CANTALOUPE_JDBCCACHE_DERIVATIVE_IMAGE_TABLE="derivative_cache" \
     CANTALOUPE_JDBCCACHE_INFO_TABLE="info_cache" \

diff --git a/cantaloupe/README.md b/cantaloupe/README.md
@@ -112,6 +112,7 @@ additional settings, volumes, ports, etc.
 | CANTALOUPE_HTTPSOURCE_CHUNKING_ENABLED                                                 | "true"                                                           |
 | CANTALOUPE_HTTPSOURCE_LOOKUP_STRATEGY                                                  | "BasicLookupStrategy"                                            |
 | CANTALOUPE_HTTPSOURCE_REQUEST_TIMEOUT                                                  |                                                                  |
+| CANTALOUPE_JAVA_OPTS                                                                   |                                                                  |
 | CANTALOUPE_JDBCCACHE_CONNECTION_TIMEOUT                                                | "10"                                                             |
 | CANTALOUPE_JDBCCACHE_DERIVATIVE_IMAGE_TABLE                                            | "derivative_cache"                                               |
 | CANTALOUPE_JDBCCACHE_INFO_TABLE                                                        | "info_cache"                                                     |

diff --git a/cantaloupe/rootfs/etc/s6-overlay/s6-rc.d/cantaloupe/run b/cantaloupe/rootfs/etc/s6-overlay/s6-rc.d/cantaloupe/run
@@ -6,4 +6,4 @@ set -e
 # actually can write to the folder.
 chown cantaloupe:cantaloupe /data
 
-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
+exec with-contenv s6-setuidgid cantaloupe java -Dcantaloupe.config=/opt/cantaloupe/cantaloupe.properties -Xms"${CANTALOUPE_HEAP_MIN}" -Xmx"${CANTALOUPE_HEAP_MAX}" ${CANTALOUPE_JAVA_OPTS} -jar /opt/cantaloupe/cantaloupe.jar