Bump versions to release candidates

Author: TorecLuik

.env

@@ -1,9 +1,9 @@
-NL_BIOMERO_VERSION=1.5.0
+NL_BIOMERO_VERSION=1.6.0-beta.1
 BIOMERO_IMPORTER_VERSION=1.2.1
-BIOMERO_VERSION=v2.5.3
+BIOMERO_VERSION=2.6.0b2
 OMERO_ZARR_PIXEL_BUFFER_VERSION=0.6.1
 OMERO_FORMS_VERSION=2.2.0
-OMERO_BIOMERO_VERSION=1.3.2
+OMERO_BIOMERO_VERSION=1.4.0a1
 METABASE_SITE_URL=http://localhost:3000
 METABASE_SECRET_KEY=1f8e2c8ae6450b1035fe5ac9219a8f34702ab3cb01b1c3c767cfb55922c1d881
 METABASE_IMPORTS_DB_PAGE_DASHBOARD_ID=6

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]==2.6.0a1"
+    && $VIRTUAL_ENV/bin/python -m pip install "biomero[full]==${BIOMERO_VERSION}"
 
 ## Adjust processor code with BIOMERO Processor
 # This version forwards HTTP(S) PROXY environment variables to the subprocesses (scripts)

server/Dockerfile

@@ -21,9 +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
+ADD https://api.github.com/repos/nl-bioimaging/biomero-scripts/commits?sha=v2.6.0-beta.2&per_page=1 /tmp/biomero_branch_commits
 RUN cd $OMERO_DIST/lib/scripts/ && \
-    git clone --depth 1 --branch master --single-branch https://github.com/NL-BioImaging/biomero-scripts.git biomero && \
+    git clone --depth 1 --branch v2.6.0-beta.2 --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,16 +42,10 @@ 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 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 \
+# Install released OMERO.biomero from PyPI
+RUN /opt/omero/web/venv3/bin/pip install omero-biomero==${OMERO_BIOMERO_VERSION} \
     && /opt/omero/web/venv3/bin/omero-biomero-setup
 
-# 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 ###
 
 # Install OMERO.forms from PyPI