From 2c7be8f2584c54701cb24e8703277cea7a596d92 Mon Sep 17 00:00:00 2001 From: Austin Gibbons Date: Wed, 29 May 2024 11:02:29 -0400 Subject: [PATCH 1/2] Update dockerfile to use new libewf version. --- docker/thumbtack/Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docker/thumbtack/Dockerfile b/docker/thumbtack/Dockerfile index 7ff0d68..094ce11 100644 --- a/docker/thumbtack/Dockerfile +++ b/docker/thumbtack/Dockerfile @@ -19,12 +19,12 @@ RUN pip install thumbtack==0.4.2 WORKDIR "tmp/" RUN apt install -y wget -RUN wget https://github.com/libyal/libewf/releases/download/20201230/libewf-experimental-20201230.tar.gz -RUN tar -xf libewf-experimental-20201230.tar.gz -WORKDIR "/tmp/libewf-20201230/" +RUN wget https://github.com/libyal/libewf/releases/download/20240506/libewf-experimental-20240506.tar.gz +RUN tar -xf libewf-experimental-20240506.tar.gz +WORKDIR "/tmp/libewf-20240506/" RUN ./configure --enable-python3 --with-libfuse && make && make install RUN cp /usr/local/lib/libewf* /usr/lib/ -RUN rm -rf /tmp/libewf-experimental-20201230* +RUN rm -rf /tmp/libewf-experimental-20240506* WORKDIR "/" From b802eeb20ff84a81d95b24e0a8eba1140c9e5096 Mon Sep 17 00:00:00 2001 From: Austin Gibbons Date: Wed, 29 May 2024 11:21:22 -0400 Subject: [PATCH 2/2] Remove mountpoint directory check. --- docker/thumbtack/.gitignore | 1 + src/thumbtack/views.py | 4 ---- 2 files changed, 1 insertion(+), 4 deletions(-) create mode 100644 docker/thumbtack/.gitignore diff --git a/docker/thumbtack/.gitignore b/docker/thumbtack/.gitignore new file mode 100644 index 0000000..704d307 --- /dev/null +++ b/docker/thumbtack/.gitignore @@ -0,0 +1 @@ +*.whl diff --git a/src/thumbtack/views.py b/src/thumbtack/views.py index 92f1ff5..f149e0c 100644 --- a/src/thumbtack/views.py +++ b/src/thumbtack/views.py @@ -114,10 +114,6 @@ def add_mountpoint_form(): if mountpoint_path is None or mountpoint_path == "": status = "No mountpoint provided." return render_template("form_complete.html", status=status) - if not os.path.isdir(mountpoint_path): - status = f"Could not find {mountpoint_path}. Ensure the mountpoint exists before adding it to thumbtack." - return render_template("form_complete.html", status=status) - if operation == "add_mountpoint": mounted_disk = add_mountpoint(rel_path, mountpoint_path) if mounted_disk: