From 40f50867933b703e3435b8cef20d08fa49c13236 Mon Sep 17 00:00:00 2001
From: Justin Coyne <jcoyne@justincoyne.com>
Date: Fri, 16 Aug 2024 09:54:36 -0500
Subject: [PATCH] Update base Linux image to ubuntu 24.04 (Noble Numbat)

---
 docker/Linux-JDK11/Dockerfile | 38 +++++++++++++-------------
 docker/Linux-JDK17/Dockerfile |  2 +-
 docker/Linux-JDK18/Dockerfile | 50 +++++++++++++++++------------------
 docker/Linux-JDK21/Dockerfile |  2 +-
 4 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/docker/Linux-JDK11/Dockerfile b/docker/Linux-JDK11/Dockerfile
index 3129f9a73..28464a3d5 100644
--- a/docker/Linux-JDK11/Dockerfile
+++ b/docker/Linux-JDK11/Dockerfile
@@ -1,27 +1,27 @@
-FROM ubuntu:lunar
+FROM ubuntu:noble
 
 ARG DEBIAN_FRONTEND=noninteractive
 
 # Install various dependencies
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
-        openjdk-11-jdk-headless \
-		ffmpeg \
-		maven \
-		wget \
-  		libopenjp2-tools \
-                liblcms2-dev \
-                libpng-dev \
-                libzstd-dev \
-                libtiff-dev \
-                libjpeg-dev \
-                zlib1g-dev \
-                libwebp-dev \
-                libimage-exiftool-perl \
-                libgrokj2k1 \
-                grokj2k-tools \ 
-                adduser \
-    && rm -rf /var/lib/apt/lists/*
+  openjdk-11-jdk-headless \
+  ffmpeg \
+  maven \
+  wget \
+  libopenjp2-tools \
+  liblcms2-dev \
+  libpng-dev \
+  libzstd-dev \
+  libtiff-dev \
+  libjpeg-dev \
+  zlib1g-dev \
+  libwebp-dev \
+  libimage-exiftool-perl \
+  libgrokj2k1 \
+  grokj2k-tools \
+  adduser \
+  && rm -rf /var/lib/apt/lists/*
 
 # Install TurboJpegProcessor dependencies
 RUN mkdir -p /opt/libjpeg-turbo/lib
@@ -40,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-JDK17/Dockerfile b/docker/Linux-JDK17/Dockerfile
index 838170a37..b9f415b86 100644
--- a/docker/Linux-JDK17/Dockerfile
+++ b/docker/Linux-JDK17/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:lunar
+FROM ubuntu:noble
 
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/docker/Linux-JDK18/Dockerfile b/docker/Linux-JDK18/Dockerfile
index ac131292b..b999ca32a 100644
--- a/docker/Linux-JDK18/Dockerfile
+++ b/docker/Linux-JDK18/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:lunar
+FROM ubuntu:noble
 
 ENV JAVA_HOME=/opt/jdk
 ENV PATH=$PATH:/opt/jdk/bin:/opt/maven/bin
@@ -11,22 +11,22 @@ ARG DEBIAN_FRONTEND=noninteractive
 # * 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 \
-    wget \
-    libopenjp2-tools \
-    liblcms2-dev \
-    libpng-dev \
-    libzstd-dev \
-    libtiff-dev \
-    libjpeg-dev \
-    zlib1g-dev \
-    libwebp-dev \
-    libimage-exiftool-perl \
-    libgrokj2k1 \
-    grokj2k-tools \ 
-    adduser \
-    && rm -rf /var/lib/apt/lists/*
+  ca-certificates \
+  ffmpeg \
+  wget \
+  libopenjp2-tools \
+  liblcms2-dev \
+  libpng-dev \
+  libzstd-dev \
+  libtiff-dev \
+  libjpeg-dev \
+  zlib1g-dev \
+  libwebp-dev \
+  libimage-exiftool-perl \
+  libgrokj2k1 \
+  grokj2k-tools \
+  adduser \
+  && rm -rf /var/lib/apt/lists/*
 
 # Install TurboJpegProcessor dependencies
 RUN mkdir -p /opt/libjpeg-turbo/lib
@@ -41,15 +41,15 @@ COPY dist/deps/Linux-x86-64/lib/* /usr/lib/
 #    && 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
+# Install OpenJDK
 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
-    && wget -q https://dlcdn.apache.org/maven/maven-3/3.8.8/binaries/apache-maven-3.8.8-bin.tar.gz \
-    && tar xfz apache-maven-3.8.8-bin.tar.gz \
-    && mv apache-maven-3.8.8 /opt/maven \
-    && rm apache-maven-3.8.8-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
+  && wget -q https://dlcdn.apache.org/maven/maven-3/3.8.8/binaries/apache-maven-3.8.8-bin.tar.gz \
+  && tar xfz apache-maven-3.8.8-bin.tar.gz \
+  && mv apache-maven-3.8.8 /opt/maven \
+  && rm apache-maven-3.8.8-bin.tar.gz
 
 # A non-root user is needed for some FilesystemSourceTest tests to work.
 ARG user=cantaloupe
diff --git a/docker/Linux-JDK21/Dockerfile b/docker/Linux-JDK21/Dockerfile
index 78b428bee..c25cdb569 100644
--- a/docker/Linux-JDK21/Dockerfile
+++ b/docker/Linux-JDK21/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:lunar
+FROM ubuntu:noble
 
 ARG DEBIAN_FRONTEND=noninteractive