From 5b392ded8a3e097892882139bf8428daaa3fb129 Mon Sep 17 00:00:00 2001
From: Piotr Mankowski <pmanko@uw.edu>
Date: Fri, 30 Sep 2022 15:32:12 -0700
Subject: [PATCH] CI fix

---
 .github/workflows/main.yml | 2 ++
 docker-compose.yml         | 8 ++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 7d8fe73..9da8967 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -9,6 +9,8 @@ on:
   release:
     types: [published]
   workflow_dispatch:
+env:
+  IPLUS_DB_PW: mysqlpw
 jobs:
   CI:
     runs-on: ubuntu-latest
diff --git a/docker-compose.yml b/docker-compose.yml
index 2d37f05..e0da6ab 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -50,7 +50,7 @@ services:
       - MYSQL_DATABASE=openmrs
       - MYSQL_ROOT_PASSWORD=debezium
       - MYSQL_USER=mysqluser
-      - MYSQL_PASSWORD=mysqlpw
+      - MYSQL_PASSWORD=${IPLUS_DB_PW-mysqlpw}
       - MYSQL_ROOT_HOST=% # Allow docker containers to connect to mysql
     volumes:
       - ./mysql.cnf:/etc/mysql/conf.d/custom.cnf # mysql config preconfigured to allow binlog/debezium
@@ -70,10 +70,10 @@ services:
     environment:
       - OPENMRS_URL=http://isanteplus:8080/openmrs
       - OPENMRS_USERNAME=admin
-      - OPENMRS_PASSWORD=Admin123
+      - OPENMRS_PASSWORD=${IPLUS_ADMIN_PW-Admin123}
       - SINK_URL=https://openhim-ssl.sedish-haiti.org/SHR/fhir
-      - SINK_USERNAME=${OPENHIM_STREAMING_CLIENT}
-      - SINK_PASSWORD=${OPENHIM_STREAMING_PW}
+      - SINK_USERNAME=${OPENHIM_STREAMING_CLIENT-streaming}
+      - SINK_PASSWORD=${OPENHIM_STREAMING_PW-streaming}
       - JDBC_FETCH_SIZE=10000
       - JDBC_MAX_POOL_SIZE=50
       - JDBC_INITIAL_POOL_SIZE=10