From 6ad1dce2d87d380f2c1aee62183bedeab951c01b Mon Sep 17 00:00:00 2001
From: "Michael F." <michael.froewis@gmx.at>
Date: Fri, 5 Jan 2024 10:32:51 +0100
Subject: [PATCH] harmonize directory usage

---
 Dockerfile          | 9 ++++-----
 README.md           | 6 +++---
 docker-compose.yaml | 4 ++--
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 450a67d..8520ea5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,17 +14,16 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && \
     apt-get install --no-install-recommends -y \
         libgoogle-perftools4 \
         wget && \
-    useradd -m -r -u $UID -d /home/dockeruser dockeruser &&  \
+    useradd -m -r -u $UID -d /opt/graphsense dockeruser &&  \
     mkdir -p /opt/graphsense/data && \
-    chown -R dockeruser /opt/graphsense
-RUN wget https://github.com/tronprotocol/java-tron/releases/download/GreatVoyage-v4.7.3/FullNode.jar -O /home/dockeruser/FullNode.jar && \
-    chown dockeruser:dockeruser /home/dockeruser/FullNode.jar
+    chown -R dockeruser /opt/graphsenseq
 
 USER dockeruser
+RUN wget https://github.com/tronprotocol/java-tron/releases/download/GreatVoyage-v4.7.3/FullNode.jar -O /opt/graphsense/FullNode.jar
 ENV LD_PRELOAD="/usr/lib/x86_64-linux-gnu/libtcmalloc.so.4"
 ENV TCMALLOC_RELEASE_RATE=10
 ADD conf/main_net_config.conf /opt/graphsense/client.conf
 ADD logback.xml /opt/graphsense/logback.xml
-WORKDIR /home/dockeruser
+WORKDIR /opt/graphsense
 
 CMD ["java", "-Xmx24g", "-XX:+UseConcMarkSweepGC", "-jar", "FullNode.jar", "-c", "/opt/graphsense/client.conf", "--output-directory", "/opt/graphsense/data", "--log-config", "/opt/graphsense/logback.xml"]
diff --git a/README.md b/README.md
index cc6929f..c606e10 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ Client data is persisted on the host machine using a Docker volume.
 In the default setting the local directory `./data` is mapped to
 to `/opt/graphsense/data` inside the container.
 Logs are stored in the log directory created by the tron client 
-which resides in `/home/dockeruser/logs` and is by default mapped
+which resides in `/opt/graphsense/logs` and is by default mapped
 to `./logs/`. To override these settings 
 a Docker Compose override file can be used, e.g.
 
@@ -31,10 +31,10 @@ services:
   tron-client:
     volumes:
       - ./data:/opt/graphsense/data
-      - ./logs:/home/dockeruser/logs
+      - ./logs:/opt/graphsense/logs
 ```
 
-The data directory on the host system must be writeable by user `dockeruser`.
+The data directory on the host system must be writeable by user `dockeruser`. To provide your own customized java-tron config, just map it at ```/opt/graphsense/client.conf```.
 
 ## Usage
 
diff --git a/docker-compose.yaml b/docker-compose.yaml
index b4eda9c..ffc0f17 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -11,8 +11,8 @@ services:
       dockerfile: ./Dockerfile
     volumes:
       - ./data/:/opt/graphsense/data:Z
-      - ./conf/main_net_config.conf:/opt/graphsense/client2.conf:Z
-      - ./logs/:/home/dockeruser/logs:Z
+      - ./conf/main_net_config.conf:/opt/graphsense/client.conf:Z
+      - ./logs/:/opt/graphsense/logs:Z
     ports:
       - 50545:50545
       - 50555:50555