diff --git a/Dockerfile-lite b/Dockerfile-lite index 982a53e7..e4a36ec4 100644 --- a/Dockerfile-lite +++ b/Dockerfile-lite @@ -1,5 +1,5 @@ # use alpine -FROM alpine:latest +FROM alpine:3.19.0 ARG VERSION_TAG @@ -28,15 +28,12 @@ RUN apk add --no-cache \ curl \ openjdk17-jre \ # Doc conversion - libreoffice-common \ - libreoffice-writer \ - libreoffice-calc \ - libreoffice-impress \ + libreoffice \ # python and pip python3 && \ wget https://bootstrap.pypa.io/get-pip.py -qO - | python3 - --break-system-packages --no-cache-dir --upgrade && \ # uno unoconv and HTML - pip install --break-system-packages --no-cache-dir --upgrade uno unoconv WeasyPrint && \ + pip install --break-system-packages --no-cache-dir --upgrade unoconv WeasyPrint && \ # Create user and group #RUN groupadd -g $PGID stirlingpdfgroup && \ # useradd -u $PUID -g stirlingpdfgroup -s /bin/sh stirlingpdfuser && \ diff --git a/Dockerfile-ultra-lite b/Dockerfile-ultra-lite index 38eca953..f6c73df0 100644 --- a/Dockerfile-ultra-lite +++ b/Dockerfile-ultra-lite @@ -1,5 +1,5 @@ # use alpine -FROM alpine:latest +FROM alpine:3.19.0 ARG VERSION_TAG @@ -34,7 +34,8 @@ RUN mkdir /configs /logs /customFiles && \ tzdata \ tini \ bash \ - curl + curl \ + openjdk17-jre # Set environment variables ENV ENDPOINTS_GROUPS_TO_REMOVE=CLI diff --git a/scripts/init.sh b/scripts/init.sh index 7f5b19f0..ea8fd359 100644 --- a/scripts/init.sh +++ b/scripts/init.sh @@ -2,8 +2,8 @@ # Copy the original tesseract-ocr files to the volume directory without overwriting existing files echo "Copying original files without overwriting existing files" -mkdir -p /usr/share/tesseract-ocr -cp -rn /usr/share/tesseract-ocr-original/* /usr/share/tesseract-ocr +mkdir -p /usr/share/tessdata +cp -rn /usr/share/tessdata-original/* /usr/share/tessdata if [ -d /usr/share/tesseract-ocr/4.00/tessdata ]; then cp -r /usr/share/tesseract-ocr/4.00/tessdata/* /usr/share/tessdata || true;