Update Dockerfile and docker-compose for webmonchow integration

Upgraded Miniconda from 4.12.0 to 23.3.1-0 and revised webmonchow installation. Added health check for ActiveMQ in docker-compose to enhance service reliability.

Signed-off-by: Jose Borreguero <[email protected]>

Dockerfile.webmonchow

@@ -1,14 +1,13 @@
-FROM continuumio/miniconda3:4.12.0
-
-# Install conda-libmamba-solver
-RUN conda update -n base -c defaults conda
+# Miniconda with native Python 3.10
+FROM continuumio/miniconda3:23.3.1-0
 RUN conda install --yes -n base conda-libmamba-solver
 
-# Install Python 3.10 and PostgreSQL using libmamba solver
-RUN conda install --yes --solver=libmamba -c conda-forge python=3.10 postgresql=14
-
 # Install webmonchow
-RUN python -m pip install git+https://github.com/neutrons/webmonchow.git@next#egg=webmonchow
+RUN conda install --yes --solver=libmamba -n base -c conda-forge -c neutrons postgresql=14 webmonchow=1.0.0
+
+# Install webmonchow from a feature branch (only to test the latest changes in webmonchow)
+# RUN conda install --yes --solver=libmamba -n base -c conda-forge postgresql=14
+#RUN python -m pip install git+https://github.com/neutrons/webmonchow.git@next#egg=webmonchow
 
 # Start the AMQ and PV generators when starting the container
 CMD ["sh", "-c", "broadcast_pv & broadcast_amq --broker \"activemq:61613\" & wait"]

docker-compose.yml

@@ -149,6 +149,8 @@ services:
         condition: service_healthy
       webmon:
         condition: service_healthy
+      activemq:
+        condition: service_healthy
 
   livedata:
     restart: always