Skip to content

Commit

Permalink
Remove Grok
Browse files Browse the repository at this point in the history
  • Loading branch information
jcoyne committed Sep 16, 2024
1 parent 3722b07 commit 1fe89ec
Show file tree
Hide file tree
Showing 14 changed files with 5 additions and 852 deletions.
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ continuous integration. The following dependencies are required:

* MinIO (for S3SourceTest & S3CacheTest)
* FFmpeg (for FfmpegProcessorTest)
* Grok (for GrokProcessorTest)
* OpenJPEG (for OpenJpegProcessorTest)
* TurboJPEG with Java binding (for TurboJpegProcessorTest)
* Redis (for RedisCacheTest)
Expand Down
10 changes: 1 addition & 9 deletions cantaloupe.properties.sample
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,7 @@ JdbcSource.connection_timeout = 10
processor.selection_strategy = AutomaticSelectionStrategy

# Built-in processors are `Java2dProcessor`, TurboJpegProcessor`,
# `KakaduNativeProcessor`, `OpenJpegProcessor`, `GrokProcessor`,`JaiProcessor`,
# `KakaduNativeProcessor`, `OpenJpegProcessor`, `JaiProcessor`,
# `PdfBoxProcessor`, and `FfmpegProcessor`.
# Some of these have third-party dependencies and won't work out-of-the-box.

Expand Down Expand Up @@ -443,14 +443,6 @@ FfmpegProcessor.path_to_binaries =
# Overrides the PATH.
OpenJpegProcessor.path_to_binaries =

#----------------------------------------
# GrokProcessor
#----------------------------------------

# Optional absolute path of the directory containing grk_decompress.
# Overrides the PATH.
GrokProcessor.path_to_binaries =

#----------------------------------------
# PdfBoxProcessor
#----------------------------------------
Expand Down
8 changes: 0 additions & 8 deletions docker/Linux-GraalVM20/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
zlib1g-dev \
libwebp-dev \
libimage-exiftool-perl \
libgrokj2k1 \
grokj2k-tools \
adduser \
&& rm -rf /var/lib/apt/lists/*

Expand All @@ -32,12 +30,6 @@ COPY docker/image_files/libjpeg-turbo/lib64 /opt/libjpeg-turbo/lib
# Install KakaduNativeProcessor dependencies
COPY dist/deps/Linux-x86-64/lib/* /usr/lib/

# Install GrokProcessor dependencies
#RUN wget -q https://github.com/GrokImageCompression/grok/releases/download/v7.6.5/libgrokj2k1_7.6.5-1_amd64.deb \
# && wget -q https://github.com/GrokImageCompression/grok/releases/download/v7.6.5/grokj2k-tools_7.6.5-1_amd64.deb \
# && dpkg -i --ignore-depends=libjpeg62-turbo ./grokj2k-tools_7.6.5-1_amd64.deb
# && dpkg -i ./libgrokj2k1_7.6.5-1_amd64.deb \

# Install GraalVM
RUN wget -q https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-20.3.0/graalvm-ce-java11-linux-amd64-20.3.0.tar.gz \
&& tar xfz graalvm-ce-java11-linux-amd64-20.3.0.tar.gz \
Expand Down
4 changes: 0 additions & 4 deletions docker/Linux-JDK22/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ ARG DEBIAN_FRONTEND=noninteractive
# * ffmpeg is needed by FfmpegProcessor
# * wget download stuffs in this dockerfile
# * libopenjp2-tools is needed by OpenJpegProcessor
# * All the rest is needed by GrokProcessor
RUN apt-get update && apt-get install -y --no-install-recommends \
ca-certificates \
ffmpeg \
Expand All @@ -23,8 +22,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
zlib1g-dev \
libwebp-dev \
libimage-exiftool-perl \
libgrokj2k1 \
grokj2k-tools \
adduser \
&& rm -rf /var/lib/apt/lists/*

Expand All @@ -35,7 +32,6 @@ COPY docker/image_files/libjpeg-turbo/lib64 /opt/libjpeg-turbo/lib
# Install KakaduNativeProcessor dependencies
COPY dist/deps/Linux-x86-64/lib/* /usr/lib/

# Install various other dependencies that aren't in apt
# Install OpenJDK
RUN wget -q https://download.java.net/java/GA/jdk22.0.2/c9ecb94cd31b495da20a27d4581645e8/9/GPL/openjdk-22.0.2_linux-x64_bin.tar.gz \
&& tar xfz openjdk-22.0.2_linux-x64_bin.tar.gz \
Expand Down
3 changes: 1 addition & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,7 @@
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>htmlunit-driver</artifactId>
<version>2.21</version>
<version>2.21</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -568,7 +568,6 @@
<exclude>FfmpegProcessorTest</exclude>
<exclude>*Kakadu*Test</exclude>
<exclude>OpenJpegProcessorTest</exclude>
<exclude>GrokProcessorTest</exclude>
<exclude>RedisCacheTest</exclude>
<exclude>TurboJpegProcessorTest</exclude>
<exclude>TurboJPEG*Test</exclude>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,6 @@ public enum Key {
MAX_SCALE("max_scale"),
META_IDENTIFIER_TRANSFORMER("meta_identifier.transformer"),
OPENJPEGPROCESSOR_PATH_TO_BINARIES("OpenJpegProcessor.path_to_binaries"),
GROKPROCESSOR_PATH_TO_BINARIES("GrokProcessor.path_to_binaries"),
OVERLAY_ENABLED("overlays.BasicStrategy.enabled"),
OVERLAY_IMAGE("overlays.BasicStrategy.image"),
OVERLAY_INSET("overlays.BasicStrategy.inset"),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@ class AutomaticSelectionStrategy implements SelectionStrategy {

private static final List<Class<? extends Processor>> JP2_CANDIDATES = List.of(
KakaduNativeProcessor.class,
OpenJpegProcessor.class,
GrokProcessor.class);
OpenJpegProcessor.class);
private static final List<Class<? extends Processor>> JPG_CANDIDATES = List.of(
TurboJpegProcessor.class,
Java2dProcessor.class);
Expand Down
Loading

0 comments on commit 1fe89ec

Please sign in to comment.