Add python3-uno and zint in docker image

Author: duchenean

docker/Dockerfile

@@ -1,10 +1,9 @@
-FROM harbor.imio.be/common/plone-base:6.1.0 AS builder
+FROM harbor.imio.be/common/plone-base:6.1.2 AS builder
 
 ENV ZC_BUILDOUT=4.1.4 \
-  PLONE_MAJOR=6.1 \
-  PLONE_VERSION=6.1.0
+    PLONE_MAJOR=6.1 \
+    PLONE_VERSION=6.1.2
 
-# hadolint ignore=DL3008
 RUN apt-get update && apt-get install -y --no-install-recommends \
   build-essential \
   gcc \
@@ -22,19 +21,33 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
   libxml2-dev \
   libxslt1-dev \
   python3-dev \
+  python3.12-venv \
   python3-pip \
   wget \
   zlib1g-dev \
   && pip3 install --no-cache-dir --break-system-packages zc.buildout==$ZC_BUILDOUT py-spy
 
+USER imio
 WORKDIR /plone
 
+RUN python3 -m venv /plone
+COPY --chown=imio requirements.txt /plone
+RUN /plone/bin/pip install -r requirements.txt \
+    && /plone/bin/pip install py-spy
+
 COPY --chown=imio *.cfg /plone/
 COPY --chown=imio scripts /plone/scripts
 
-RUN su -c "buildout -c docker.cfg -t 30 -N" -s /bin/sh imio
+RUN /plone/bin/buildout -c docker.cfg -t 30 -N
+
+#
+#FROM ubuntu:24.04 AS uno_src
+#RUN apt-get update && apt-get install -y --no-install-recommends \
+#      python3.12 python3-uno libreoffice-core \
+#  && rm -rf /var/lib/apt/lists/*
 
-FROM harbor.imio.be/common/plone-base:6.1.0
+
+FROM harbor.imio.be/common/plone-base:6.1.2
 ARG build_number
 ENV ZC_BUILDOUT=4.1.4 \
   PLONE_VERSION=6.1.0 \
@@ -58,25 +71,37 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
   libxslt1.1 \
   lynx \
   netcat-openbsd \
+  python3-uno \
   poppler-utils \
   rsync \
   wget \
   wv \
+  zint \
   && apt-get clean \
   && rm -rf /var/lib/apt/lists/*
-RUN curl -L https://github.com/Yelp/dumb-init/releases/download/v1.2.5/dumb-init_1.2.5_amd64.deb > /tmp/dumb-init.deb && dpkg -i /tmp/dumb-init.deb && rm /tmp/dumb-init.deb
+RUN curl -L https://github.com/Yelp/dumb-init/releases/download/v1.2.5/dumb-init_1.2.5_amd64.deb > /tmp/dumb-init.deb \
+ && dpkg -i /tmp/dumb-init.deb && rm /tmp/dumb-init.deb
+COPY --chown=imio --from=builder /plone /plone
 COPY --from=builder /usr/local/bin/py-spy /usr/local/bin/py-spy
-COPY --chown=imio --from=builder /plone .
-COPY --from=builder /usr/local/lib/python3.12/dist-packages /usr/local/lib/python3.12/dist-packages
 COPY --chown=imio docker/docker-initialize.py docker/docker-entrypoint.sh docker/cron.sh docker/tick.sh /
 
+#COPY --from=uno_src /usr/lib/python3/dist-packages/uno.py /usr/lib/python3/dist-packages/uno.py
+#COPY --from=uno_src /usr/lib/python3/dist-packages/unohelper.py /usr/lib/python3/dist-packages/unohelper.py
+#COPY --from=uno_src /usr/lib/libreoffice/program /usr/lib/libreoffice/program
+
+# Ensure UNO_PATH is set to where libreoffice is installed
+ENV UNO_PATH=/usr/lib/libreoffice/program
+
 # Allow imio to create a cron job
 RUN touch /etc/cron.d/plone-tick \
     && crontab -u imio /etc/cron.d/plone-tick \
     && chmod u+s /usr/sbin/cron
 
 RUN echo $build_number > .build_number
 
+# Make the venv first on PATH at runtime
+ENV PATH="/plone/bin:${PATH}"
+
 USER imio
 EXPOSE 8081
 HEALTHCHECK --interval=15s --timeout=10s --start-period=20s --retries=5 \

requirements.txt

@@ -1,5 +1,5 @@
-packaging==24.2
-pip==25.0.1
-setuptools==75.8.2
-wheel==0.45.1
-zc.buildout==4.1.4
+packaging==25.0
+pip==25.1.1
+setuptools==80.9.0
+wheel==0.46.1
+zc.buildout==4.1.12

versions.cfg

@@ -1,9 +1,9 @@
 [versions]
-packaging = 24.2
-pip = 25.0.1
-setuptools = 75.8.2
-wheel = 0.45.1
-zc.buildout = 4.1.4
+packaging = 25.0
+pip = 25.1.1
+setuptools = 80.9.0
+wheel = 0.46.1
+zc.buildout = 4.1.12
 
 plonemeeting.portal.core = 2.2.1
 collective.documentgenerator = 4.0