Verified Commit 48b437e7 authored by Sebastian Schüpbach's avatar Sebastian Schüpbach
Browse files

fix grok and no-deps issues

parent 568ced54
Pipeline #33681 failed with stages
in 9 minutes and 58 seconds
......@@ -14,7 +14,7 @@ RUN wget -q https://github.com/cantaloupe-project/cantaloupe/releases/download/v
rm cantaloupe/cantaloupe.properties.sample
ADD ./cantaloupe.properties /cantaloupe/cantaloupe.properties
FROM index.docker.io/library/openjdk:16-slim-buster
FROM index.docker.io/library/openjdk:16-slim-bullseye
# This variable assignment is mandatory to use the value in ENTRYPOINT
ENTRYPOINT ["/home/cantaloupe/run.sh", "{{ version }}"]
CMD ["-Dcantaloupe.config=/home/cantaloupe/app/cantaloupe.properties"]
......@@ -32,7 +32,7 @@ RUN apt-get -qq update
{%- if ffmpeg %}
RUN apt-get -qq install --no-install-recommends ffmpeg
{% endif -%}
{%- if turbojpeg %}
{%- if turbojpeg or grok %}
RUN mkdir -p /opt/libjpeg-turbo/lib
COPY libs /opt/libjpeg-turbo/lib
{% endif -%}
......@@ -52,16 +52,7 @@ RUN apt-get -qq install wget \
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 ./libgrokj2k1_7.6.5-1_amd64.deb \
&& dpkg -i --ignore-depends=libjpeg62-turbo ./grokj2k-tools_7.6.5-1_amd64.deb \
# Install OpenJDK
&& wget -q https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jdk_x64_linux_hotspot_16.0.1_9.tar.gz \
&& tar xfz OpenJDK16U-jdk_x64_linux_hotspot_16.0.1_9.tar.gz \
&& mv jdk-16.0.1+9 /opt/jdk \
# Install Maven (the one in apt is too old for JDK16 as of 2020-05-14)
&& wget -q https://mirrors.ocf.berkeley.edu/apache/maven/maven-3/3.8.1/binaries/apache-maven-3.8.1-bin.tar.gz \
&& tar xfz apache-maven-3.8.1-bin.tar.gz \
&& mv apache-maven-3.8.1 /opt/maven \
&& rm apache-maven-3.8.1-bin.tar.gz
&& dpkg -i --ignore-depends=libjpeg62-turbo --ignore-depends=libjpeg8 ./grokj2k-tools_7.6.5-1_amd64.deb
{% endif -%}
{%- if ffmpeg or turbojpeg or openjpeg or grok %}
RUN apt-get clean && rm -rf /var/lib/apt/lists/*
......
#!/bin/bash
java ${@:2} -jar /home/cantaloupe/app/cantaloupe-${1}.war
java ${@:2} -jar /home/cantaloupe/app/cantaloupe-${1}.jar
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment