OZ-704: Add/Remove configs in docker-compose-odoo and `docker-compo…

…se-senaite` (#110)
ozone-his · Sep 10, 2024 · 3441afb · 3441afb
1 parent df8a0f7
commit 3441afb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 15 deletions.
diff --git a/docker-compose-odoo.yml b/docker-compose-odoo.yml
@@ -66,25 +66,15 @@ services:
       odoo:
         condition: service_started
     environment:
-      - DB_EVENT_DESTINATIONS_ODOO=${DB_EVENT_DESTINATIONS_ODOO}
       - EIP_DB_NAME_ODOO=${EIP_DB_NAME_ODOO}
       - EIP_DB_USER_ODOO=${EIP_DB_USER_ODOO}
       - EIP_DB_PASSWORD_ODOO=${EIP_DB_PASSWORD_ODOO}
       - ODOO_DATABASE=${ODOO_DATABASE}
       - ODOO_USER=${ODOO_USER}
       - ODOO_PASSWORD=${ODOO_PASSWORD}
-      - CREATE_CUSTOMER_IF_NOT_EXIST=${CREATE_CUSTOMER_IF_NOT_EXIST}
-      - ODOO_CUSTOMER_EXTERNAL_ID=${ODOO_CUSTOMER_EXTERNAL_ID}
-      - ODOO_CUSTOMER_DOB_FIELD=${ODOO_CUSTOMER_DOB_FIELD}
-      - ODOO_CUSTOMER_WEIGHT_FIELD=${ODOO_CUSTOMER_WEIGHT_FIELD}
-      - EMR_WEIGHT_CONCEPT=${EMR_WEIGHT_CONCEPT}
-      - OPENMRS_IDENTIFIER_TYPE_UUID=${OPENMRS_IDENTIFIER_TYPE_UUID}
-      - ODOO_ENABLE_EXTRA_CUSTOMER_FIELDS_ROUTE=${ODOO_ENABLE_EXTRA_CUSTOMER_FIELDS_ROUTE}
-      - ODOO_ENABLE_EXTRA_QUOTATION_FIELDS_ROUTE=${ODOO_ENABLE_EXTRA_QUOTATION_FIELDS_ROUTE}
       - ODOO_URL=http://odoo:8069
       - OPENMRS_URL=http://openmrs:8080/openmrs
       - EIP_PROFILE=prod
-      - EIP_WATCHED_TABLES=patient,person_name,person_address,patient_identifier,orders,test_order,drug_order
       - MYSQL_ADMIN_USER=root
       - MYSQL_ADMIN_USER_PASSWORD=${MYSQL_ROOT_PASSWORD}
       - OPENMRS_DB_HOST=${OPENMRS_DB_HOST}

diff --git a/docker-compose-senaite.yml b/docker-compose-senaite.yml
@@ -44,15 +44,10 @@ services:
       - OPENMRS_SERVER_USER=${OPENMRS_USER}
       - OPENMRS_SERVER_PASSWORD=${OPENMRS_PASSWORD}
       - OPENMRS_RESULTS_ENCOUNTER_TYPE_UUID=${RESULTS_ENCOUNTER_TYPE_UUID}
-      - OPENMRS_IDENTIFIER_TYPE_UUID=${OPENMRS_IDENTIFIER_TYPE_UUID}
-      - OPENMRS_CONCEPT_COMPLEX_UUID=${CONCEPT_COMPLEX_UUID}
-      - BAHMNI_TEST_ORDER_TYPE_UUID=${BAHMNI_TEST_ORDER_TYPE_UUID}
       - EIP_PROFILE=prod
-      - EIP_WATCHED_TABLES=patient,person_name,person_address,patient_identifier,orders,test_order
       - EIP_DB_NAME_SENAITE=${EIP_DB_NAME_SENAITE}
       - EIP_DB_USER_SENAITE=${EIP_DB_USER_SENAITE}
       - EIP_DB_PASSWORD_SENAITE=${EIP_DB_PASSWORD_SENAITE}
-      - DB_EVENT_DESTINATIONS_SENAITE=${DB_EVENT_DESTINATIONS_SENAITE}
       - MYSQL_ADMIN_USER=root
       - MYSQL_ADMIN_USER_PASSWORD=${MYSQL_ROOT_PASSWORD}
       - OPENMRS_DB_HOST=${OPENMRS_DB_HOST}
@@ -62,6 +57,10 @@ services:
       - OPENMRS_DB_PASSWORD=${OPENMRS_DB_PASSWORD}
       - OPENMRS_USER=${OPENMRS_USER}
       - OPENMRS_PASSWORD=${OPENMRS_PASSWORD}
+      - EIP_FHIR_RESOURCES=Patient,ServiceRequest
+      - EIP_FHIR_SERVER_URL=http://openmrs:8080/openmrs/ws/fhir2/R4
+      - EIP_FHIR_USERNAME=${OPENMRS_USER}
+      - EIP_FHIR_PASSWORD=${OPENMRS_PASSWORD}
     image: mekomsolutions/eip-client
     networks:
       ozone: