Merge branch 'iped-docker:master' into master

Dockerfile.dependencies

@@ -4,7 +4,7 @@ FROM ubuntu:22.04
 ARG PKGTMPDIR=/tmp/pkgs
 
 ENV TZ=Brazil/East DEBIAN_FRONTEND=noninteractive LANG=C.UTF-8 LC_ALL=C.UTF-8 SAL_USE_VCLPLUGIN='gtk' \
-    JAVA_HOME=/usr/lib/jvm/bellsoft-java11-full-amd64/ LD_LIBRARY_PATH=/usr/local/lib/python3.9/dist-packages/jep/
+    JAVA_HOME=/usr/lib/jvm/bellsoft-java11-full-amd64/ LD_LIBRARY_PATH=/usr/lib/:/usr/local/lib/python3.9/dist-packages/jep/
 
 RUN mkdir -p ${PKGTMPDIR} && cd ${PKGTMPDIR} \
     && apt-get update && apt-get install -y curl wget gnupg apt-utils apt-transport-https software-properties-common \
@@ -59,7 +59,7 @@ RUN mkdir -p ${PKGTMPDIR} && cd ${PKGTMPDIR} \
     && echo "install libbfio" \
     && echo "#####################################" \
     && cd ${PKGTMPDIR} \
-    && git clone -b 20240414 https://github.com/libyal/libbfio \
+    && git clone https://github.com/libyal/libbfio \
     && cd ${PKGTMPDIR}/libbfio \ 
     && ./synclibs.sh \
     && ./autogen.sh \
@@ -103,7 +103,7 @@ RUN mkdir -p ${PKGTMPDIR} && cd ${PKGTMPDIR} \
     && echo "install libewf" \
     && echo "#####################################" \
     && cd ${PKGTMPDIR} \
-    && git clone -b 20231119 https://github.com/libyal/libewf \
+    && git clone https://github.com/libyal/libewf \
     && cd ${PKGTMPDIR}/libewf \  
     && ./synclibs.sh \
     && ./autogen.sh \
@@ -248,8 +248,8 @@ RUN mkdir -p ${PKGTMPDIR} && cd ${PKGTMPDIR} \
     && python -m pip install pip --upgrade \
     && python -m pip install cmake \
     && python -m pip install dlib==19.24.2 \
-    && python -m pip install numpy \
-    && python -m pip install jep==4.0.3 \
+    && python -m pip install numpy==1.26.4 \
+    && python -m pip install jep==4.2.0 \
     # && python -m pip install torch==1.13.1+cu117 torchvision==0.14.1+cu117 torchaudio==0.13.1 --extra-index-url https://download.pytorch.org/whl/cu117 \
     && echo "Due to container high storage usage, Tensorflow was removed - it's only used on yahoo image detection - if you want to use it, uncomment the following line:" \
     && echo "python -m pip install tensorflow==2.9.1 tensorrt==8.5.3.1" \

Dockerfile.processor

@@ -81,12 +81,16 @@ RUN --mount=type=secret,id=ACTION_GH_TOKEN export ACTION_GH_TOKEN=$(cat /run/sec
     && echo "Uncommenting a audiotranscription flags to enable entrypoint value filling" \
     && echo "#####################################" \
     && sed -i -e "s/# huggingFaceModel = lgris/huggingFaceModel = lgris/" /opt/IPED/iped/conf/AudioTranscriptConfig.txt \
-    && sed -i -e "s/# wav2vec2Service = 127.0.0.1:11111/wav2vec2Service = 127.0.0.1:11111/" /opt/IPED/iped/conf/AudioTranscriptConfig.txt \
+    && sed -i -e "s/# remoteServiceAddress = 127.0.0.1:11111/remoteServiceAddress = 127.0.0.1:11111/" /opt/IPED/iped/conf/AudioTranscriptConfig.txt \
     # && echo "#####################################" \
     # && echo "Removing IPED's TSK-JAVA-JNI lib to avoid conflict of libs" \
     # && echo "#####################################" \
     # && rm -v /opt/IPED/iped/lib/sleuthkit-4.12.0.p1.jar \
     && echo "#####################################" \
+    && echo "TEMP PATCH JEP-4.2.0 to avoid conflict of libs" \
+    && echo "#####################################" \
+    && cp /usr/local/lib/python3.9/dist-packages/jep/jep-4.2.0.jar /opt/IPED/iped/lib/jep-4.0.3.jar \
+    && echo "#####################################" \
     && echo "Cleaning UP the container " \
     && echo "#####################################" \    
     && rm -rfv ${PKGTMPDIR}/* && apt-get clean && rm -rfv /var/lib/apt/lists/*

entrypoint.sh

@@ -107,7 +107,8 @@ for v in \
         iped_enableFaceRecognition \
         iped_enableVideoThumbs \
         iped_enableDocThumbs \
-        iped_enableHTMLReport 
+        iped_enableHTMLReport \
+        iped_enableOCR
 do
         echo ${v}=${!v}
         if [ "${!v}" ]