Removed duplicate package paths

Dockerfile

@@ -39,43 +39,43 @@ ENV DOCKER_ENABLE_SECURITY=false \
 
 
 # JDK for app
-RUN echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/main" | tee -a /etc/apk/repositories && \
+RUN echo "@main https://dl-cdn.alpinelinux.org/alpine/edge/main" | tee -a /etc/apk/repositories && \
-    echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/community" | tee -a /etc/apk/repositories && \
+    echo "@community https://dl-cdn.alpinelinux.org/alpine/edge/community" | tee -a /etc/apk/repositories && \
     echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/testing" | tee -a /etc/apk/repositories && \
     apk upgrade --no-cache -a && \
     apk add --no-cache \
-        ca-certificates \
+    ca-certificates \
-        tzdata \
+    tzdata \
-        tini \
+    tini \
-        bash \
+    bash \
-        curl \
+    curl \
-        qpdf \
+    qpdf \
-        shadow \
+    shadow \
-        su-exec \
+    su-exec \
-        openssl \
+    openssl \
-        openssl-dev \
+    openssl-dev \
-        openjdk21-jre \
+    openjdk21-jre \
-# Doc conversion
+    # Doc conversion
-		gcompat \
+    gcompat \
-    	libc6-compat \
+    libc6-compat \
-        libreoffice \
+    libreoffice \
-# pdftohtml
+    # pdftohtml
-        poppler-utils \
+    poppler-utils \
-# OCR MY PDF (unpaper for descew and other advanced features)
+    # OCR MY PDF (unpaper for descew and other advanced features)
-        tesseract-ocr-data-eng \
+    tesseract-ocr-data-eng \
-# CV
+    # CV
-		py3-opencv \
+    py3-opencv \
-# python3/pip
+    python3 \
-        python3 \
+    py3-unoconv@testing \
-        py3-pip && \
+    py3-pillow@testing \
-# uno unoconv and HTML
+    py3-pdf2image@testing \
-    pip install --break-system-packages --no-cache-dir --upgrade unoconv WeasyPrint pdf2image pillow && \
+    weasyprint@community && \
     mv /usr/share/tessdata /usr/share/tessdata-original && \
     mkdir -p $HOME /configs /logs /customFiles /pipeline/watchedFolders /pipeline/finishedFolders && \
     fc-cache -f -v && \
     chmod +x /scripts/* && \
     chmod +x /scripts/init.sh && \
-# User permissions
+    # User permissions
     addgroup -S stirlingpdfgroup && adduser -S stirlingpdfuser -G stirlingpdfgroup && \
     chown -R stirlingpdfuser:stirlingpdfgroup $HOME /scripts /usr/share/fonts/opentype/noto /configs /customFiles /pipeline && \
     chown stirlingpdfuser:stirlingpdfgroup /app.jar

Dockerfile.fat

@@ -9,7 +9,7 @@ COPY . .
 
 # Build the application with DOCKER_ENABLE_SECURITY=false
 RUN DOCKER_ENABLE_SECURITY=true \
-./gradlew clean build
+    ./gradlew clean build
 
 # Main stage
 FROM alpine:3.21.2@sha256:56fa17d2a7e7f168a043a2712e63aed1f8543aeafdcee47c58dcffe38ed51099
@@ -41,44 +41,46 @@ ENV DOCKER_ENABLE_SECURITY=false \
 
 
 # JDK for app
-RUN echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/main" | tee -a /etc/apk/repositories && \
+RUN echo "@main https://dl-cdn.alpinelinux.org/alpine/edge/main" | tee -a /etc/apk/repositories && \
-    echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/community" | tee -a /etc/apk/repositories && \
+    echo "@community https://dl-cdn.alpinelinux.org/alpine/edge/community" | tee -a /etc/apk/repositories && \
     echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/testing" | tee -a /etc/apk/repositories && \
     apk upgrade --no-cache -a && \
     apk add --no-cache \
-        ca-certificates \
+    ca-certificates \
-        tzdata \
+    tzdata \
-        tini \
+    tini \
-        bash \
+    bash \
-        curl \
+    curl \
-        shadow \
+    shadow \
-        su-exec \
+    su-exec \
-        openssl \
+    openssl \
-        openssl-dev \
+    openssl-dev \
-        openjdk21-jre \
+    openjdk21-jre \
-# Doc conversion
+    # Doc conversion
-		gcompat \
+    gcompat \
-    	libc6-compat \
+    libc6-compat \
-        libreoffice \
+    libreoffice \
-# pdftohtml
+    # pdftohtml
-        poppler-utils \
+    poppler-utils \
-# OCR MY PDF (unpaper for descew and other advanced featues)
+    # OCR MY PDF (unpaper for descew and other advanced featues)
-        qpdf \
+    qpdf \
-        tesseract-ocr-data-eng \
+    tesseract-ocr-data-eng \
-        font-terminus font-dejavu font-noto font-noto-cjk font-awesome font-noto-extra \
+    font-terminus font-dejavu font-noto font-noto-cjk font-awesome font-noto-extra \
-# CV
+    # CV
-		py3-opencv \
+    py3-opencv \
-# python3/pip
+    # python3/pip
-        python3 \
+    python3 \
-    py3-pip && \
+    py3-unoconv@testing \
-# uno unoconv and HTML
+    py3-pillow@testing \
-    pip install --break-system-packages --no-cache-dir --upgrade unoconv WeasyPrint pdf2image pillow && \
+    py3-pdf2image@testing \
+    weasyprint@community && \
+    # uno unoconv and HTML
     mv /usr/share/tessdata /usr/share/tessdata-original && \
     mkdir -p $HOME /configs /logs /customFiles /pipeline/watchedFolders /pipeline/finishedFolders && \
     fc-cache -f -v && \
     chmod +x /scripts/* && \
     chmod +x /scripts/init.sh && \
-# User permissions
+    # User permissions
     addgroup -S stirlingpdfgroup && adduser -S stirlingpdfuser -G stirlingpdfgroup && \
     chown -R stirlingpdfuser:stirlingpdfgroup $HOME /scripts /usr/share/fonts/opentype/noto /configs /customFiles /pipeline && \
     chown stirlingpdfuser:stirlingpdfgroup /app.jar