From e284f818b7803ced242573096b9a8376afc59839 Mon Sep 17 00:00:00 2001
From: Anthony Stirling <77850077+Frooodle@users.noreply.github.com.>
Date: Tue, 5 Aug 2025 14:51:27 +0100
Subject: [PATCH] test

---
 Dockerfile            | 9 ++++++---
 Dockerfile.fat        | 9 ++++++---
 Dockerfile.ultra-lite | 6 ++++--
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index b60ce2fa3..40a591d99 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -56,8 +56,10 @@ RUN echo "@main https://dl-cdn.alpinelinux.org/alpine/edge/main" | tee -a /etc/a
     openssl-dev \
     openjdk21-jre \
     # Security updates - remove when Alpine base image updates these
-    libjxl@community \  # CVE-2024-11403, CVE-2024-11498 - libjxl vulnerabilities
-    rav1e@community \   # CVE-2025-4574, GHSA-2rxc-gjrp-vjhx, RUSTSEC-2024-0404, GHSA-pg9f-39pc-qf8g - Rust crossbeam-channel/anstream via rav1e
+    # libjxl@community fixes CVE-2024-11403, CVE-2024-11498
+    # rav1e@community fixes CVE-2025-4574, GHSA-2rxc-gjrp-vjhx, RUSTSEC-2024-0404, GHSA-pg9f-39pc-qf8g
+    libjxl@community \
+    rav1e@community \
     # Doc conversion
     gcompat \
     libc6-compat \
@@ -76,7 +78,8 @@ RUN echo "@main https://dl-cdn.alpinelinux.org/alpine/edge/main" | tee -a /etc/a
     python3 \
     ocrmypdf \
     py3-pip \
-    py3-pillow@community \  # CVE-2025-48379 - ensure Pillow 11.3.0+ instead of 11.2.1
+    # py3-pillow@community fixes CVE-2025-48379 - ensure Pillow 11.3.0+ instead of 11.2.1
+    py3-pillow@community \
     py3-pdf2image@testing \
     # URW Base 35 fonts for better PDF rendering
     font-urw-base35 && \
diff --git a/Dockerfile.fat b/Dockerfile.fat
index ab2568333..30135bed2 100644
--- a/Dockerfile.fat
+++ b/Dockerfile.fat
@@ -70,8 +70,10 @@ RUN echo "@main https://dl-cdn.alpinelinux.org/alpine/edge/main" | tee -a /etc/a
     openssl-dev \
     openjdk21-jre \
     # Security updates - remove when Alpine base image updates these
-    libjxl@community \  # CVE-2024-11403, CVE-2024-11498 - libjxl vulnerabilities
-    rav1e@community \   # CVE-2025-4574, GHSA-2rxc-gjrp-vjhx, RUSTSEC-2024-0404, GHSA-pg9f-39pc-qf8g - Rust crossbeam-channel/anstream via rav1e
+    # libjxl@community fixes CVE-2024-11403, CVE-2024-11498
+    # rav1e@community fixes CVE-2025-4574, GHSA-2rxc-gjrp-vjhx, RUSTSEC-2024-0404, GHSA-pg9f-39pc-qf8g
+    libjxl@community \
+    rav1e@community \
     # Doc conversion
     gcompat \
     libc6-compat \
@@ -91,7 +93,8 @@ RUN echo "@main https://dl-cdn.alpinelinux.org/alpine/edge/main" | tee -a /etc/a
     python3 \
     ocrmypdf \
     py3-pip \
-    py3-pillow@community \  # CVE-2025-48379 - ensure Pillow 11.3.0+ instead of 11.2.1
+    # py3-pillow@community fixes CVE-2025-48379 - ensure Pillow 11.3.0+ instead of 11.2.1
+    py3-pillow@community \
     py3-pdf2image@testing && \
     python3 -m venv /opt/venv && \
     /opt/venv/bin/pip install --no-cache-dir --upgrade pip setuptools && \
diff --git a/Dockerfile.ultra-lite b/Dockerfile.ultra-lite
index 917b8b0c5..2c00c745f 100644
--- a/Dockerfile.ultra-lite
+++ b/Dockerfile.ultra-lite
@@ -38,8 +38,10 @@ RUN echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/main" | tee -a /et
         su-exec \
         openjdk21-jre \
         # Security updates - remove when Alpine base image updates these
-        libjxl@community \  # CVE-2024-11403, CVE-2024-11498 - libjxl vulnerabilities
-        rav1e@community && \ # CVE-2025-4574, GHSA-2rxc-gjrp-vjhx, RUSTSEC-2024-0404, GHSA-pg9f-39pc-qf8g - Rust crossbeam-channel/anstream via rav1e
+        # libjxl@community fixes CVE-2024-11403, CVE-2024-11498
+        # rav1e@community fixes CVE-2025-4574, GHSA-2rxc-gjrp-vjhx, RUSTSEC-2024-0404, GHSA-pg9f-39pc-qf8g
+        libjxl@community \
+        rav1e@community && \
     # User permissions
     mkdir -p /configs /logs /customFiles /usr/share/fonts/opentype/noto /tmp/stirling-pdf /pipeline/watchedFolders /pipeline/finishedFolders && \
     chmod +x /scripts/*.sh && \