From c114e1fd283f729c83a868dfe7b3969e659db2a4 Mon Sep 17 00:00:00 2001
From: "Davide Palma (ElDavo)" <311394@studenti.unimore.it>
Date: Thu, 9 May 2024 04:32:15 -0500
Subject: [PATCH 1/3] Use default ghidra data dir, add pip

Simplifies setups by using the default data directory path.
Adds python3-pip to the image.
---
 Dockerfile.beta | 2 +-
 entrypoint.sh   | 6 +++---
 server.conf     | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Dockerfile.beta b/Dockerfile.beta
index 516dfe4..3a1c289 100644
--- a/Dockerfile.beta
+++ b/Dockerfile.beta
@@ -2,7 +2,7 @@ FROM gradle:jdk17 as builder
 
 ENV GITHUB_URL https://github.com/NationalSecurityAgency/ghidra.git
 
-RUN apt-get update && apt-get install -y curl git bison flex build-essential unzip
+RUN apt-get update && apt-get install -y curl git bison flex build-essential unzip python3-pip
 
 RUN echo "[+] Cloning Ghidra..." \
     && git clone ${GITHUB_URL} /root/git/ghidra
diff --git a/entrypoint.sh b/entrypoint.sh
index f6410e7..d57bf81 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -9,11 +9,11 @@ if [ "$1" = 'server' ]; then
 
   # Add users
   GHIDRA_USERS=${GHIDRA_USERS:-admin}
-  if [ ! -e "/repos/users" ] && [ ! -z "${GHIDRA_USERS}" ]; then
-    mkdir -p /repos/~admin
+  if [ ! -e "/ghidra/repositories/users" ] && [ ! -z "${GHIDRA_USERS}" ]; then
+    mkdir -p /ghidra/repositories/~admin
     for user in ${GHIDRA_USERS}; do
       echo "Adding user: ${user}"
-      echo "-add ${user}" >> /repos/~admin/adm.cmd
+      echo "-add ${user}" >> /ghidra/repositories/~admin/adm.cmd
     done
   fi
 
diff --git a/server.conf b/server.conf
index a1693be..9730a73 100644
--- a/server.conf
+++ b/server.conf
@@ -120,7 +120,7 @@ wrapper.java.maxmemory=768
 # Ghidra installation directory, although an absolute path is preferred if not using default.
 # This variable is also used by the svrAdmin script.
 
-ghidra.repositories.dir=/repos
+ghidra.repositories.dir=./repositories
 
 # Ghidra server startup parameters.
 #

From b752abcd624f44c09f01a5a348d0238892b97db9 Mon Sep 17 00:00:00 2001
From: "Davide Palma (ElDavo)" <311394@studenti.unimore.it>
Date: Thu, 4 Jul 2024 05:38:23 -0500
Subject: [PATCH 2/3] Rebase to jdk 21

---
 Dockerfile.beta | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile.beta b/Dockerfile.beta
index 3a1c289..b4de4fc 100644
--- a/Dockerfile.beta
+++ b/Dockerfile.beta
@@ -1,4 +1,4 @@
-FROM gradle:jdk17 as builder
+FROM gradle:jdk21 as builder
 
 ENV GITHUB_URL https://github.com/NationalSecurityAgency/ghidra.git
 
@@ -26,7 +26,7 @@ RUN echo "[+] Unzip Ghidra..." \
     && rm -rf /ghidra/docs /ghidra/Extensions/Eclipse /ghidra/licenses
 
 ##########################################################################################
-FROM openjdk:17-jdk-slim
+FROM openjdk:21-jdk-slim
 
 LABEL maintainer "https://github.com/blacktop"
 

From b5e025cf10d351b74abeef7fc76e3e605e73582a Mon Sep 17 00:00:00 2001
From: "Davide Palma (ElDavo)" <github@davidepalma.it>
Date: Tue, 13 Aug 2024 18:51:20 +0200
Subject: [PATCH 3/3] Fix build

---
 Dockerfile.beta | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile.beta b/Dockerfile.beta
index b4de4fc..59b2ee7 100644
--- a/Dockerfile.beta
+++ b/Dockerfile.beta
@@ -10,7 +10,7 @@ RUN echo "[+] Cloning Ghidra..." \
 WORKDIR /root/git/ghidra
 
 RUN echo "[+] Downloading dependencies..." \
-    && gradle --init-script gradle/support/fetchDependencies.gradle init
+    && gradle --init-script gradle/support/fetchDependencies.gradle init --overwrite
 
 RUN echo "[+] Building Ghidra..." \
     && gradle buildNatives_linux64 \