Add biomero 2.6 pre

Co-authored-by: Copilot <copilot@github.com>

Author: TorecLuik

biomeroworker/Dockerfile

@@ -43,7 +43,7 @@ RUN yum -y install ack
 # force zarr < 3 for compatibility w/ omero-cli-zarr by installing biomero AFTER the importer
 RUN $VIRTUAL_ENV/bin/python -m pip install --upgrade pip \
     && $VIRTUAL_ENV/bin/python -m pip install --ignore-requires-python biomero-importer==${BIOMERO_IMPORTER_VERSION} \
-    && $VIRTUAL_ENV/bin/python -m pip install "biomero[full]==${BIOMERO_VERSION}"
+    && $VIRTUAL_ENV/bin/python -m pip install "biomero[full]==2.6.0a1"
 
 ## Adjust processor code with BIOMERO Processor
 # This version forwards HTTP(S) PROXY environment variables to the subprocesses (scripts)

server/Dockerfile

@@ -21,8 +21,9 @@ ADD server/00-restore-config.sh* /startup/
 
 # Clone specific release version
 # We don't need the example scripts
+ADD https://api.github.com/repos/nl-bioimaging/biomero-scripts/commits?sha=master&per_page=1 /tmp/biomero_branch_commits
 RUN cd $OMERO_DIST/lib/scripts/ && \
-    git clone --depth 1 --branch ${BIOMERO_VERSION} --single-branch https://github.com/NL-BioImaging/biomero-scripts.git biomero && \
+    git clone --depth 1 --branch master --single-branch https://github.com/NL-BioImaging/biomero-scripts.git biomero && \
     rm -f biomero/admin/Example_Minimal_Slurm_Script.py && \
     rm -f biomero/__workflows/SLURM_CellPose_Segmentation.py
 

web/Dockerfile

@@ -42,14 +42,14 @@ COPY biomeroworker/slurm-config.ini /etc/slurm-config.ini
 ### Install OMERO.biomero first ###
 ### BIOMERO.importer and BIOMERO.analyzer will be installed as a dependency of OMERO.biomero ###
 
-# Install released OMERO.biomero from PyPI and run setup
-RUN /opt/omero/web/venv3/bin/pip install omero-biomero==${OMERO_BIOMERO_VERSION} \
+# Install OMERO.biomero from main branch on GitHub
+ADD "https://api.github.com/repos/NL-BioImaging/OMERO.biomero/commits?sha=main&per_page=1" /tmp/biomero_branch_commits
+RUN git clone -b main --depth 1 https://github.com/NL-BioImaging/OMERO.biomero.git /opt/omero/web/OMERO.biomero \
+    && /opt/omero/web/venv3/bin/pip install -e /opt/omero/web/OMERO.biomero \
     && /opt/omero/web/venv3/bin/omero-biomero-setup
 
-# Install OMERO.biomero from main branch on GitHub (commented out for release):
-# ADD "https://api.github.com/repos/NL-BioImaging/OMERO.biomero/commits/main" /latest_commit_biomero
-# RUN git clone -b main https://github.com/NL-BioImaging/OMERO.biomero.git /opt/omero/web/OMERO.biomero \
-#     && /opt/omero/web/venv3/bin/pip install -e /opt/omero/web/OMERO.biomero \
+# Install released OMERO.biomero from PyPI (commented out, use for releases):
+# RUN /opt/omero/web/venv3/bin/pip install omero-biomero==${OMERO_BIOMERO_VERSION} \
 #     && /opt/omero/web/venv3/bin/omero-biomero-setup
 
 ### Install OMERO.forms ###