Merge pull request #184 from UCSF-IGHS/working

Sync Working -> Demo

.env

@@ -0,0 +1,8 @@
+# OpenMRS
+OPENMRS_DB_USER=openmrs
+OPENMRS_DB_PASSWORD=password
+OPENMRS_USER=admin
+OPENMRS_PASSWORD=Admin123
+
+# MySQL
+MYSQL_ROOT_PASSWORD=YOUR_PREFERRED_MYSQL_ROOT_PASSWORD

.github/.ssh/known_hosts

@@ -0,0 +1,26 @@
+[reports.globalhealthapp.net]:3220 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIACgwMS6u0tdPP+q8TKJoJHApgwWVPTN6yxjgNpCt0Uh
+[reports.globalhealthapp.net]:3220 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDRz8siwpz3lx7FiH9oqTvc3UU1tG0f1olpN336Ap1yetytAGl5wuWZJSeUrIMNSHd+/jATG2XLjEZy/EHZdaFVJ3M+8XHucGeEq6Zh+IEByIs5DDBe1SGDtI7mUTOouMV+sX2Xc52XLfQp7/iFRqyuiNkzPc56mXumuIJINzVGofoSFlsbESu4FkSrd6Q+TsVmTZ0xSGddJODl/N5RnxW38RZpc5KEJT6joqpMEFPOKt/DMjYVrraGVZoH+m3X7NjbCyh+23To6NXS9W/xqmZTIkkz3ulYSXYy/TDBE0E5p6+Fj78xri4OnVj1kcEWS0s2p/sZlcpNfjUQetXb5SXQq8WsG/pyDzck3z8P3X/i/xzJgZwFa25SnRlBA2Huw/1xYo0F01pP4KN42+aJ6zB0REUgDIYy/3yrzlF0y7BsI2UNdB+i7SEq3ualDvqiH+DXs08AVjKVn0W/bZ9LTWKnfgl4PEsj2eRi4fqy9NoS+5O0oPYVTsay6Hcl4aryyl8=
+[reports.globalhealthapp.net]:3220 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBJQ5Ao12jbjd8Id4p1Rtss9hnwwLTuGO6N1uFz+93doBcDS0/gavN3s8zLZKGauXfowBSr3eObcCDlE/crB14gg=
+[reports.globalhealthapp.net]:3221 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOygbQjEgORAFfNfOc3buSNYFUZnw9vy+kdPYIkyKdK6
+[reports.globalhealthapp.net]:3221 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDs9pkqOg1HdUxbHHCvAdtCvdyTNK/EAn4uqaa6VJDmjygzwAqhO4GpW/24QVQCmOm+RJifyu+Ig+C3+V0yQr9xFjyzibV+GmS7kL2qnYLj4IXu26yv5h23ElucZQRwj4VUhoham3qQmJm5u+OMmTov168bmYiYtjYVK1fVY9VoB4nC+a3ked9eGqvz5HfV2awwxW50z7O9rWcTh72iGEcBDZ1vhXpIBGofttKZTG3SlapvXYqDG6f3FQZccJBBqWyZj1CDV+JA/Rw4F9rHuQoGsA5eDIL+Y28J5/MH9GLZY+SEZDLm5t0Zk1geUJ4shZRMrJ8UzYZWzW9zO90rZJMka+v8fKLjBoPQWwEEAVaZRJqD0Iu7j8euoU/bAFtY0YVS10IdSg4QlHZZrib2WL4hNScTfBqoecUKbgJDRVWopMkI5icvkaXOm6CtnpRC9/MJLwegNnnjbFL0lWMmgf2d0aadMj9q+myaunrv9PMhU/fcBKAWEC5fbIDYY+f66DE=
+[reports.globalhealthapp.net]:3221 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBJRCJoA018J5IyP6aNhrCnngQVIRRelJAP37LcOwOLrarGCPS+V2k0PhHzWtgZ9mrVV1gNTddcAx+mCGbr+mTFI=
+[histac-avn-s08.globalhealthapp.net]:2208 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBJCAQR0lzwEtKWTyVUZAnVxhkO3B94am6nxe2f4n047
+[reports.globalhealthapp.net]:2202 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBgN67V7KXlsbtYZmvigm8Wdnrf34OOwgfMAXp8fK1DC
+[reports.globalhealthapp.net]:2202 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDG/mSO9Z7+jdk7n7b0LW3uWmQ5lJvJv/m9aIiDMbmX2+tjbNn434XWFLJmigUGKJwWvTZSecZqA3Ww+G/DHz3/ib+RzvVtqLz4HwQqPNo6rFKQzKoD1PZ7jLthmaZhoApKe3zsmyZ92QBxbdsjkY/Ua/saRPTx2abUw+Zj9kj/v989TdxuxFynyQlsY4ecqbZY/alCF6spXmr9T1XBgrJdGhayT/D1vyzQr6IRsg4UiXopO5pVLTnK/KCbq/YucVXw3DLAIlAnn8/UfziUJmNnIVxP7KDLCRjclo2lpbtZW613GnAeWJqtSfKnN4S3qYMxCE9ahFzakr3EdpdRT+NeTOxAGNWiLl3HnCf3VsLI/vwV8aWtTwcMs036f1K4Xcfc+0aQ6AOw+aQSPwkT7Y2jirBpFakb5zr7TB9GBpB9VSCLkgknrXazkysT3P+efdyt7/CchCd3YbymmWlfBjRxPyZVILCp7oaNIsj6wgmO2TbONmptQCawgOUWPtGiSmE=
+[reports.globalhealthapp.net]:2202 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBE0Xy+itrE63mbqAMhqC/QTlGWJTxs8ltdLEzoSk+7FIG4QPf+Avm0CHHg8H3y6hDsgDihvDzDlIxy0NvXG05g8=
+[172.19.0.17]:2217 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILWM7opBoJrMayTHyMy8eRogs6IBf1Zh+dWZ7mBiFJ/4
+[dhis-dev.globalhealthapp.net]:2202 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBgN67V7KXlsbtYZmvigm8Wdnrf34OOwgfMAXp8fK1DC
+[172.19.0.11]:2311 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIL3dfvsZx+iuvPyjeKQ1bA8HaAZMs0QxaI4xkL6dNAbb
+[172.19.0.11]:2311 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC0cY1VBZ74jcLn2mHEavUCXgbHJDxwU25JRbyTldlliOPabZ/VbktTjV2MYr5wBeA8vbrByuEXOcbqLy1aQL84rTj2UHi7GRBdap0HFxTXDYHjsjZf+6PMF5uoH2BSynDlnO9A5sfWmpjQrqruJjH3W+U7b5vdSiIkIxtiHIHWX/2uEsLybxTOeKnGHw76hvHcaKXA/FjH1CcSl90Rcv90eaE+yP3uAxlnqBsEY6Ure9gchxXAKFHKMwznfvI4Zuin7L6cTKw0V1iEuTMTtUYZC38QiGw7Zw8E6Ip8gvK5wSZkcNQQzW/GS+NxtPXuMbb1taNernva8qt3sZ7QAnlzPNes26KOBrI7ZxJmLnNKclemLK6DxbO6Qc9Z6xnUtuX0gBS+23lI0QU7ip+/IduQcU7oNsVAYVlYGxcEJbbK2XVe2rmwl1q6/dhkOvGh/q9n0hKGLwu60fDHNYJ+7MBMzcOiJuBi1evc/TA+qxG1IIUumhC0oHPp0GyRouebtJk=
+[172.19.0.11]:2311 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBDaGYm5lsxHrethdn0BiSSh7ea2zwVdUZaFlyDZAdq56kZoBORba5g9uLVOzElJL0kEHjDzP+EkIHe4HbobBN1Y=
+ozonehis-ozonedocker-zkdn0yhimgv.ssh.ws-eu102.gitpod.io ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBEteVPsV9FFNQQJ1C7Ou15WyxMiVGW5fUQ6EDD1QdXDPRSZJDjpIUP22wFtCCMNG5nzkDsrFKcVulF8NtKIIJ9s=
+[172.19.0.17]:2217 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDNeaLW/50iPZta7AIrhTMh1m44wE1cqd/JNt9mafO2jJv24i+DqagzTQl5DU93agBzkmAllEcgkCN8hKyuFJiunThxi2heH2Ra4Mx78NVqcr4MgXsErev74b0uGOGfiWBb1JVtah8H2xN8n/XZNV1h5x5zARnyL2c7PbjW2wJ22rm7LFRogkDhJVGDoXmmB9idJTYYKgcFFxqcuE3KfRK8WoIfPBEAFXFvODAVEETKxS7lFPYGsGvQ+a+RWOYuUGt6OcX+W1Jfg8z9rHB454Vv3igrpSuW0ntDpaTP6b3fNIb0lbAXJ2sCie+J1rKbZJjanjMEDcStlN20PukK6bAJGEdP64hGDLkgTs7wJrLusiEJHd8iwvnjJX5Xdtjwxe9IX8oBrhFj/CtWKHPTVT6eGH8F/6lamxM24RPPsk6BzVARehjvypgpS8dbNgAZK+VSFlp9g4e+bqMJdZ4k/a43tt27vdt93ab1jOfhGrx0HZjseg6VPjz1NK2CDr+wR10=
+[172.19.0.17]:2217 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBB05z08lXlpc7hKeEo/gtr3OEmSqVNcwpMm76hEYaVncQtFUCCIAy/7ro0PtNuv5+SY4hyKQvQnm/SXXtzrMwOA=
+[172.19.0.16]:2216 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJ8uZouAI7t0AvhyWiWbmth/oGwUybxP0T3MnWXRc7DE
+[172.19.0.16]:2216 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC96U94CgkNLjeY3epfXgVIgpsn13GRH0Xt4JUVDh8EU7j6qWO1WA7BdsLJja03nD7dlbbcWvJ86aZy7UIOP6rHiX5C5ai3KvUWtNteLcY3VjFm8iJwYhjc/2si0v5QR7dPen66eAMb4+XMRPuYOyDl+gxdtTxiapSHPmNrwEH1HMUajNoVHv3Sc3MHkmvKLGSzcJ2XppQcoOnb1LqzzLjXGG/8EfMsRJTSvOGGWv516oJBHHRZi/mlhWB+Cw9qKc6i/SPIho2EnVi1OxR5pn04/LcmOzYFhW/xWuiLFaVPAN9io/c1Lnc1wYTLoj/pV3wtADUdhNIqQG00/GcjOCKjhjoOljrpK/9dPdRjriK6PAXXUL3LSQhgLLMYuNPNw+P96AlKtm8avtjdcK/LHLnWon1kzG77EK/gIuunYXit7g2dQksSO58jgH1mcU9vkn2/BCPW0oIvVVuB+NPtnEXHi6bOLCDdWpR58tFlaUWOQtFnI7ETMseES1VsaA/5QL0=
+[172.19.0.16]:2216 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBOCD3ui0jyXn0RMPc1nXFEj+QvqdA0u/oE8SIddKS0gwTZkQh1Do+zdG5qz86oZnR5NzJs4JUWoZZRk7kRoUQFc=
+[reports.globalhealthapp.net]:3222 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGSAgFw/vkMoR7QsODIk1Ygiif5fkdSiWiIkdor+JEOg
+[20.172.182.46]:2202 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBgN67V7KXlsbtYZmvigm8Wdnrf34OOwgfMAXp8fK1DC
+[172.19.0.19]:2319 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMsUKygZW46c4jC3VK9LKnyjQawdGzd06OXDXcYe9kmp
+[172.19.0.19]:2319 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC3dmLr4v1gn3XrsQVEjgwfhfGDjySP2ReXd14prNz4ZHVGNuC2LhOPmKPyYaninGociWARR7TXSWf53OoNjmnA232A1Jtoy5ByUAcrNZjdAVg3wxqmbxKHUS4BVXA+h+hq0++Mf23uko+0gHytkK+YQc00b4o44p2evdznPWncfxyHbVsW6aRKjcxFKzSOaWSvResqOqSidYoJkX+ouDelMgMN/5ze8D+qDJrEnLWiaBwHIEOdzSW2WHyryLnFNthH7b4Xc4boUPZb4LUDx70jEFwFARK29e2/ne6pBRxSG9EI3YhM/haEIayJSh5/YgDgXubH5p3W1I2WNeIRBTagOO1vWeHo0QPmAwNUsqw04WT5U+EWbFH2EoYuIrHGjunHId9ZGAXkho23YJUjcK0cjZDx4Ar2E7DC54CjF1TezCuT6u8eFB2MByrIOF/dPmsU2bw0Wpcj/5sQn6bY3rHMlLA0rzRq+aTfaSkwO5GGR1ZYP8CMgUmM2y+Y++zeK08=
+[172.19.0.19]:2319 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBDjTnIhRbWWk/1RzlFtBr2UwuC4QVenCRj+/C+W6qqfr62fpo1zNeJ4vouUiCmEX7AAA4RetDnxkDmeDrsVtdKg=

