Moving to ubuntu lunar so we can get Grok via apt-get

glenrobson · Dec 6, 2023 · 9556c9a · 9556c9a
1 parent 63c6d6a
commit 9556c9a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/docker/Linux-JDK11/Dockerfile b/docker/Linux-JDK11/Dockerfile
@@ -20,6 +20,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
                 libimage-exiftool-perl \
                 libgrokj2k1 \
                 grokj2k-tools \ 
+                adduser \
     && rm -rf /var/lib/apt/lists/*
 
 # Install TurboJpegProcessor dependencies
@@ -39,7 +40,7 @@ COPY dist/deps/Linux-x86-64/lib/* /usr/lib/
 ARG user=cantaloupe
 ARG home=/home/$user
 RUN adduser --home $home $user
-RUN chown -R $user $home
+RUN chown -R $user $home 
 USER $user
 WORKDIR $home
 

diff --git a/docker/Linux-JDK18/Dockerfile b/docker/Linux-JDK18/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:latest
+FROM ubuntu:lunar
 
 ENV JAVA_HOME=/opt/jdk
 ENV PATH=$PATH:/opt/jdk/bin:/opt/maven/bin
@@ -23,6 +23,9 @@ 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/*
 
 # Install TurboJpegProcessor dependencies
@@ -34,12 +37,12 @@ COPY dist/deps/Linux-x86-64/lib/* /usr/lib/
 
 # Install various other dependencies that aren't in apt
 # 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 ./libgrokj2k1_7.6.5-1_amd64.deb \
-    && dpkg -i --ignore-depends=libjpeg62-turbo ./grokj2k-tools_7.6.5-1_amd64.deb \
+#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://download.java.net/java/GA/jdk18/43f95e8614114aeaa8e8a5fcf20a682d/36/GPL/openjdk-18_linux-x64_bin.tar.gz \
+RUN wget -q https://download.java.net/java/GA/jdk18/43f95e8614114aeaa8e8a5fcf20a682d/36/GPL/openjdk-18_linux-x64_bin.tar.gz \
     && tar xfz openjdk-18_linux-x64_bin.tar.gz \
     && mv jdk-18 /opt/jdk \
     # Install a newer Maven than the one in apt