From 2147f88793f3302742f9c23d860ddf0ee90f55f7 Mon Sep 17 00:00:00 2001 From: Samuel Jones Date: Tue, 1 Aug 2023 16:08:40 +0100 Subject: [PATCH] Improve logging clarity and boost mantid version --- container/Mantid.user.properties | 8 +++++++- container/mantid-environment.yml | 2 +- container/runner.D | 3 +++ 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/container/Mantid.user.properties b/container/Mantid.user.properties index 1225c75..aa0b981 100644 --- a/container/Mantid.user.properties +++ b/container/Mantid.user.properties @@ -58,7 +58,13 @@ defaultsave.directory=/output ## Uncomment to change logging level ## Default is notice ## Valid values are: error, warning, notice, information, debug -logging.loggers.root.level=debug +logging.loggers.root.level=notice + +## Instrument file +UpdateInstrumentDefinitions.OnStartup=0 + +## Usage reporting +usagereports.enabled=0 ## ## MantidWorkbench diff --git a/container/mantid-environment.yml b/container/mantid-environment.yml index b3ed4c4..231bdea 100644 --- a/container/mantid-environment.yml +++ b/container/mantid-environment.yml @@ -5,5 +5,5 @@ channels: - mantid dependencies: - - mantid=6.6.0 + - mantid=6.7.0 - requests \ No newline at end of file diff --git a/container/runner.D b/container/runner.D index fae7a3a..25cf60b 100644 --- a/container/runner.D +++ b/container/runner.D @@ -15,6 +15,9 @@ RUN conda init bash RUN echo "conda activate mantid" > ~/.bashrc ENV PATH /opt/conda/envs/mantid/bin:$PATH +# Run the DownloadInstrument algorithm to get instrument definitions +RUN python -c "from mantid.simpleapi import DownloadInstrument;DownloadInstrument()" + # Create a shell script to run the python command: RUN echo '#!/bin/bash\npython -c "$@"' > /entrypoint.sh RUN chmod +x /entrypoint.sh