.github/.ssh/known_hosts.old

@@ -0,0 +1,24 @@
+[reports.globalhealthapp.net]:3220 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIACgwMS6u0tdPP+q8TKJoJHApgwWVPTN6yxjgNpCt0Uh
+[reports.globalhealthapp.net]:3220 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDRz8siwpz3lx7FiH9oqTvc3UU1tG0f1olpN336Ap1yetytAGl5wuWZJSeUrIMNSHd+/jATG2XLjEZy/EHZdaFVJ3M+8XHucGeEq6Zh+IEByIs5DDBe1SGDtI7mUTOouMV+sX2Xc52XLfQp7/iFRqyuiNkzPc56mXumuIJINzVGofoSFlsbESu4FkSrd6Q+TsVmTZ0xSGddJODl/N5RnxW38RZpc5KEJT6joqpMEFPOKt/DMjYVrraGVZoH+m3X7NjbCyh+23To6NXS9W/xqmZTIkkz3ulYSXYy/TDBE0E5p6+Fj78xri4OnVj1kcEWS0s2p/sZlcpNfjUQetXb5SXQq8WsG/pyDzck3z8P3X/i/xzJgZwFa25SnRlBA2Huw/1xYo0F01pP4KN42+aJ6zB0REUgDIYy/3yrzlF0y7BsI2UNdB+i7SEq3ualDvqiH+DXs08AVjKVn0W/bZ9LTWKnfgl4PEsj2eRi4fqy9NoS+5O0oPYVTsay6Hcl4aryyl8=
+[reports.globalhealthapp.net]:3220 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBJQ5Ao12jbjd8Id4p1Rtss9hnwwLTuGO6N1uFz+93doBcDS0/gavN3s8zLZKGauXfowBSr3eObcCDlE/crB14gg=
+[reports.globalhealthapp.net]:3221 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOygbQjEgORAFfNfOc3buSNYFUZnw9vy+kdPYIkyKdK6
+[reports.globalhealthapp.net]:3221 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDs9pkqOg1HdUxbHHCvAdtCvdyTNK/EAn4uqaa6VJDmjygzwAqhO4GpW/24QVQCmOm+RJifyu+Ig+C3+V0yQr9xFjyzibV+GmS7kL2qnYLj4IXu26yv5h23ElucZQRwj4VUhoham3qQmJm5u+OMmTov168bmYiYtjYVK1fVY9VoB4nC+a3ked9eGqvz5HfV2awwxW50z7O9rWcTh72iGEcBDZ1vhXpIBGofttKZTG3SlapvXYqDG6f3FQZccJBBqWyZj1CDV+JA/Rw4F9rHuQoGsA5eDIL+Y28J5/MH9GLZY+SEZDLm5t0Zk1geUJ4shZRMrJ8UzYZWzW9zO90rZJMka+v8fKLjBoPQWwEEAVaZRJqD0Iu7j8euoU/bAFtY0YVS10IdSg4QlHZZrib2WL4hNScTfBqoecUKbgJDRVWopMkI5icvkaXOm6CtnpRC9/MJLwegNnnjbFL0lWMmgf2d0aadMj9q+myaunrv9PMhU/fcBKAWEC5fbIDYY+f66DE=
+[reports.globalhealthapp.net]:3221 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBJRCJoA018J5IyP6aNhrCnngQVIRRelJAP37LcOwOLrarGCPS+V2k0PhHzWtgZ9mrVV1gNTddcAx+mCGbr+mTFI=
+[histac-avn-s08.globalhealthapp.net]:2208 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBJCAQR0lzwEtKWTyVUZAnVxhkO3B94am6nxe2f4n047
+[reports.globalhealthapp.net]:2202 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBgN67V7KXlsbtYZmvigm8Wdnrf34OOwgfMAXp8fK1DC
+[reports.globalhealthapp.net]:2202 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDG/mSO9Z7+jdk7n7b0LW3uWmQ5lJvJv/m9aIiDMbmX2+tjbNn434XWFLJmigUGKJwWvTZSecZqA3Ww+G/DHz3/ib+RzvVtqLz4HwQqPNo6rFKQzKoD1PZ7jLthmaZhoApKe3zsmyZ92QBxbdsjkY/Ua/saRPTx2abUw+Zj9kj/v989TdxuxFynyQlsY4ecqbZY/alCF6spXmr9T1XBgrJdGhayT/D1vyzQr6IRsg4UiXopO5pVLTnK/KCbq/YucVXw3DLAIlAnn8/UfziUJmNnIVxP7KDLCRjclo2lpbtZW613GnAeWJqtSfKnN4S3qYMxCE9ahFzakr3EdpdRT+NeTOxAGNWiLl3HnCf3VsLI/vwV8aWtTwcMs036f1K4Xcfc+0aQ6AOw+aQSPwkT7Y2jirBpFakb5zr7TB9GBpB9VSCLkgknrXazkysT3P+efdyt7/CchCd3YbymmWlfBjRxPyZVILCp7oaNIsj6wgmO2TbONmptQCawgOUWPtGiSmE=
+[reports.globalhealthapp.net]:2202 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBE0Xy+itrE63mbqAMhqC/QTlGWJTxs8ltdLEzoSk+7FIG4QPf+Avm0CHHg8H3y6hDsgDihvDzDlIxy0NvXG05g8=
+[172.19.0.17]:2217 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILWM7opBoJrMayTHyMy8eRogs6IBf1Zh+dWZ7mBiFJ/4
+[dhis-dev.globalhealthapp.net]:2202 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBgN67V7KXlsbtYZmvigm8Wdnrf34OOwgfMAXp8fK1DC
+[172.19.0.11]:2311 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIL3dfvsZx+iuvPyjeKQ1bA8HaAZMs0QxaI4xkL6dNAbb
+[172.19.0.11]:2311 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC0cY1VBZ74jcLn2mHEavUCXgbHJDxwU25JRbyTldlliOPabZ/VbktTjV2MYr5wBeA8vbrByuEXOcbqLy1aQL84rTj2UHi7GRBdap0HFxTXDYHjsjZf+6PMF5uoH2BSynDlnO9A5sfWmpjQrqruJjH3W+U7b5vdSiIkIxtiHIHWX/2uEsLybxTOeKnGHw76hvHcaKXA/FjH1CcSl90Rcv90eaE+yP3uAxlnqBsEY6Ure9gchxXAKFHKMwznfvI4Zuin7L6cTKw0V1iEuTMTtUYZC38QiGw7Zw8E6Ip8gvK5wSZkcNQQzW/GS+NxtPXuMbb1taNernva8qt3sZ7QAnlzPNes26KOBrI7ZxJmLnNKclemLK6DxbO6Qc9Z6xnUtuX0gBS+23lI0QU7ip+/IduQcU7oNsVAYVlYGxcEJbbK2XVe2rmwl1q6/dhkOvGh/q9n0hKGLwu60fDHNYJ+7MBMzcOiJuBi1evc/TA+qxG1IIUumhC0oHPp0GyRouebtJk=
+[172.19.0.11]:2311 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBDaGYm5lsxHrethdn0BiSSh7ea2zwVdUZaFlyDZAdq56kZoBORba5g9uLVOzElJL0kEHjDzP+EkIHe4HbobBN1Y=
+ozonehis-ozonedocker-zkdn0yhimgv.ssh.ws-eu102.gitpod.io ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBEteVPsV9FFNQQJ1C7Ou15WyxMiVGW5fUQ6EDD1QdXDPRSZJDjpIUP22wFtCCMNG5nzkDsrFKcVulF8NtKIIJ9s=
+[172.19.0.17]:2217 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDNeaLW/50iPZta7AIrhTMh1m44wE1cqd/JNt9mafO2jJv24i+DqagzTQl5DU93agBzkmAllEcgkCN8hKyuFJiunThxi2heH2Ra4Mx78NVqcr4MgXsErev74b0uGOGfiWBb1JVtah8H2xN8n/XZNV1h5x5zARnyL2c7PbjW2wJ22rm7LFRogkDhJVGDoXmmB9idJTYYKgcFFxqcuE3KfRK8WoIfPBEAFXFvODAVEETKxS7lFPYGsGvQ+a+RWOYuUGt6OcX+W1Jfg8z9rHB454Vv3igrpSuW0ntDpaTP6b3fNIb0lbAXJ2sCie+J1rKbZJjanjMEDcStlN20PukK6bAJGEdP64hGDLkgTs7wJrLusiEJHd8iwvnjJX5Xdtjwxe9IX8oBrhFj/CtWKHPTVT6eGH8F/6lamxM24RPPsk6BzVARehjvypgpS8dbNgAZK+VSFlp9g4e+bqMJdZ4k/a43tt27vdt93ab1jOfhGrx0HZjseg6VPjz1NK2CDr+wR10=
+[172.19.0.17]:2217 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBB05z08lXlpc7hKeEo/gtr3OEmSqVNcwpMm76hEYaVncQtFUCCIAy/7ro0PtNuv5+SY4hyKQvQnm/SXXtzrMwOA=
+[172.19.0.16]:2216 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJ8uZouAI7t0AvhyWiWbmth/oGwUybxP0T3MnWXRc7DE
+[172.19.0.16]:2216 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC96U94CgkNLjeY3epfXgVIgpsn13GRH0Xt4JUVDh8EU7j6qWO1WA7BdsLJja03nD7dlbbcWvJ86aZy7UIOP6rHiX5C5ai3KvUWtNteLcY3VjFm8iJwYhjc/2si0v5QR7dPen66eAMb4+XMRPuYOyDl+gxdtTxiapSHPmNrwEH1HMUajNoVHv3Sc3MHkmvKLGSzcJ2XppQcoOnb1LqzzLjXGG/8EfMsRJTSvOGGWv516oJBHHRZi/mlhWB+Cw9qKc6i/SPIho2EnVi1OxR5pn04/LcmOzYFhW/xWuiLFaVPAN9io/c1Lnc1wYTLoj/pV3wtADUdhNIqQG00/GcjOCKjhjoOljrpK/9dPdRjriK6PAXXUL3LSQhgLLMYuNPNw+P96AlKtm8avtjdcK/LHLnWon1kzG77EK/gIuunYXit7g2dQksSO58jgH1mcU9vkn2/BCPW0oIvVVuB+NPtnEXHi6bOLCDdWpR58tFlaUWOQtFnI7ETMseES1VsaA/5QL0=
+[172.19.0.16]:2216 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBOCD3ui0jyXn0RMPc1nXFEj+QvqdA0u/oE8SIddKS0gwTZkQh1Do+zdG5qz86oZnR5NzJs4JUWoZZRk7kRoUQFc=
+[reports.globalhealthapp.net]:3222 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGSAgFw/vkMoR7QsODIk1Ygiif5fkdSiWiIkdor+JEOg
+[20.172.182.46]:2202 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBgN67V7KXlsbtYZmvigm8Wdnrf34OOwgfMAXp8fK1DC
+[172.19.0.19]:2319 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMsUKygZW46c4jC3VK9LKnyjQawdGzd06OXDXcYe9kmp

