Skip to content
Snippets Groups Projects
Commit d095312f authored by ThanKarab's avatar ThanKarab
Browse files

DisabledAlgorithms.json added as hardcoded file.

The file no longer needs to be mounted.
Diabled algorithm 'THREE_C'.
parent 386f9080
No related branches found
Tags 7.7.1
No related merge requests found
......@@ -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
......@@ -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 ###
......
[
"3C"
"THREE_C"
]
\ No newline at end of file
......@@ -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
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment