[SERV-1080] Switch JP2 process from from Grok to OpenJpeg (#172)

* [SERV-1060] Update curl version * [SERV-1080] Switch JP2 processor from Grok to OpenJPG
UCLALibrary · Apr 23, 2024 · f137214 · f137214
1 parent a672bf0
commit f137214
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 17 deletions.
diff --git a/pom.xml b/pom.xml
@@ -84,10 +84,9 @@
     <libturbojpeg.version>2.1.2-0ubuntu1</libturbojpeg.version>
     <unzip.version>6.0-26ubuntu3.2</unzip.version>
     <zip.version>3.0-12build2</zip.version>
-    <curl.version>7.81.0-1ubuntu1.15</curl.version>
+    <curl.version>7.81.0-1ubuntu1.16</curl.version>
     <ffmpeg.version>7:4.4.2-0ubuntu0.22.04.1</ffmpeg.version>
     <python2.version>2.7.18-3</python2.version>
-    <grok.version>11.0.0</grok.version>
     <libperl.version>5.34.0-3ubuntu1.3</libperl.version>
 
     <!-- Java dependency versions -->

diff --git a/src/main/docker/Dockerfile b/src/main/docker/Dockerfile
@@ -172,15 +172,6 @@ RUN mkdir -p /var/log/cantaloupe /var/cache/cantaloupe && \
     chown -R cantaloupe:users /var/log/cantaloupe /var/cache/cantaloupe /etc/cantaloupe /usr/local/cantaloupe/ \
       /usr/local/bin/docker-entrypoint.sh
 
-# Install grok JPEG-2000 library and tools
-WORKDIR /tmp
-ARG GROK_RELEASES="https://github.com/GrokImageCompression/grok/releases"
-RUN curl -sL "${GROK_RELEASES}/download/v${grok.version}/grok-ubuntu-latest.zip" > grok.zip && \
-    unzip grok.zip && \
-    cp ./grok-ubuntu-latest/bin/grk_* /usr/bin && \
-    cp ./grok-ubuntu-latest/lib/*libgrok* /usr/lib && \
-    cp -r ./grok-ubuntu-latest/include/grok* /usr/include && \
-    rm -rf /tmp/grok-ubuntu-latest grok.zip
 
 # Set up logging, keeping a separate log for just the errors (in addition to the full log)
 ENV CANTALOUPE_LOG_APPLICATION_ROLLINGFILEAPPENDER_PATHNAME=/var/log/cantaloupe/application.log

diff --git a/src/main/docker/configs/cantaloupe.properties.default-5.0.2 b/src/main/docker/configs/cantaloupe.properties.default-5.0.2
@@ -324,7 +324,7 @@ CANTALOUPE_MANUAL_PROCESSOR_AVI = FfmpegProcessor
 CANTALOUPE_MANUAL_PROCESSOR_BMP =
 CANTALOUPE_MANUAL_PROCESSOR_FLV = FfmpegProcessor
 CANTALOUPE_MANUAL_PROCESSOR_GIF =
-CANTALOUPE_MANUAL_PROCESSOR_JP2 = GrokProcessor
+CANTALOUPE_MANUAL_PROCESSOR_JP2 = OpenJpegProcessor
 CANTALOUPE_MANUAL_PROCESSOR_JPG = TurboJpegProcessor
 CANTALOUPE_MANUAL_PROCESSOR_MOV = FfmpegProcessor
 CANTALOUPE_MANUAL_PROCESSOR_MP4 = FfmpegProcessor

diff --git a/src/main/docker/configs/cantaloupe.properties.default-5.0.3 b/src/main/docker/configs/cantaloupe.properties.default-5.0.3
@@ -324,7 +324,7 @@ CANTALOUPE_MANUAL_PROCESSOR_AVI = FfmpegProcessor
 CANTALOUPE_MANUAL_PROCESSOR_BMP =
 CANTALOUPE_MANUAL_PROCESSOR_FLV = FfmpegProcessor
 CANTALOUPE_MANUAL_PROCESSOR_GIF =
-CANTALOUPE_MANUAL_PROCESSOR_JP2 = GrokProcessor
+CANTALOUPE_MANUAL_PROCESSOR_JP2 = OpenJpegProcessor
 CANTALOUPE_MANUAL_PROCESSOR_JPG = TurboJpegProcessor
 CANTALOUPE_MANUAL_PROCESSOR_MOV = FfmpegProcessor
 CANTALOUPE_MANUAL_PROCESSOR_MP4 = FfmpegProcessor

diff --git a/src/main/docker/configs/cantaloupe.properties.default-5.0.4 b/src/main/docker/configs/cantaloupe.properties.default-5.0.4
@@ -324,7 +324,7 @@ CANTALOUPE_MANUAL_PROCESSOR_AVI = FfmpegProcessor
 CANTALOUPE_MANUAL_PROCESSOR_BMP =
 CANTALOUPE_MANUAL_PROCESSOR_FLV = FfmpegProcessor
 CANTALOUPE_MANUAL_PROCESSOR_GIF =
-CANTALOUPE_MANUAL_PROCESSOR_JP2 = GrokProcessor
+CANTALOUPE_MANUAL_PROCESSOR_JP2 = OpenJpegProcessor
 CANTALOUPE_MANUAL_PROCESSOR_JPG = TurboJpegProcessor
 CANTALOUPE_MANUAL_PROCESSOR_MOV = FfmpegProcessor
 CANTALOUPE_MANUAL_PROCESSOR_MP4 = FfmpegProcessor

diff --git a/src/main/docker/configs/cantaloupe.properties.default-5.0.5 b/src/main/docker/configs/cantaloupe.properties.default-5.0.5
@@ -324,7 +324,7 @@ CANTALOUPE_MANUAL_PROCESSOR_AVI = FfmpegProcessor
 CANTALOUPE_MANUAL_PROCESSOR_BMP =
 CANTALOUPE_MANUAL_PROCESSOR_FLV = FfmpegProcessor
 CANTALOUPE_MANUAL_PROCESSOR_GIF =
-CANTALOUPE_MANUAL_PROCESSOR_JP2 = GrokProcessor
+CANTALOUPE_MANUAL_PROCESSOR_JP2 = OpenJpegProcessor
 CANTALOUPE_MANUAL_PROCESSOR_JPG = TurboJpegProcessor
 CANTALOUPE_MANUAL_PROCESSOR_MOV = FfmpegProcessor
 CANTALOUPE_MANUAL_PROCESSOR_MP4 = FfmpegProcessor

diff --git a/src/main/docker/configs/cantaloupe.properties.default-5.0.6 b/src/main/docker/configs/cantaloupe.properties.default-5.0.6
@@ -324,7 +324,7 @@ CANTALOUPE_MANUAL_PROCESSOR_AVI = FfmpegProcessor
 CANTALOUPE_MANUAL_PROCESSOR_BMP =
 CANTALOUPE_MANUAL_PROCESSOR_FLV = FfmpegProcessor
 CANTALOUPE_MANUAL_PROCESSOR_GIF =
-CANTALOUPE_MANUAL_PROCESSOR_JP2 = GrokProcessor
+CANTALOUPE_MANUAL_PROCESSOR_JP2 = OpenJpegProcessor
 CANTALOUPE_MANUAL_PROCESSOR_JPG = TurboJpegProcessor
 CANTALOUPE_MANUAL_PROCESSOR_MOV = FfmpegProcessor
 CANTALOUPE_MANUAL_PROCESSOR_MP4 = FfmpegProcessor

diff --git a/src/main/docker/configs/cantaloupe.properties.default-dev b/src/main/docker/configs/cantaloupe.properties.default-dev
@@ -324,7 +324,7 @@ CANTALOUPE_MANUAL_PROCESSOR_AVI = FfmpegProcessor
 CANTALOUPE_MANUAL_PROCESSOR_BMP =
 CANTALOUPE_MANUAL_PROCESSOR_FLV = FfmpegProcessor
 CANTALOUPE_MANUAL_PROCESSOR_GIF =
-CANTALOUPE_MANUAL_PROCESSOR_JP2 = GrokProcessor
+CANTALOUPE_MANUAL_PROCESSOR_JP2 = OpenJpegProcessor
 CANTALOUPE_MANUAL_PROCESSOR_JPG = TurboJpegProcessor
 CANTALOUPE_MANUAL_PROCESSOR_MOV = FfmpegProcessor
 CANTALOUPE_MANUAL_PROCESSOR_MP4 = FfmpegProcessor