.github/workflows/ohri-backend.yml

@@ -3,7 +3,7 @@ name: OHRI Distro with O3 Images
 on:
   push:
     branches:
-      - [master-ohri, dev]
+      - master-ohri
 
     # Publish semver tags as releases.
   pull_request:
@@ -18,8 +18,29 @@ env:
   IMAGE_NAME: ${{ github.repository }}
 
 jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+        matrix:
+          java: [ '8', '11' ]
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Set up JDK ${{ matrix.java }}
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin'
+          java-version: ${{ matrix.java }}
+          cache: 'maven'
+
+      - name: Build and Test
+        run: mvn --batch-mode --update-snapshots --activate-profiles validator clean package
+
   docker_setup:
     runs-on: ubuntu-latest
+
+    if: github.event_name == 'push'
     steps:
       - name: Login to Docker Hub
         uses: docker/login-action@v2

.github/workflows/ohri-dev-staging.yml

@@ -4,8 +4,6 @@ on:
   push:
     branches:
       - dev-staging
-  pull_request:
-    types: [opened, synchronize, closed] 
 env:
   # Use docker.io for Docker Hub if empty
   REGISTRY: ghcr.io

.github/workflows/ohri-dev.yml

@@ -4,8 +4,6 @@ on:
   push:
     branches:
       - dev
