Skip to content

Commit

Permalink
Install Thunar in our Dangerzone environments
Browse files Browse the repository at this point in the history
Install Thunar in our Dangerzone Linux environments, so that we can use
it for our drag-and-drop QA test.
  • Loading branch information
apyrgio committed Sep 10, 2024
1 parent 64f3be6 commit 8b48167
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 4 deletions.
4 changes: 4 additions & 0 deletions RELEASE.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)_
Expand Down
8 changes: 4 additions & 4 deletions dev_scripts/env.py
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@
&& 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/*
"""

Expand All @@ -166,7 +166,7 @@
# 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
Expand Down Expand Up @@ -210,7 +210,7 @@
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/*
"""

Expand All @@ -220,7 +220,7 @@
"""

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
Expand Down
4 changes: 4 additions & 0 deletions dev_scripts/qa.py
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,10 @@
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)_
Expand Down

0 comments on commit 8b48167

Please sign in to comment.