Merge branch 'main' into luke/cve-patch-jun16

Author: luke-kucing

.github/workflows/ci.yml

@@ -5,6 +5,7 @@ on:
     branches: [main]
   pull_request:
     branches: [main]
+  workflow_dispatch:
 
 env:
   DOCKER_REPOSITORY: quay.io/unstructured-io

dockerfiles/wolfi-base/Dockerfile

@@ -5,8 +5,9 @@ COPY ./scripts/install-wolfi-libreoffice.sh install-wolfi-libreoffice.sh
 COPY ./scripts/install-wolfi-tesseract.sh install-wolfi-tesseract.sh
 
 USER root
+# Pin libxml2 to avoid a dependency issue with libreoffice
 RUN apk update && \
-    apk add python-3.12 python-3.12-base py3.12-pip glib \
+    apk add libxml2 python-3.12 python-3.12-base py3.12-pip glib \
       mesa-gl mesa-libgallium cmake bash libmagic wget git openjpeg \
       poppler libreoffice && \
     apk add --allow-untrusted packages/pandoc-3.1.8-r0.apk && \

scripts/docker-dl-wolfi-packages.sh

@@ -4,14 +4,12 @@ if [ "$ARCH" = "arm64" ] || [ "$ARCH" = "aarch64" ]; then
   files=(
     "poppler-23.09.0-r0-aarch64.apk"
     "pandoc-3.1.8-r0-aarch64.apk"
-    "libreoffice-24-24.2.5.2-r1-aarch64.apk"
     "nltk_data.tgz"
   )
 else
   files=(
     "poppler-23.09.0-r0.apk"
     "pandoc-3.1.8-r0.apk"
-    "libreoffice-24-24.2.5.2-r1.apk"
     "nltk_data.tgz"
   )
 fi

scripts/install-wolfi-libreoffice.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-apk add --allow-untrusted packages/libreoffice-24-24.2.5.2-r1.apk
+apk add libreoffice-25.2
 
 ln -s /usr/lib/libreoffice/program/soffice.bin /usr/bin/libreoffice
 ln -s /usr/lib/libreoffice/program/soffice.bin /usr/bin/soffice