MG-4: Use Ozone shared postgres db for OpenELIS (#217)

Author: kipchubett

.env

@@ -334,9 +334,14 @@ AWS_SECRET_ACCESS_KEY=
 # Backup path for local restic repository
 BACKUP_PATH=
 
-# OEG
-ADMIN_PASSWORD=superuser
-OE_DB_PASSWORD=clinlims
+# OpenELIS Global
+OPENELIS_DB_HOST=postgresql
+OPENELIS_DB_SCHEMA=clinlims
+OPENELIS_DB_NAME=clinlims
+OPENELIS_DB_USER=clinlims
+OPENELIS_DB_PASSWORD=password
+OPENELIS_DEFAULT_PASSWORD=adminADMIN!
+OPENELIS_DB_ADMIN_PASSWORD=adminPassword
 
 SSL_TRUSTSTORE_PATH=/etc/openelis-global/truststore
 SSL_TRUSTSTORE_PASSWORD=tspass

docker-compose-openelis.yml

@@ -13,47 +13,25 @@ services:
       - "${OPENELIS_KEYS:-keys-vol}:/etc/ssl/private/"
       - "${OPENELIS_CERTS:-certs-vol}:/etc/ssl/certs/"
 
-  db.openelis.org:
-    image: itechuw/openelis-global-2-database:3.2.1.1
-    platform: linux/amd64
-    ports:
-      - "15432:5432"
-    restart: always
-    env_file:
-      - "${OPENELIS_CONFIG_PATH}/database/database.env"
-    environment:
-      - DB_PASSWORD=${OE_DB_PASSWORD}
-      - DB_SUPERUSER_PASSWORD=${ADMIN_PASSWORD}
-    volumes:
-      # preserves the database between containers
-      - "${OPENELIS_CONFIG_PATH}/database/data:/var/lib/postgresql/data"
-    networks:
-      - ozone
-    healthcheck:
-      test: [ "CMD", "pg_isready", "-q", "-d", "clinlims", "-U", "clinlims" ]
-      timeout: 45s
-      interval: 10s
-      retries: 10
-
   oe.openelis.org:
     image: itechuw/openelis-global-2:3.2.1.1
     platform: linux/amd64
     depends_on:
-      - db.openelis.org
+      - postgresql
       - certs
       - env-substitution
     restart: always
     networks:
       ozone:
       web:
     environment:
-      - DEFAULT_PW=adminADMIN!
-      - TZ=America/New_York
-      - CATALINA_OPTS= -Ddatasource.url=jdbc:postgresql://db.openelis.org:5432/clinlims -Ddatasource.username=clinlims -Ddatasource.password=${OE_DB_PASSWORD} -Doe.ssl.truststorepath=${SSL_TRUSTSTORE_PATH} -Doe.ssl.truststorepassword=${SSL_TRUSTSTORE_PASSWORD} -Doe.ssl.keystorepath=${SSL_KEYSTORE_PATH} -Doe.ssl.keystorepassword=${SSL_KEYSTORE_PASSWORD}
-      - SSL_KEYSTORE_PATH
-      - SSL_KEYSTORE_PASSWORD
-      - SSL_TRUSTSTORE_PATH
-      - SSL_TRUSTSTORE_PASSWORD
+      DEFAULT_PW: ${OPENELIS_DEFAULT_PASSWORD}
+      TZ: America/New_York
+      CATALINA_OPTS: "-Ddatasource.url=jdbc:postgresql://${OPENELIS_DB_HOST}:5432/${OPENELIS_DB_NAME} -Ddatasource.username=${OPENELIS_DB_USER} -Ddatasource.password=${OPENELIS_DB_PASSWORD} -Doe.ssl.truststorepath=${SSL_TRUSTSTORE_PATH} -Doe.ssl.truststorepassword=${SSL_TRUSTSTORE_PASSWORD} -Doe.ssl.keystorepath=${SSL_KEYSTORE_PATH} -Doe.ssl.keystorepassword=${SSL_KEYSTORE_PASSWORD}"
+      SSL_KEYSTORE_PATH: ${SSL_KEYSTORE_PATH}
+      SSL_KEYSTORE_PASSWORD: ${SSL_KEYSTORE_PASSWORD}
+      SSL_TRUSTSTORE_PATH: ${SSL_TRUSTSTORE_PATH}
+      SSL_TRUSTSTORE_PASSWORD: ${SSL_TRUSTSTORE_PASSWORD}
     volumes:
       - "${OPENELIS_TRUST_STORE:-key_trust-store-volume}:/etc/openelis-global"
       - "${OPENELIS_CONFIG_PATH}/plugins/:/var/lib/openelis-global/plugins"
@@ -69,7 +47,7 @@ services:
     image: itechuw/openelis-global-2-fhir:3.2.1.1
     platform: linux/amd64
     depends_on:
-      - db.openelis.org
+      - postgresql
       - certs
     ports:
       - "${OPENELIS_FHIR_PORT:-9095}:8080"
@@ -84,17 +62,16 @@ services:
       - "traefik.http.services.fhir.loadbalancer.server.port=8080"
     environment:
       TZ: America/New_York
-
       JAVA_OPTS: "-Djavax.net.ssl.trustStore=${SSL_TRUSTSTORE_PATH}
                       -Djavax.net.ssl.trustStorePassword=${SSL_TRUSTSTORE_PASSWORD}
                       -Djavax.net.ssl.trustStoreType=pkcs12
                       -Djavax.net.ssl.keyStore=${SSL_KEYSTORE_PATH}
                       -Djavax.net.ssl.keyStorePassword=${SSL_KEYSTORE_PASSWORD}
                       -Djavax.net.ssl.keyStoreType=pkcs12"
       CATALINA_OPTS: "-Dhapi.ssl.truststorepath=${SSL_TRUSTSTORE_PATH} -Dhapi.ssl.truststorepassword=${SSL_TRUSTSTORE_PASSWORD} -Dhapi.ssl.keystorepath=${SSL_KEYSTORE_PATH} -Dhapi.ssl.keystorepassword=${SSL_KEYSTORE_PASSWORD}"
-      FHIR_DATASOURCE_URL: "jdbc:postgresql://db.openelis.org:5432/clinlims?currentSchema=clinlims"
-      FHIR_DATASOURCE_USERNAME: "clinlims"
-      FHIR_DATASOURCE_PASSWORD: ${OE_DB_PASSWORD}
+      FHIR_DATASOURCE_URL: "jdbc:postgresql://${OPENELIS_DB_HOST}:5432/${OPENELIS_DB_NAME}?currentSchema=${OPENELIS_DB_SCHEMA}"
+      FHIR_DATASOURCE_USERNAME: ${OPENELIS_DB_USER}
+      FHIR_DATASOURCE_PASSWORD: ${OPENELIS_DB_PASSWORD}
       FHIR_SERVER_ADRESS: "http://${FHIR_OPENELIS_HOSTNAME}/fhir/"
     volumes:
       - "${OPENELIS_TRUST_STORE:-key_trust-store-volume}:/etc/openelis-global"
@@ -137,6 +114,16 @@ services:
       - OPENELIS_FHIR_PUBLIC_URL=${SERVER_SCHEME}://${FHIR_OPENELIS_HOSTNAME}
       - ENABLE_SSO=${ENABLE_SSO}
 
+  postgresql:
+    environment:
+      OPENELIS_DB_NAME: ${OPENELIS_DB_NAME}
+      OPENELIS_DB_SCHEMA: ${OPENELIS_DB_SCHEMA}
+      OPENELIS_DB_USER: ${OPENELIS_DB_USER}
+      OPENELIS_DB_PASSWORD: ${OPENELIS_DB_PASSWORD}
+      OPENELIS_DB_ADMIN_PASSWORD: ${OPENELIS_DB_ADMIN_PASSWORD}
+    volumes:
+      - "${SQL_SCRIPTS_PATH}/postgresql/openelis:/docker-entrypoint-initdb.d/db/openelis"
+
 secrets:
   common.properties:
     file: "${OPENELIS_CONFIG_PATH}/properties/common.properties"