From 3002849b7f72abbe7c08b62faad6e8bb106f0e95 Mon Sep 17 00:00:00 2001
From: Alex Pyrgiotis <alex.p@freedom.press>
Date: Wed, 24 Jul 2024 02:06:29 +0300
Subject: [PATCH] Install Thunar in our Dangerzone environments

Install Thunar in our Dangerzone Linux environments, so that we can use
it for our drag-and-drop QA test.
---
 RELEASE.md         | 4 ++++
 dev_scripts/env.py | 8 ++++----
 dev_scripts/qa.py  | 4 ++++
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/RELEASE.md b/RELEASE.md
index 01172f2..5c578b4 100644
--- a/RELEASE.md
+++ b/RELEASE.md
@@ -207,6 +207,10 @@ Run Dangerzone against a list of documents, and tick all options. Ensure that:
 Run Dangerzone against a set of documents that you drag-n-drop. Files should be
 added and conversion should run without issue.
 
+> [!TIP]
+> On our end-user container environments for Linux, we can start a file manager
+> with `thunar &`.
+
 #### 9. Dangerzone CLI succeeds in converting multiple documents
 
 _(Only for Windows and Linux)_
diff --git a/dev_scripts/env.py b/dev_scripts/env.py
index 39bdb26..e6552f8 100755
--- a/dev_scripts/env.py
+++ b/dev_scripts/env.py
@@ -152,7 +152,7 @@ RUN bash -c 'if [[ "$(pipx --version)" < "1" ]]; then \
                 && rm -rf /var/lib/apt/lists/*; \
               else true; fi'
 RUN apt-get update \
-    && apt-get install -y --no-install-recommends mupdf \
+    && apt-get install -y --no-install-recommends mupdf thunar \
     && rm -rf /var/lib/apt/lists/*
 """
 
@@ -166,7 +166,7 @@ RUN dnf install -y git rpm-build podman python3 python3-devel python3-poetry-cor
 # See https://github.com/freedomofpress/dangerzone/issues/286#issuecomment-1347149783
 RUN rpm --restore shadow-utils
 
-RUN dnf install -y mupdf && dnf clean all
+RUN dnf install -y mupdf thunar && dnf clean all
 """
 
 # The Dockerfile for building a development environment for Dangerzone. Parts of the
@@ -210,7 +210,7 @@ RUN cd /home/user/dangerzone && poetry --no-ansi install
 DOCKERFILE_BUILD_DEBIAN_DEPS = r"""
 ARG DEBIAN_FRONTEND=noninteractive
 RUN apt-get update \
-    && apt-get install -y --no-install-recommends mupdf \
+    && apt-get install -y --no-install-recommends mupdf thunar \
     && rm -rf /var/lib/apt/lists/*
 """
 
@@ -220,7 +220,7 @@ RUN dnf install -y /tmp/pyside6.rpm
 """
 
 DOCKERFILE_BUILD_FEDORA_DEPS = r"""
-RUN dnf install -y mupdf && dnf clean all
+RUN dnf install -y mupdf thunar && dnf clean all
 
 # FIXME: Drop this fix after it's resolved upstream.
 # See https://github.com/freedomofpress/dangerzone/issues/286#issuecomment-1347149783
diff --git a/dev_scripts/qa.py b/dev_scripts/qa.py
index 318312d..5b883fe 100755
--- a/dev_scripts/qa.py
+++ b/dev_scripts/qa.py
@@ -158,6 +158,10 @@ Run Dangerzone against a list of documents, and tick all options. Ensure that:
 Run Dangerzone against a set of documents that you drag-n-drop. Files should be
 added and conversion should run without issue.
 
+> [!TIP]
+> On our end-user container environments for Linux, we can start a file manager
+> with `thunar &`.
+
 #### 9. Dangerzone CLI succeeds in converting multiple documents
 
 _(Only for Windows and Linux)_