MG-42: Make OE Traefik labels, DB ports & OE SAML configs overridable at deployment time (#224)

Author: kipchubett

.env

@@ -288,6 +288,7 @@ FHIR_ODOO_HOSTNAME=${HOST_NAME}:8083
 KEYCLOAK_HOSTNAME=${HOST_NAME}:8084
 ORTHANC_HOSTNAME=${HOST_NAME}:8889
 OPENELIS_HOSTNAME=${HOST_NAME}:8090
+OPENELIS_FHIR_HOSTNAME=${HOST_NAME}:8091
 
 #
 # Sample SSO Client Secrets used in the demo script
@@ -350,6 +351,11 @@ OPENELIS_DB_USER=clinlims
 OPENELIS_DB_PASSWORD=password
 OPENELIS_DEFAULT_PASSWORD=adminADMIN!
 OPENELIS_DB_ADMIN_PASSWORD=adminPassword
+# OpenELIS FHIR Server
+OPENELIS_FHIR_SERVER_USERNAME=admin
+OPENELIS_FHIR_SERVER_PASSWORD=adminADMIN!
+OPENELIS_TRAEFIK_LABEL=openelis
+OPENELIS_FHIR_TRAEFIK_LABEL=fhir
 
 SSL_TRUSTSTORE_PATH=/etc/openelis-global/truststore
 SSL_TRUSTSTORE_PASSWORD=tspass

docker-compose-common.yml

@@ -32,7 +32,7 @@ services:
     networks:
       - ozone
     ports:
-      - "3306:3306"
+      - "${MYSQL_PORT:-3306}:3306"
     restart: unless-stopped
     volumes:
       - "${MYSQL_DATADIR:-mysql-data}:/var/lib/mysql"
@@ -55,7 +55,7 @@ services:
     networks:
       - ozone
     ports:
-      - "5432:5432"
+      - "${POSTGRES_PORT:-5432}:5432"
     restart: unless-stopped
     volumes:
       - "${POSTGRES_DATADIR:-postgresql-data}:/var/lib/postgresql/data"

docker-compose-openelis.yml

@@ -57,9 +57,9 @@ services:
     restart: always
     labels:
       - "traefik.enable=true"
-      - "traefik.http.routers.fhir.rule=Host(`${FHIR_OPENELIS_HOSTNAME}`)"
-      - "traefik.http.routers.fhir.entrypoints=websecure"
-      - "traefik.http.services.fhir.loadbalancer.server.port=8080"
+      - "traefik.http.routers.`${OPENELIS_FHIR_TRAEFIK_LABEL}`.rule=Host(`${FHIR_OPENELIS_HOSTNAME}`)"
+      - "traefik.http.routers.`${OPENELIS_FHIR_TRAEFIK_LABEL}`.entrypoints=websecure"
+      - "traefik.http.services.`${OPENELIS_FHIR_TRAEFIK_LABEL}`.loadbalancer.server.port=8080"
     environment:
       TZ: America/New_York
       JAVA_OPTS: "-Djavax.net.ssl.trustStore=${SSL_TRUSTSTORE_PATH}
@@ -95,9 +95,9 @@ services:
       - oe.openelis.org
     labels:
       traefik.enable: "true"
-      traefik.http.routers.openelis.rule: "Host(`${OPENELIS_HOSTNAME}`)"
-      traefik.http.routers.openelis.entrypoints: "websecure"
-      traefik.http.services.openelis.loadbalancer.server.port: 80
+      traefik.http.routers.`${OPENELIS_TRAEFIK_LABEL}`.rule: "Host(`${OPENELIS_HOSTNAME}`)"
+      traefik.http.routers.`${OPENELIS_TRAEFIK_LABEL}`.entrypoints: "websecure"
+      traefik.http.services.`${OPENELIS_TRAEFIK_LABEL}`.loadbalancer.server.port: 80
 
   frontend.openelis.org:
     image: itechuw/openelis-global-2-frontend:3.2.1.2
@@ -111,8 +111,12 @@ services:
 
   env-substitution:
     environment:
-      - OPENELIS_FHIR_PUBLIC_URL=${SERVER_SCHEME}://${FHIR_OPENELIS_HOSTNAME}
+      - OPENELIS_FHIR_SERVER_PUBLIC_URL=${SERVER_SCHEME}://${FHIR_OPENELIS_HOSTNAME}
+      - OPENELIS_FHIR_SERVER_USERNAME=${OPENELIS_FHIR_SERVER_USERNAME}
+      - OPENELIS_FHIR_SERVER_PASSWORD=${OPENELIS_FHIR_SERVER_PASSWORD}
       - ENABLE_SSO=${ENABLE_SSO}
+      - OPENELIS_CLIENT_ID=${OPENELIS_CLIENT_ID:-openelis}
+      - KEYCLOAK_PUBLIC_URL=${SERVER_SCHEME}://${KEYCLOAK_HOSTNAME}
 
   postgresql:
     environment: