From 92852f60a843b338bfad586ca1fe06d6b5432cc3 Mon Sep 17 00:00:00 2001
From: cccs-rs <62077998+cccs-rs@users.noreply.github.com>
Date: Mon, 17 Jun 2024 16:14:40 +0000
Subject: [PATCH] Update package list

---
 Dockerfile       |  8 --------
 pkglist.txt      | 12 +-----------
 requirements.txt |  4 ++--
 3 files changed, 3 insertions(+), 21 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 3d8abe2..a8edf8c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,6 @@ ARG branch=latest
 FROM cccs/assemblyline-v4-service-base:$branch
 
 ENV SERVICE_PATH pixaxe.pixaxe.Pixaxe
-ENV TESSERACT_VERSION 5.3.0
 
 # Switch to root user
 USER root
@@ -11,13 +10,6 @@ USER root
 COPY pkglist.txt pkglist.txt
 RUN apt-get update && grep -vE '^#' pkglist.txt | xargs apt-get install -y && rm -rf /var/lib/apt/lists/*
 
-# Install Tesseract from source
-RUN wget https://github.com/tesseract-ocr/tesseract/archive/refs/tags/${TESSERACT_VERSION}.tar.gz
-RUN tar -xvf ${TESSERACT_VERSION}.tar.gz
-WORKDIR tesseract-${TESSERACT_VERSION}
-RUN ./autogen.sh && ./configure --disable-dependency-tracking && make && make install && ldconfig
-RUN wget https://raw.githubusercontent.com/tesseract-ocr/tessdata/main/eng.traineddata -O /usr/local/share/tessdata/eng.traineddata
-
 # Switch to assemblyline user
 USER assemblyline
 
diff --git a/pkglist.txt b/pkglist.txt
index a75a52c..ed306b5 100644
--- a/pkglist.txt
+++ b/pkglist.txt
@@ -7,17 +7,7 @@ libmagickwand-dev
 libgl1
 
 # Tesseract
-g++
-autoconf
-automake
-libtool
-pkg-config
-libpng-dev
-libtiff5-dev
-zlib1g-dev
-libleptonica-dev
-libpango1.0-dev
-build-essential
+tesseract-ocr
 
 # Used for decoding QR codes
 zbar-tools
diff --git a/requirements.txt b/requirements.txt
index f1ff72c..64150fa 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,5 @@
 Pillow
-numpy
+numpy<2
 scipy
 matplotlib
 pytesseract
@@ -7,4 +7,4 @@ stegano
 wand
 cairosvg
 multidecoder
-opencv-python
\ No newline at end of file
+opencv-python