-  pull_request:
-    types: [opened, synchronize, closed] 
 env:
   # Use docker.io for Docker Hub if empty
   REGISTRY: ghcr.io
@@ -117,3 +115,35 @@ jobs:
           cache-to: type=gha,mode=max
       - name: Save image digest
         run: echo "::set-output name=image::${{ steps.build-and-push.output.digest }}"
+
+  dev_deploy:
+    runs-on: ubuntu-latest
+    needs: docker_staging_backend
+
+    if: (github.event_name == 'push' ||  github.event.pull_request.merged) 
+
+    steps:
+      - name: Wait for 3 minutes - Let Images reflect on Docker Hub
+        run: sleep 180
+
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: webfactory/ssh-agent
+        uses: webfactory/[email protected]
+
+        with:
+          ssh-private-key: ${{ secrets.OHRI_SSH_PRIVATE_KEY }}
+
+      - name: SSH to remote OHRI Dev server via jump host
+        run: |
+          ssh -p 2216 \
+              -o "UserKnownHostsFile=/dev/null" \
+              -o "StrictHostKeyChecking=no" \
+              -o "ProxyCommand=ssh -o StrictHostKeyChecking=no -W %h:%p [email protected] -p 2202" \
+              [email protected] "\
+              cd /opt && \
+              docker compose -f docker-compose-ohri-dev.yml pull && \
+              docker compose -f docker-compose-ohri-dev.yml stop && \
+              docker compose -f docker-compose-ohri-dev.yml up -d"
+          

