chore: introduce variables for base urls for similarity and export service

Author: michaelwenk

compose/docker-compose.yaml

@@ -81,7 +81,7 @@ services:
       - "${EXPORT_SERVICE_PORT}:8080"
     environment:
       MB_DATA_DIRECTORY: "/MassBank-data"
-      CORS_ALLOWED_ORIGINS: "http://${MB3_FRONTEND_HOST}:${MB3_FRONTEND_PORT}"
+      CORS_ALLOWED_ORIGINS: ${MB3_FRONTEND_URL}"
     volumes:
       - "${EXPORT_MB_DATA_DIRECTORY}:/MassBank-data"
 
@@ -95,7 +95,7 @@ services:
       MB3_FRONTEND_URL: "http://${MB3_FRONTEND_HOST}:${MB3_FRONTEND_PORT}"
       MB3_FRONTEND_BASE_URL: "${MB3_FRONTEND_BASE_URL}"
       MB3_FRONTEND_VERSION: "${MB3_FRONTEND_VERSION}"
-      EXPORT_SERVICE_URL: "http://${EXPORT_SERVICE_HOST}:${EXPORT_SERVICE_PORT}"
+      EXPORT_SERVICE_URL: "${EXPORT_SERVICE_URL}"
       EXPORT_SERVICE_URL_INTERNAL: "http://${EXPORT_SERVICE_HOST_INTERNAL}:${EXPORT_SERVICE_PORT_INTERNAL}"
       GOOGLE_SEARCH_CONSOLE_KEY: "${GOOGLE_SEARCH_CONSOLE_KEY}"
       DISTRIBUTOR_TEXT: "${DISTRIBUTOR_TEXT}"

compose/env.dist

@@ -49,9 +49,13 @@ MB3_SERVER_HOST=mb3server
 
 # The port where the similarity service is exposed
 SIMILARITY_SERVICE_PORT=8082
+
 # The host name of similarity service
 SIMILARITY_SERVICE_HOST=localhost
 
+# The base URL for the similarity service
+SIMILARITY_SERVICE_BASE_URL=""
+
 # The path to the volume to store, e.g. "/massbank-volume"
 MSP_LOCAL_PATH=./../data/massbank-volume
 
@@ -71,8 +75,11 @@ EXPORT_SERVICE_PORT=8083
 # The hostname of the export-service
 EXPORT_SERVICE_HOST=localhost
 
+# The base URL for the export service
+EXPORT_SERVICE_BASE_URL=""
+
 # The MassBank-data repository path
-EXPORT_MB_DATA_DIRECTORY=./../data/MassBank-data
+EXPORT_MB_DATA_DIRECTORY=./../data/massbank-data
 
 # The port used internally by the export-service
 EXPORT_SERVICE_PORT_INTERNAL=8080
@@ -152,5 +159,8 @@ DISTRIBUTOR_URL=""
 # API server (from external)
 # ---------------------------
 
-# The URL of the API server (from external)
-MB3_API_URL=http://${MB3_API_HOST}:${MB3_API_PORT}${MB3_API_BASE_URL}
+# The different final URLs (from external)
+MB3_API_URL=http://${MB3_API_HOST}:${MB3_API_PORT}${MB3_API_BASE_URL}
+MB3_FRONTEND_URL=http://${MB3_FRONTEND_HOST}:${MB3_FRONTEND_PORT}${MB3_FRONTEND_BASE_URL}
+SIMILARITY_SERVICE_URL=http://${SIMILARITY_SERVICE_HOST}:${SIMILARITY_SERVICE_PORT}${SIMILARITY_SERVICE_BASE_URL}
+EXPORT_SERVICE_URL=http://${EXPORT_SERVICE_HOST}:${EXPORT_SERVICE_PORT}${EXPORT_SERVICE_BASE_URL}