From 3bf74841bb2aee18f4e9149fcf6febd812d194b0 Mon Sep 17 00:00:00 2001
From: zontreck <tarapiccari@gmail.com>
Date: Fri, 21 Mar 2025 00:43:52 -0700
Subject: [PATCH] Add maven to build environment

---
 DebianBuilder/Dockerfile | 41 +++++++++++++++++++++++-----------------
 1 file changed, 24 insertions(+), 17 deletions(-)

diff --git a/DebianBuilder/Dockerfile b/DebianBuilder/Dockerfile
index 661dd3c..9efa1ff 100644
--- a/DebianBuilder/Dockerfile
+++ b/DebianBuilder/Dockerfile
@@ -3,7 +3,10 @@ FROM git.zontreck.com/packages/debian:base
 ENV GRADLE_VERSION 8.12
 RUN apt-get install -y build-essential  && apt-get clean -y
 
-RUN apt-get install -y cmake ninja-build openjdk-17-jdk nasm git curl wget openjdk-17-jre clang pkg-config libgtk-3-dev lldb libglu1-mesa libpulse0 cargo python3-dev libffi-dev libssl-dev apt-utils fonts-liberation libgtk-4-1 libgbm1 libu2f-udev libvulkan1 xdg-utils gradle nasm mercurial && apt-get clean -y
+
+RUN wget https://packages.microsoft.com/config/debian/12/packages-microsoft-prod.deb -O packages-microsoft-prod.deb && \
+    dpkg -i packages-microsoft-prod.deb && \
+    rm packages-microsoft-prod.deb
 
 
 RUN apt-get install -y \ 
@@ -29,14 +32,23 @@ RUN apt-get install -y \
     libxxf86vm-dev\
     linux-libc-dev\
     ocl-icd-opencl-dev\
+    cmake ninja-build \ 
+    openjdk-17-jdk nasm \
+    git curl wget \
+    openjdk-17-jre clang \
+    pkg-config libgtk-3-dev \
+    lldb libglu1-mesa libpulse0 \
+    cargo python3-dev \
+    libffi-dev libssl-dev \
+    apt-utils fonts-liberation \
+    libgtk-4-1 libgbm1 \
+    libu2f-udev libvulkan1 \
+    xdg-utils gradle \
+    nasm mercurial \
     patch\
     perl\
     sharutils\
-    unixodbc-dev\
-    x11proto-xinerama-dev\
-    && apt clean -y
-
-RUN apt-get install -y \
+    maven \
     sqlite3 libsqlite3-dev \
     libevent-dev \
     libboost-dev \
@@ -45,23 +57,18 @@ RUN apt-get install -y \
     qtbase5-dev qttools5-dev qttools5-dev-tools \
     qtwayland5 \
     libqrencode-dev \
-    && apt clean -y
-
-RUN apt-get install -y \
+    unixodbc-dev\
     nsis lld llvm zip \
     g++-mingw-w64-x86-64-posix g++-multilib binutils \
     xz-utils curl cmake make \
-    bison g++ pkgconf
+    bison g++ pkgconf \
+    dotnet-sdk-7.0 \
+    dotnet-sdk-8.0 \
+    x11proto-xinerama-dev\
+    && apt clean -y
 
 
 
-RUN wget https://packages.microsoft.com/config/debian/12/packages-microsoft-prod.deb -O packages-microsoft-prod.deb && \
-    dpkg -i packages-microsoft-prod.deb && \
-    rm packages-microsoft-prod.deb
-
-RUN apt-get update && apt-get install -y dotnet-sdk-8.0 && apt clean -y
-RUN apt-get install -y dotnet-sdk-7.0 && apt clean -y
-
 WORKDIR /root/.ssh