.github/workflows/ohri-working.yml

@@ -117,3 +117,34 @@ jobs:
           cache-to: type=gha,mode=max
       - name: Save image digest
         run: echo "::set-output name=image::${{ steps.build-and-push.output.digest }}"
+
+  docker_ohri_working_deploy:
+    runs-on: ubuntu-latest
+    needs: docker_ohri_working_backend
+
+    if: (github.event_name == 'push' ||  github.event.pull_request.merged) 
+
+    steps:
+      - name: Wait for 3 minutos - Let Images reflect on Docker Hub
+        run: sleep 180
+
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: webfactory/ssh-agent
+        uses: webfactory/[email protected]
+
+        with:
+          ssh-private-key: ${{ secrets.OHRI_SSH_PRIVATE_KEY }}
+
+      - name: SSH to remote OHRI Dev server via jump host
+        run: |
+          ssh -p 2217 \
+              -o "UserKnownHostsFile=/dev/null" \
+              -o "StrictHostKeyChecking=no" \
+              -o "ProxyCommand=ssh -o StrictHostKeyChecking=no -W %h:%p [email protected] -p 2202" \
+              [email protected] "\
+              cd /opt && \
+              docker compose -f docker-compose-ohri-working.yml pull && \
+              docker compose -f docker-compose-ohri-working.yml stop && \
+              docker compose -f docker-compose-ohri-working.yml up -d"

