diff --git a/Dockerfile b/Dockerfile index 78a2347289970a1455cc797856d79ed485ce2efc..fabf7f0c4a38cfccd2d05707d75d8437983eff6c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -29,9 +29,9 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone ####################################################### # Setting up env variables and workdir ####################################################### -ENV APP_CONFIG_TEMPLATE="/opt/config/application.tmpl" \ - APP_CONFIG_LOCATION="/opt/config/application.yml" \ - SPRING_CONFIG_LOCATION="file:/opt/config/application.yml" +ENV APP_CONFIG_TEMPLATE="/opt/config/application.tmpl" +ENV APP_CONFIG_LOCATION="/opt/config/application.yml" +ENV SPRING_CONFIG_LOCATION="file:/opt/config/application.yml" WORKDIR /opt @@ -53,13 +53,13 @@ COPY --from=mvn-build-env /opt/code/target/portal-backend.jar /usr/share/jars/ ####################################################### -# Volume for the backend config files +# Configuration for the backend config files ####################################################### +ENV DISABLED_ALGORITHMS_CONFIG_PATH="/opt/portal/algorithms/disabledAlgorithms.json" +COPY /config/disabledAlgorithms.json $DISABLED_ALGORITHMS_CONFIG_PATH VOLUME /opt/portal/api ENTRYPOINT ["sh", "-c", "dockerize -template $APP_CONFIG_TEMPLATE:$APP_CONFIG_LOCATION java -Daeron.term.buffer.length -jar /usr/share/jars/portal-backend.jar"] EXPOSE 8080 HEALTHCHECK --start-period=60s CMD curl -v --silent http://localhost:8080/services/actuator/health 2>&1 | grep UP - - diff --git a/config/application.tmpl b/config/application.tmpl index 0a309c1af833a35205cc8102912c8f6ae8078905..415e9f469edf2db038335109f933a898f48ed876 100644 --- a/config/application.tmpl +++ b/config/application.tmpl @@ -69,7 +69,7 @@ keycloak: # Files are imported when building the docker image files: pathologies_json: "file:/opt/portal/api/pathologies.json" - disabledAlgorithms_json: "file:/opt/portal/api/disabledAlgorithms.json" + disabledAlgorithms_json: "file:{{ .Env.DISABLED_ALGORITHMS_CONFIG_PATH}}" ### EMBEDDED SERVER CONFIGURATION ### diff --git a/config/disabledAlgorithms.json b/config/disabledAlgorithms.json index d92a3b2f1421d2dad3a140503d1c0effa964bdfb..9c832491dd58d85b95d955e421f9dc54a068671e 100644 --- a/config/disabledAlgorithms.json +++ b/config/disabledAlgorithms.json @@ -1,3 +1,3 @@ [ - "3C" + "THREE_C" ] \ No newline at end of file diff --git a/src/main/java/eu/hbp/mip/services/AlgorithmService.java b/src/main/java/eu/hbp/mip/services/AlgorithmService.java index bfc2b7c7f8f0d7cbae81aa8578e01f113e81f637..dd2d605b6723a4a93845208b14825314d7b6e283 100644 --- a/src/main/java/eu/hbp/mip/services/AlgorithmService.java +++ b/src/main/java/eu/hbp/mip/services/AlgorithmService.java @@ -101,7 +101,7 @@ public class AlgorithmService { try { disabledAlgorithms = getDisabledAlgorithms(); } catch (IOException e) { - logger.LogUserAction("The disabled algorithms could not be loaded."); + logger.LogUserAction("The disabled algorithms could not be loaded. Exception: " + e.getMessage()); } // Remove any disabled algorithm