From 949c0ea87f245e04de31f619c8697a27e204b3f1 Mon Sep 17 00:00:00 2001
From: Davide Arcuri <davide.arcuri@leonardo.com>
Date: Thu, 18 Jan 2024 17:01:49 +0100
Subject: [PATCH] use dockerfile instead of volume

---
 CHANGELOG.md                    | 5 +++--
 compose/local/dask/Dockerfile   | 1 +
 compose/local/django/Dockerfile | 2 ++
 docker-compose.yml              | 2 --
 orochi/website/views.py         | 8 ++++----
 5 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0a235dea..72da005e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,10 +1,11 @@
 ## Changelog
 
 <details open>
-  <summary><b>WIP</b></summary>
+  <summary><b>OROCHI 2.0.1 [2024/01/18]</b></summary>
 
+  * Add tree visualization for other plugin
   * Add support for linux dump
-  * Paginate analysis result
+  * Paginate analysis results in table
 </details>
 
 <details>
diff --git a/compose/local/dask/Dockerfile b/compose/local/dask/Dockerfile
index dd451366..4878e611 100644
--- a/compose/local/dask/Dockerfile
+++ b/compose/local/dask/Dockerfile
@@ -47,6 +47,7 @@ COPY ./compose/local/dask/prepare.sh /usr/bin/prepare.sh
 RUN chmod +x /usr/bin/prepare.sh
 
 COPY ./compose/local/dask/daskworkerinit.py /opt/daskworkerinit.py
+COPY ./compose/local/__init__.py /src/volatility3/volatility3/framework/constants/__init__.py
 
 WORKDIR /app
 COPY . .
diff --git a/compose/local/django/Dockerfile b/compose/local/django/Dockerfile
index a06b6c49..6e93aa2c 100644
--- a/compose/local/django/Dockerfile
+++ b/compose/local/django/Dockerfile
@@ -66,6 +66,8 @@ WORKDIR /
 COPY ./requirements /requirements
 RUN pip install -r /requirements/local.txt --ignore-installed ruamel.yaml
 
+COPY ./compose/local/__init__.py /src/volatility3/volatility3/framework/constants/__init__.py
+
 WORKDIR /app
 COPY . .
 COPY ./compose/local/django/entrypoint /entrypoint
diff --git a/docker-compose.yml b/docker-compose.yml
index 5a733040..2608ec48 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -33,7 +33,6 @@ services:
       - plugin_path:/src/volatility3/volatility3/framework/plugins/custom
       - yara_path:/yara
       - cache_path:/root/.cache/volatility3
-      - ./compose/local/__init__.py:/src/volatility3/volatility3/framework/constants/__init__.py
     env_file:
       - ./.envs/.local/.django
       - ./.envs/.local/.postgres
@@ -178,7 +177,6 @@ services:
       - plugin_path:/src/volatility3/volatility3/framework/plugins/custom
       - yara_path:/yara
       - cache_path:/root/.cache/volatility3
-      - ./compose/local/__init__.py:/src/volatility3/volatility3/framework/constants/__init__.py
     env_file:
       - ./.envs/.local/.django
       - ./.envs/.local/.postgres
diff --git a/orochi/website/views.py b/orochi/website/views.py
index c09c0222..eff6a810 100644
--- a/orochi/website/views.py
+++ b/orochi/website/views.py
@@ -87,14 +87,14 @@
 SYSTEM_COLUMNS = ["orochi_createdAt", "orochi_os", "orochi_plugin"]
 
 PLUGIN_WITH_CHILDREN = [
-    "windows.pstree.pstree",
-    "linux.pstree.pstree",
-    "linux.iomem.iomem",
-    "windows.registry.userassist.userassist",
     "frameworkinfo.frameworkinfo",
+    "linux.iomem.iomem",
+    "linux.pstree.pstree",
     "windows.devicetree.devicetree",
     "windows.mbrscan.mbrscan",
     "windows.mftscan.mftscan",
+    "windows.pstree.pstree",
+    "windows.registry.userassist.userassist",
 ]