README.md

@@ -1,16 +1,11 @@
-# OpenMRS 3.0 Reference Application
+# OpenMRS 3.0 - OHRI
 
-This project holds the build configuration for the OpenMRS 3.0 reference application, found on
+This project holds the build configuration for the OpenMRS 3.0 OHRI, 
+based on the O3 distro found on
 https://dev3.openmrs.org and https://o3.openmrs.org.
 
 ## Quick start
 
-### Package the distribution and prepare the run
-
-```
-docker compose build
-```
-
 ### Run the app
 
 ```
@@ -21,6 +16,24 @@ New OpenMRS UI is accessible at http://localhost/openmrs/spa
 
 OpenMRS Legacy UI is accessible at http://localhost/openmrs
 
+### Updated and run the next images
+
+```
+docker compose -f docker-compose.yml pull
+```
+
+```
+docker compose -f docker-compose.yml up
+```
+
+
+### Package the distribution and prepare the run
+
+```
+docker compose build
+```
+
+
 ## Overview
 
 This distribution consists of four images:
@@ -31,7 +44,7 @@ This distribution consists of four images:
   includes a full Initializer configuration for the reference application intended as a starting point.
 * frontend - This image is a simple nginx container that embeds the 3.x frontend, including the modules described in  the
   `frontend/spa-build-config.json` file.
-* proxy - This image is an even simpler nginx reverse proxy that sits in front of the `backend` and `frontend` containers
+* gateway - This image is an even simpler nginx reverse proxy that sits in front of the `backend` and `frontend` containers
   and provides a common interface to both. Basically, this help mitigate CORS issues.
 
 ## Contributing to the configuration

distro/configuration/addresshierarchy/addressConfiguration.xml

@@ -22,7 +22,7 @@
     </addressComponent>
     <addressComponent>
       <field>ADDRESS_1</field>
-      <nameMapping>impl.commune</nameMapping>
+      <nameMapping>Location.address1</nameMapping>
       <sizeMapping>40</sizeMapping>
       <requiredInHierarchy>true</requiredInHierarchy>
     </addressComponent>