From 5dfc166847e4b127c327af074fd712cd1798eaa0 Mon Sep 17 00:00:00 2001 From: pwalczysko Date: Fri, 23 Oct 2026 11:17:01 +0100 Subject: [PATCH 01/10] Add pip and certi upgrades to server/Dockerfile and unify with what is on idr3-slot2 --- server/Dockerfile | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/server/Dockerfile b/server/Dockerfile index 999f5128..f75b8c1b 100644 --- a/server/Dockerfile +++ b/server/Dockerfile @@ -9,8 +9,17 @@ RUN chmod +x /home/settings.env WORKDIR /tmp/omero-install/linux -RUN dnf install -y python3.11 python3.11-pip -RUN pip3.11 install build +# Install Python and refresh certificate trust before pip installs +RUN dnf install -y ca-certificates python3.11 python3.11-pip && \ + dnf upgrade -y ca-certificates && \ + update-ca-trust + +RUN python3.11 -m pip install \ + "pip @ https://files.pythonhosted.org/packages/3f/06/3e4420302363fbb71be3c7f35ce042f54bfca330e3e66b3a2e3c4cca579f/pip-26.2.2-py3-none-any.whl#sha256=fd7f4dfa8190e014013b9f08f3e973f4e4c26ffd179a204895533a7254813a70" + +RUN python3.11 -m pip install --upgrade "certifi>=2026.10.19" + +RUN python3.11 -m pip install build # Ice dependencies RUN dnf install -y 'dnf-command(config-manager)' && \ @@ -32,7 +41,7 @@ RUN dnf -qy module disable postgresql RUN dnf -y install postgresql16 \ && dnf clean all - +RUN update-alternatives --set java java-21-openjdk.x86_64 # For OME-zarr RUN dnf -y install epel-release RUN dnf -y update @@ -58,7 +67,7 @@ RUN chmod a+x /tmp/run.sh # Change user id to fix permissions issues -ARG USER_ID=1000 +ARG USER_ID=11593 RUN usermod -u $USER_ID omero From 621413707e91657f35736162a7177024162acd1c Mon Sep 17 00:00:00 2001 From: pwalczysko Date: Fri, 23 Oct 2026 11:31:13 +0100 Subject: [PATCH 02/10] Add pip and certi upgrades to slave/Dockerfile and unify with what is on idr3-slot2 --- slave/Dockerfile | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/slave/Dockerfile b/slave/Dockerfile index 1f833e00..974c3fcf 100644 --- a/slave/Dockerfile +++ b/slave/Dockerfile @@ -13,9 +13,17 @@ RUN chmod +x /home/settings.env # Required for the docs build RUN dnf install -y make -# Python job -RUN dnf install -y python3.11 python3.11-pip -RUN pip3.11 install build +# Python job: refresh certificates and update pip before installing packages +RUN dnf install -y ca-certificates python3.11 python3.11-pip && \ + dnf upgrade -y ca-certificates && \ + update-ca-trust + +RUN python3.11 -m pip install \ + "pip @ https://files.pythonhosted.org/packages/3f/06/3e4420302363fbb71be3c7f35ce042f54bfca330e3e66b3a2e3c4cca579f/pip-26.2.2-py3-none-any.whl#sha256=fd7f4dfa8190e014013b9f08f3e973f4e4c26ffd179a204895533a7254813a70" + +RUN python3.11 -m pip install --upgrade "certifi>=2026.10.19" + +RUN python3.11 -m pip install build # Ice dependencies RUN dnf install -y 'dnf-command(config-manager)' && \ @@ -63,7 +71,7 @@ RUN dnf -y update RUN dnf -y install blosc RUN dnf install -y cronie - +RUN update-alternatives --set java java-21-openjdk.x86_64 EXPOSE 14064 EXPOSE 14063 @@ -72,7 +80,7 @@ RUN chown omero:omero /tmp/run.sh RUN chmod a+x /tmp/run.sh # Change user id to fix permissions issues -ARG USER_ID=1000 +ARG USER_ID=11593 RUN usermod -u $USER_ID omero # make sure mounted volumes has correct permissions From deb669caf80aee1b023b8156fec6d8b0e3da0792 Mon Sep 17 00:00:00 2001 From: pwalczysko Date: Fri, 23 Oct 2026 11:40:57 +0100 Subject: [PATCH 03/10] Add pip and certi upgrades to web/Dockerfile and unify with what is on idr3-slot2 --- web/Dockerfile | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/web/Dockerfile b/web/Dockerfile index 12ce2f84..c2e359c0 100644 --- a/web/Dockerfile +++ b/web/Dockerfile @@ -16,13 +16,24 @@ ADD ./run.sh /tmp/run.sh RUN chown omero:omero /tmp/run.sh RUN chmod a+x /tmp/run.sh -RUN dnf install -y python3.11 openssl python3.11-pip -RUN pip3.11 install build +# Install Python and refresh certificate trust before pip installs +RUN dnf install -y ca-certificates python3.11 openssl python3.11-pip && \ + dnf upgrade -y ca-certificates && \ + update-ca-trust + +RUN python3.11 -m pip install \ + "pip @ https://files.pythonhosted.org/packages/3f/06/3e4420302363fbb71be3c7f35ce042f54bfca330e3e66b3a2e3c4cca579f/pip-26.2.2-py3-none-any.whl#sha256=fd7f4dfa8190e014013b9f08f3e973f4e4c26ffd179a204895533a7254813a70" + +RUN python3.11 -m pip install --upgrade "certifi>=2026.10.19" + +RUN python3.11 -m pip install build + +RUN update-alternatives --set java java-21-openjdk.x86_64 RUN dnf clean all # Change user id to fix permissions issues -ARG USER_ID=1000 +ARG USER_ID=11593 RUN usermod -u $USER_ID omero RUN chown -R omero:omero /home/omero/ From 1dcf8f306c466c3abf30b2d22ee121ec8d526ed0 Mon Sep 17 00:00:00 2001 From: pwalczysko Date: Fri, 23 Oct 2026 12:14:36 +0100 Subject: [PATCH 04/10] Fix pgdg issue on rhel9 major/minor version url building --- server/Dockerfile | 6 +++++- slave/Dockerfile | 7 +++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/server/Dockerfile b/server/Dockerfile index f75b8c1b..eb06f994 100644 --- a/server/Dockerfile +++ b/server/Dockerfile @@ -36,8 +36,12 @@ ENV ICE_HOME=/opt/ice-3.6.5 ENV PATH=$ICE_HOME/bin:$PATH # install postgres tools for pg16 (default is 13) +# Install PostgreSQL 16 tools (default is 13) RUN dnf install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-9-x86_64/pgdg-redhat-repo-latest.noarch.rpm -RUN dnf -qy module disable postgresql +RUN sed -i \ + 's/rhel-\$releasever_major\.\$releasever_minor-/rhel-\$releasever_major-/g' \ + /etc/yum.repos.d/pgdg-redhat-all.repo && \ + dnf --disablerepo="pgdg*" -qy module disable postgresql RUN dnf -y install postgresql16 \ && dnf clean all diff --git a/slave/Dockerfile b/slave/Dockerfile index 974c3fcf..f2c086a4 100644 --- a/slave/Dockerfile +++ b/slave/Dockerfile @@ -53,8 +53,11 @@ RUN dnf -y install maven ant && dnf clean all # install postgres tools for pg16 (default is 13) RUN dnf install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-9-x86_64/pgdg-redhat-repo-latest.noarch.rpm -RUN dnf -qy module disable postgresql -RUN dnf -y install postgresql16-server postgresql16\ +RUN sed -i \ + 's/rhel-\$releasever_major\.\$releasever_minor-/rhel-\$releasever_major-/g' \ + /etc/yum.repos.d/pgdg-redhat-all.repo && \ + dnf --disablerepo="pgdg*" -qy module disable postgresql +RUN dnf -y install postgresql16-server postgresql16 \ && dnf clean all # gradle From e64911624feb309552117fab7dd340fe3a18cea8 Mon Sep 17 00:00:00 2001 From: pwalczysko Date: Fri, 23 Oct 2026 15:37:41 +0100 Subject: [PATCH 05/10] Pin pip and update certifi in Jenkins jobs --- home/jobs/BIOFORMATS-push/config.xml | 3 ++- home/jobs/OMERO-build/config.xml | 2 ++ home/jobs/OMERO-docs/config.xml | 3 ++- home/jobs/OMERO-push/config.xml | 3 ++- home/jobs/OMERO-robot/config.xml | 4 +++- home/jobs/OMERO-server/config.xml | 3 ++- home/jobs/OMERO-test-integration/config.xml | 12 ++++++++++++ home/jobs/OMERO-training/config.xml | 4 +++- home/jobs/OMERO-web/config.xml | 3 ++- 9 files changed, 30 insertions(+), 7 deletions(-) diff --git a/home/jobs/BIOFORMATS-push/config.xml b/home/jobs/BIOFORMATS-push/config.xml index 728ff2a3..c0e29a56 100644 --- a/home/jobs/BIOFORMATS-push/config.xml +++ b/home/jobs/BIOFORMATS-push/config.xml @@ -74,7 +74,8 @@ python3.11 -mvenv venv source $WORKSPACE/venv/bin/activate -pip install -U pip +python -m pip install "pip @ https://files.pythonhosted.org/packages/3f/06/3e4420302363fbb71be3c7f35ce042f54bfca330e3e66b3a2e3c4cca579f/pip-26.2.2-py3-none-any.whl#sha256=fd7f4dfa8190e014013b9f08f3e973f4e4c26ffd179a204895533a7254813a70" +python -m pip install --upgrade certifi pip install -U scc PATH=$WORKSPACE/bio-formats-build/scripts:$PATH diff --git a/home/jobs/OMERO-build/config.xml b/home/jobs/OMERO-build/config.xml index 04d88c36..bdcbc220 100644 --- a/home/jobs/OMERO-build/config.xml +++ b/home/jobs/OMERO-build/config.xml @@ -76,6 +76,8 @@ OMERO_VEN=$WORKSPACE/omero-virtualenv rm -rf $OMERO_VEN source $HOME/settings.env python3.11 -m venv $OMERO_VEN +$OMERO_VEN/bin/python -m pip install "pip @ https://files.pythonhosted.org/packages/3f/06/3e4420302363fbb71be3c7f35ce042f54bfca330e3e66b3a2e3c4cca579f/pip-26.2.2-py3-none-any.whl#sha256=fd7f4dfa8190e014013b9f08f3e973f4e4c26ffd179a204895533a7254813a70" +$OMERO_VEN/bin/python -m pip install --upgrade certifi $OMERO_VEN/bin/pip install https://github.com/glencoesoftware/zeroc-ice-py-linux-x86_64/releases/download/20240202/zeroc_ice-3.6.5-cp311-cp311-manylinux_2_28_x86_64.whl $OMERO_VEN/bin/pip install -U 'setuptools<66' omero-py diff --git a/home/jobs/OMERO-docs/config.xml b/home/jobs/OMERO-docs/config.xml index 9949b856..1558e89e 100644 --- a/home/jobs/OMERO-docs/config.xml +++ b/home/jobs/OMERO-docs/config.xml @@ -63,7 +63,8 @@ python3.11 -mvenv venv source $WORKSPACE/venv/bin/activate -pip install -U pip +python -m pip install "pip @ https://files.pythonhosted.org/packages/3f/06/3e4420302363fbb71be3c7f35ce042f54bfca330e3e66b3a2e3c4cca579f/pip-26.2.2-py3-none-any.whl#sha256=fd7f4dfa8190e014013b9f08f3e973f4e4c26ffd179a204895533a7254813a70" +python -m pip install --upgrade certifi pip install -U scc test -e src && cd src scc $MERGE_COMMAND -S $STATUS --push $MERGE_PUSH_BRANCH diff --git a/home/jobs/OMERO-push/config.xml b/home/jobs/OMERO-push/config.xml index efab0947..96bc9507 100644 --- a/home/jobs/OMERO-push/config.xml +++ b/home/jobs/OMERO-push/config.xml @@ -87,7 +87,8 @@ python3.11 -mvenv venv source $WORKSPACE/venv/bin/activate -pip install -U pip +python -m pip install "pip @ https://files.pythonhosted.org/packages/3f/06/3e4420302363fbb71be3c7f35ce042f54bfca330e3e66b3a2e3c4cca579f/pip-26.2.2-py3-none-any.whl#sha256=fd7f4dfa8190e014013b9f08f3e973f4e4c26ffd179a204895533a7254813a70" +python -m pip install --upgrade certifi pip install -U scc test -e src && cd src user=$(git config github.user) diff --git a/home/jobs/OMERO-robot/config.xml b/home/jobs/OMERO-robot/config.xml index 373a47a2..ea4cd881 100644 --- a/home/jobs/OMERO-robot/config.xml +++ b/home/jobs/OMERO-robot/config.xml @@ -58,7 +58,9 @@ python3.11 -m venv $WORKSPACE/.venv3 source $WORKSPACE/.venv3/bin/activate -pip install -U pip setuptools +python -m pip install "pip @ https://files.pythonhosted.org/packages/3f/06/3e4420302363fbb71be3c7f35ce042f54bfca330e3e66b3a2e3c4cca579f/pip-26.2.2-py3-none-any.whl#sha256=fd7f4dfa8190e014013b9f08f3e973f4e4c26ffd179a204895533a7254813a70" +python -m pip install --upgrade certifi +python -m pip install --upgrade setuptools pip install https://github.com/glencoesoftware/zeroc-ice-py-linux-x86_64/releases/download/20240202/zeroc_ice-3.6.5-cp311-cp311-manylinux_2_28_x86_64.whl pip install omero-py omero-web # Latest in order to stop server. diff --git a/home/jobs/OMERO-server/config.xml b/home/jobs/OMERO-server/config.xml index 43dd8238..7c5077b6 100644 --- a/home/jobs/OMERO-server/config.xml +++ b/home/jobs/OMERO-server/config.xml @@ -145,7 +145,8 @@ done source $WORKSPACE/.venv3/bin/activate -pip install -U pip +python -m pip install "pip @ https://files.pythonhosted.org/packages/3f/06/3e4420302363fbb71be3c7f35ce042f54bfca330e3e66b3a2e3c4cca579f/pip-26.2.2-py3-none-any.whl#sha256=fd7f4dfa8190e014013b9f08f3e973f4e4c26ffd179a204895533a7254813a70" +python -m pip install --upgrade certifi pip install https://github.com/glencoesoftware/zeroc-ice-py-linux-x86_64/releases/download/20240202/zeroc_ice-3.6.5-cp311-cp311-manylinux_2_28_x86_64.whl pip install markdown pip install reportlab # For figure diff --git a/home/jobs/OMERO-test-integration/config.xml b/home/jobs/OMERO-test-integration/config.xml index 8ddbb2bb..502cedf1 100644 --- a/home/jobs/OMERO-test-integration/config.xml +++ b/home/jobs/OMERO-test-integration/config.xml @@ -32,6 +32,18 @@ fi dropdb -f -h $OMERO_DB_HOST -U $OMERO_DB_USER $OMERO_DB_NAME || echo Already exists maybe rm -rf $WORKSPACE/* +python3.11 -m venv $OMERO_ENV + +source $OMERO_ENV/bin/activate +python -m pip install "pip @ https://files.pythonhosted.org/packages/3f/06/3e4420302363fbb71be3c7f35ce042f54bfca330e3e66b3a2e3c4cca579f/pip-26.2.2-py3-none-any.whl#sha256=fd7f4dfa8190e014013b9f08f3e973f4e4c26ffd179a204895533a7254813a70" +python -m pip install --upgrade certifi +pip install -U setuptools +pip install https://github.com/glencoesoftware/zeroc-ice-py-linux-x86_64/releases/download/20240202/zeroc_ice-3.6.5-cp311-cp311-manylinux_2_28_x86_64.whl +pip install markdown +pip install mox3 pytest pytest-django pytest-xdist pytest-mock +pip install tables +pip install jinja2 +pip install PyYAML diff --git a/home/jobs/OMERO-training/config.xml b/home/jobs/OMERO-training/config.xml index 17ee2913..f7f1ce7e 100644 --- a/home/jobs/OMERO-training/config.xml +++ b/home/jobs/OMERO-training/config.xml @@ -18,7 +18,9 @@ python3.11 -m venv $WORKSPACE/.venv3 source $WORKSPACE/.venv3/bin/activate -pip install -U pip setuptools +python -m pip install "pip @ https://files.pythonhosted.org/packages/3f/06/3e4420302363fbb71be3c7f35ce042f54bfca330e3e66b3a2e3c4cca579f/pip-26.2.2-py3-none-any.whl#sha256=fd7f4dfa8190e014013b9f08f3e973f4e4c26ffd179a204895533a7254813a70" +python -m pip install --upgrade certifi +python -m pip install --upgrade setuptools pip install https://github.com/glencoesoftware/zeroc-ice-py-linux-x86_64/releases/download/20240202/zeroc_ice-3.6.5-cp311-cp311-manylinux_2_28_x86_64.whl pip install markdown # Avoid installing psutil for now diff --git a/home/jobs/OMERO-web/config.xml b/home/jobs/OMERO-web/config.xml index a701d57c..bb4a3f41 100644 --- a/home/jobs/OMERO-web/config.xml +++ b/home/jobs/OMERO-web/config.xml @@ -45,7 +45,8 @@ rm -rf $WORKSPACE/* python3.11 -m venv $OMERO_ENV source $OMERO_ENV/bin/activate -pip install -U pip +python -m pip install "pip @ https://files.pythonhosted.org/packages/3f/06/3e4420302363fbb71be3c7f35ce042f54bfca330e3e66b3a2e3c4cca579f/pip-26.2.2-py3-none-any.whl#sha256=fd7f4dfa8190e014013b9f08f3e973f4e4c26ffd179a204895533a7254813a70" +python -m pip install --upgrade certifi pip install https://github.com/glencoesoftware/zeroc-ice-py-linux-x86_64/releases/download/20240202/zeroc_ice-3.6.5-cp311-cp311-manylinux_2_28_x86_64.whl From ca6f519e4b80d224a64111adb621e4ddc460b89d Mon Sep 17 00:00:00 2001 From: pwalczysko Date: Fri, 23 Oct 2026 16:31:24 +0100 Subject: [PATCH 06/10] Test recursiveMerge pip fix in OMERO-build-push --- home/jobs/OMERO-build-push/config.xml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/home/jobs/OMERO-build-push/config.xml b/home/jobs/OMERO-build-push/config.xml index 1224df33..27ffe203 100644 --- a/home/jobs/OMERO-build-push/config.xml +++ b/home/jobs/OMERO-build-push/config.xml @@ -40,9 +40,14 @@