From 09a9a921675d105115d5684b4f33e79f497784ac Mon Sep 17 00:00:00 2001 From: Malte Pietsch Date: Thu, 21 Apr 2022 09:00:54 +0200 Subject: [PATCH 1/5] Update minimal gpu docker image to xpdf 4.0.4 --- Dockerfile-GPU-minimal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile-GPU-minimal b/Dockerfile-GPU-minimal index 5c08dd35e9..16fe03dd0e 100644 --- a/Dockerfile-GPU-minimal +++ b/Dockerfile-GPU-minimal @@ -21,7 +21,7 @@ RUN apt-get update && apt-get install -y software-properties-common && \ # Cleanup apt cache rm -rf /var/lib/apt/lists/* && \ # Install PDF converter - curl -s https://dl.xpdfreader.com/xpdf-tools-linux-4.03.tar.gz \ + curl -s https://dl.xpdfreader.com/xpdf-tools-linux-4.04.tar.gz \ | tar -xvzf - -C /usr/local/bin --strip-components=2 xpdf-tools-linux-4.03/bin64/pdftotext # Copy Haystack package files but not the source code From 91e4d4e26c3f638e27298b211fcd79b101a0656b Mon Sep 17 00:00:00 2001 From: Malte Pietsch Date: Thu, 21 Apr 2022 09:03:44 +0200 Subject: [PATCH 2/5] Update Dockerfile-GPU --- Dockerfile-GPU | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile-GPU b/Dockerfile-GPU index c1114f44b2..06b76437c6 100644 --- a/Dockerfile-GPU +++ b/Dockerfile-GPU @@ -26,7 +26,7 @@ RUN apt-get update && apt-get install -y software-properties-common && \ rm -rf /var/lib/apt/lists/* # Install PDF converter -RUN curl -s https://dl.xpdfreader.com/xpdf-tools-linux-4.03.tar.gz | tar -xvzf - -C /usr/local/bin --strip-components=2 xpdf-tools-linux-4.03/bin64/pdftotext +RUN curl -s https://dl.xpdfreader.com/xpdf-tools-linux-4.04.tar.gz | tar -xvzf - -C /usr/local/bin --strip-components=2 xpdf-tools-linux-4.03/bin64/pdftotext # Set default Python version RUN update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.7 1 && \ From 31ad6aefae0a7ba4cff722b32f4703e599f6a6de Mon Sep 17 00:00:00 2001 From: Malte Pietsch Date: Thu, 21 Apr 2022 09:04:22 +0200 Subject: [PATCH 3/5] Update Dockerfile --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8c9b598cfd..6efba800f3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,8 +14,8 @@ RUN apt-get update && apt-get install -y \ rm -rf /var/lib/apt/lists/* # Install PDF converter -RUN wget --no-check-certificate https://dl.xpdfreader.com/xpdf-tools-linux-4.03.tar.gz && \ - tar -xvf xpdf-tools-linux-4.03.tar.gz && cp xpdf-tools-linux-4.03/bin64/pdftotext /usr/local/bin +RUN wget --no-check-certificate https://dl.xpdfreader.com/xpdf-tools-linux-4.04.tar.gz && \ + tar -xvf xpdf-tools-linux-4.04.tar.gz && cp xpdf-tools-linux-4.04/bin64/pdftotext /usr/local/bin # Copy Haystack code COPY haystack /home/user/haystack/ From 31a539359103cfd01138f1747bb3a73df4b4b657 Mon Sep 17 00:00:00 2001 From: Malte Pietsch Date: Thu, 21 Apr 2022 09:05:07 +0200 Subject: [PATCH 4/5] Update Dockerfile-GPU --- Dockerfile-GPU | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile-GPU b/Dockerfile-GPU index 06b76437c6..6f9a2ecf8e 100644 --- a/Dockerfile-GPU +++ b/Dockerfile-GPU @@ -26,7 +26,7 @@ RUN apt-get update && apt-get install -y software-properties-common && \ rm -rf /var/lib/apt/lists/* # Install PDF converter -RUN curl -s https://dl.xpdfreader.com/xpdf-tools-linux-4.04.tar.gz | tar -xvzf - -C /usr/local/bin --strip-components=2 xpdf-tools-linux-4.03/bin64/pdftotext +RUN curl -s https://dl.xpdfreader.com/xpdf-tools-linux-4.04.tar.gz | tar -xvzf - -C /usr/local/bin --strip-components=2 xpdf-tools-linux-4.04/bin64/pdftotext # Set default Python version RUN update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.7 1 && \ From 1776b5b73f48b236366747dbdc3c38917413ca55 Mon Sep 17 00:00:00 2001 From: Malte Pietsch Date: Thu, 21 Apr 2022 09:05:25 +0200 Subject: [PATCH 5/5] Update Dockerfile-GPU-minimal --- Dockerfile-GPU-minimal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile-GPU-minimal b/Dockerfile-GPU-minimal index 16fe03dd0e..34143d4609 100644 --- a/Dockerfile-GPU-minimal +++ b/Dockerfile-GPU-minimal @@ -22,7 +22,7 @@ RUN apt-get update && apt-get install -y software-properties-common && \ rm -rf /var/lib/apt/lists/* && \ # Install PDF converter curl -s https://dl.xpdfreader.com/xpdf-tools-linux-4.04.tar.gz \ - | tar -xvzf - -C /usr/local/bin --strip-components=2 xpdf-tools-linux-4.03/bin64/pdftotext + | tar -xvzf - -C /usr/local/bin --strip-components=2 xpdf-tools-linux-4.04/bin64/pdftotext # Copy Haystack package files but not the source code COPY setup.py setup.cfg pyproject.toml VERSION.txt LICENSE README.md /home/user/