From e7b77bdd6ce5105727d98ab49985947ca840f6b3 Mon Sep 17 00:00:00 2001 From: CynthiaKamau Date: Thu, 14 Mar 2024 22:56:17 +0300 Subject: [PATCH 1/9] Add bill related visit attributes (#790) --- .../attributetypes/attribute_types-core_demo.csv | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/distro/configuration/attributetypes/attribute_types-core_demo.csv b/distro/configuration/attributetypes/attribute_types-core_demo.csv index 2f2f2be2f..c8bae95ec 100644 --- a/distro/configuration/attributetypes/attribute_types-core_demo.csv +++ b/distro/configuration/attributetypes/attribute_types-core_demo.csv @@ -1,3 +1,6 @@ -Uuid,Void/Retire,Entity name,Name,Description,Min occurs,Max occurs,Datatype classname,Datatype config,Preferred handler classname,Handler config,_order:1000 -57ea0cbb-064f-4d09-8cf4-e8228700491c,,Visit,Punctuality,,0,1,org.openmrs.customdatatype.datatype.ConceptDatatype,d81d4698-e78c-420d-aac5-cb1f606fb32e,,, -aac48226-d143-4274-80e0-264db4e368ee,,Visit,Insurance Policy Number,,0,1,org.openmrs.customdatatype.datatype.FreeTextDatatype,,,, +Uuid,Void/Retire,Entity name,Name,Description,Min occurs,Max occurs,Datatype classname,Datatype config,Preferred handler classname,Handler config,_order:1000 +57ea0cbb-064f-4d09-8cf4-e8228700491c,,Visit,Punctuality,,0,1,org.openmrs.customdatatype.datatype.ConceptDatatype,d81d4698-e78c-420d-aac5-cb1f606fb32e,,, +aac48226-d143-4274-80e0-264db4e368ee,,Visit,Insurance Policy Number,,0,1,org.openmrs.customdatatype.datatype.FreeTextDatatype,,,, +3a988e33-a6c0-4b76-b924-01abb998944b,,Visit,Insurance Scheme,"The insurance scheme the patient is using to settle payment for services, expects a uuid",0,1,org.openmrs.customdatatype.datatype.FreeTextDatatype,,,, +8553afa0-bdb9-4d3c-8a98-05fa9350aa85,,Visit,Payment Method,"The payment method used by the patient to settle payment, expects a uuid",0,1,org.openmrs.customdatatype.datatype.FreeTextDatatype,,,, +fbc0702d-b4c9-4968-be63-af8ad3ad6239,,Visit,Patient Type,"If the patient will be paying or receives services for free, expects a uuid",0,1,org.openmrs.customdatatype.datatype.FreeTextDatatype,,,, \ No newline at end of file From 955c9665981b6d0d7282c11bc8d75012c3e19ff2 Mon Sep 17 00:00:00 2001 From: chibongho Date: Fri, 15 Mar 2024 12:04:28 -0400 Subject: [PATCH 2/9] (feat) O3-2948 Add frontend config to RefApp (#787) --- README.md | 2 ++ docker-compose.yml | 2 +- frontend/Dockerfile | 1 + frontend/config-core_demo.json | 5 +++++ 4 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 frontend/config-core_demo.json diff --git a/README.md b/README.md index 0ec4072f3..309a5c932 100644 --- a/README.md +++ b/README.md @@ -56,4 +56,6 @@ To help us keep track of things, we ask that you suffix any files you add with e those that should be part of the core package. For example, a form named `test_form.json` would become `test_core-core_demo.json`. +Frontend configuration can be found in `frontend/config-core_demo.json`. + Thanks! diff --git a/docker-compose.yml b/docker-compose.yml index f7cf5dac0..2989cd45c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -16,7 +16,7 @@ services: environment: SPA_PATH: /openmrs/spa API_URL: /openmrs - SPA_CONFIG_URLS: + SPA_CONFIG_URLS: config-core_demo.json SPA_DEFAULT_LOCALE: healthcheck: test: ["CMD", "curl", "-f", "http://localhost/"] diff --git a/frontend/Dockerfile b/frontend/Dockerfile index 1cff5ca95..2e35ff873 100644 --- a/frontend/Dockerfile +++ b/frontend/Dockerfile @@ -36,5 +36,6 @@ RUN chmod +x /usr/local/bin/startup.sh COPY nginx.conf /etc/nginx/nginx.conf COPY --from=dev /app/spa /usr/share/nginx/html +COPY config-core_demo.json /usr/share/nginx/html CMD ["/usr/local/bin/startup.sh"] diff --git a/frontend/config-core_demo.json b/frontend/config-core_demo.json new file mode 100644 index 000000000..50fa5e4b7 --- /dev/null +++ b/frontend/config-core_demo.json @@ -0,0 +1,5 @@ +{ + "@openmrs/esm-styleguide": { + "Brand color #1": "#005d5d" + } +} From 1617b4f8ee9410b832b32f33088cfabfc54aac22 Mon Sep 17 00:00:00 2001 From: Jayasanka Weerasinghe <33048395+jayasanka-sack@users.noreply.github.com> Date: Fri, 15 Mar 2024 22:36:20 +0530 Subject: [PATCH 3/9] (release) Release 3.0.0-beta.18 --- distro/pom.xml | 6 +-- frontend/Dockerfile | 6 +-- frontend/pom.xml | 2 +- frontend/spa-assemble-config.json | 70 +++++++++++++++---------------- pom.xml | 2 +- 5 files changed, 43 insertions(+), 43 deletions(-) diff --git a/distro/pom.xml b/distro/pom.xml index 90879ce07..52470c0fd 100644 --- a/distro/pom.xml +++ b/distro/pom.xml @@ -4,7 +4,7 @@ org.openmrs.distro referenceapplication - 3.0.0-SNAPSHOT + 3.0.0-beta.18 referenceapplication-distro @@ -23,7 +23,7 @@ - 2.0.0-SNAPSHOT + 2.0.0 2.6.4 2.6.0 2.41.0 @@ -40,7 +40,7 @@ 2.2.1 2.0.0-20231101.130425-7 2.0.0-20230831.113926-1 - 3.7.0-SNAPSHOT + 3.7.1 1.25.0 1.14.0 diff --git a/frontend/Dockerfile b/frontend/Dockerfile index 2e35ff873..35489eff0 100644 --- a/frontend/Dockerfile +++ b/frontend/Dockerfile @@ -4,7 +4,7 @@ #-------------------------------------------- FROM --platform=$BUILDPLATFORM node:18-alpine as dev -ARG APP_SHELL_VERSION=next +ARG APP_SHELL_VERSION=5.5.0 RUN mkdir -p /app WORKDIR /app @@ -13,8 +13,8 @@ COPY spa-assemble-config.json . COPY spa-build-config.json . ARG CACHE_BUST -RUN npx --legacy-peer-deps openmrs@${APP_SHELL_VERSION:-next} assemble --manifest --mode config --config spa-assemble-config.json --target ./spa -RUN npx --legacy-peer-deps openmrs@${APP_SHELL_VERSION:-next} build --build-config spa-build-config.json --target ./spa +RUN npx --legacy-peer-deps openmrs@${APP_SHELL_VERSION:-5.5.0} assemble --manifest --mode config --config spa-assemble-config.json --target ./spa +RUN npx --legacy-peer-deps openmrs@${APP_SHELL_VERSION:-5.5.0} build --build-config spa-build-config.json --target ./spa RUN if [ ! -f ./spa/index.html ]; then echo 'Build failed. Please check the logs above for details. This may have happened because of an update to a library that OpenMRS depends on.'; exit 1; fi #-------------------------------------------- diff --git a/frontend/pom.xml b/frontend/pom.xml index fdc5f8ab8..4ba3cb9bd 100644 --- a/frontend/pom.xml +++ b/frontend/pom.xml @@ -4,7 +4,7 @@ org.openmrs.distro referenceapplication - 3.0.0-beta.17 + 3.0.0-beta.18 referenceapplication-frontend diff --git a/frontend/spa-assemble-config.json b/frontend/spa-assemble-config.json index aebf581da..25d9d6e2e 100644 --- a/frontend/spa-assemble-config.json +++ b/frontend/spa-assemble-config.json @@ -1,40 +1,40 @@ { "frontendModules": { - "@openmrs/esm-devtools-app": "next", - "@openmrs/esm-implementer-tools-app": "next", - "@openmrs/esm-login-app": "next", - "@openmrs/esm-primary-navigation-app": "next", - "@openmrs/esm-home-app": "next", - "@openmrs/esm-form-entry-app": "next", - "@openmrs/esm-generic-patient-widgets-app": "next", - "@openmrs/esm-patient-allergies-app": "next", - "@openmrs/esm-patient-appointments-app": "next", - "@openmrs/esm-patient-attachments-app": "next", - "@openmrs/esm-patient-banner-app": "next", - "@openmrs/esm-patient-chart-app": "next", - "@openmrs/esm-patient-conditions-app": "next", - "@openmrs/esm-patient-forms-app": "next", - "@openmrs/esm-patient-flags-app": "next", - "@openmrs/esm-patient-immunizations-app": "next", - "@openmrs/esm-patient-labs-app": "next", - "@openmrs/esm-patient-lists-app": "next", - "@openmrs/esm-patient-medications-app": "next", - "@openmrs/esm-patient-notes-app": "next", - "@openmrs/esm-patient-orders-app": "next", - "@openmrs/esm-patient-programs-app": "next", - "@openmrs/esm-patient-vitals-app": "next", - "@openmrs/esm-active-visits-app": "next", - "@openmrs/esm-appointments-app": "next", - "@openmrs/esm-service-queues-app": "next", - "@openmrs/esm-patient-list-management-app": "next", - "@openmrs/esm-patient-registration-app": "next", - "@openmrs/esm-patient-search-app": "next", - "@openmrs/esm-openconceptlab-app": "next", - "@openmrs/esm-system-admin-app": "next", - "@openmrs/esm-dispensing-app": "next", - "@openmrs/esm-fast-data-entry-app": "next", - "@openmrs/esm-cohort-builder-app": "next", - "@openmrs/esm-form-builder-app": "next" + "@openmrs/esm-devtools-app": "5.5.0", + "@openmrs/esm-implementer-tools-app": "5.5.0", + "@openmrs/esm-login-app": "5.5.0", + "@openmrs/esm-primary-navigation-app": "5.5.0", + "@openmrs/esm-home-app": "5.2.3", + "@openmrs/esm-form-entry-app": "7.1.0", + "@openmrs/esm-generic-patient-widgets-app": "7.1.0", + "@openmrs/esm-patient-allergies-app": "7.1.0", + "@openmrs/esm-patient-appointments-app": "7.1.0", + "@openmrs/esm-patient-attachments-app": "7.1.0", + "@openmrs/esm-patient-banner-app": "7.1.0", + "@openmrs/esm-patient-chart-app": "7.1.0", + "@openmrs/esm-patient-conditions-app": "7.1.0", + "@openmrs/esm-patient-forms-app": "7.1.0", + "@openmrs/esm-patient-flags-app": "7.1.0", + "@openmrs/esm-patient-immunizations-app": "7.1.0", + "@openmrs/esm-patient-labs-app": "7.1.0", + "@openmrs/esm-patient-lists-app": "7.1.0", + "@openmrs/esm-patient-medications-app": "7.1.0", + "@openmrs/esm-patient-notes-app": "7.1.0", + "@openmrs/esm-patient-orders-app": "7.1.0", + "@openmrs/esm-patient-programs-app": "7.1.0", + "@openmrs/esm-patient-vitals-app": "7.1.0", + "@openmrs/esm-active-visits-app": "6.1.0", + "@openmrs/esm-appointments-app": "6.1.0", + "@openmrs/esm-service-queues-app": "6.1.0", + "@openmrs/esm-patient-list-management-app": "6.1.0", + "@openmrs/esm-patient-registration-app": "6.1.0", + "@openmrs/esm-patient-search-app": "6.1.0", + "@openmrs/esm-openconceptlab-app": "4.0.2", + "@openmrs/esm-system-admin-app": "4.0.2", + "@openmrs/esm-dispensing-app": "1.3.1", + "@openmrs/esm-fast-data-entry-app": "1.0.1-pre.139", + "@openmrs/esm-cohort-builder-app": "3.0.1-pre.192", + "@openmrs/esm-form-builder-app": "2.4.0" }, "excludedFrontendModules": [] } diff --git a/pom.xml b/pom.xml index 1c417f2c0..63c46bea0 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ Package and Run OpenMRS Convenient project to build an OpenMRS distribution and run it - 3.0.0-SNAPSHOT + 3.0.0-beta.18 pom From 33934930ed520928b7e1fab283e094dea0884db0 Mon Sep 17 00:00:00 2001 From: Jayasanka Weerasinghe <33048395+jayasanka-sack@users.noreply.github.com> Date: Fri, 15 Mar 2024 22:36:41 +0530 Subject: [PATCH 4/9] (release-revert) Reset to dev versions This reverts commit 49cd8227319c23096d02e984e727a247b7ff48c3. --- distro/pom.xml | 6 +-- frontend/Dockerfile | 6 +-- frontend/pom.xml | 2 +- frontend/spa-assemble-config.json | 70 +++++++++++++++---------------- pom.xml | 2 +- 5 files changed, 43 insertions(+), 43 deletions(-) diff --git a/distro/pom.xml b/distro/pom.xml index 52470c0fd..90879ce07 100644 --- a/distro/pom.xml +++ b/distro/pom.xml @@ -4,7 +4,7 @@ org.openmrs.distro referenceapplication - 3.0.0-beta.18 + 3.0.0-SNAPSHOT referenceapplication-distro @@ -23,7 +23,7 @@ - 2.0.0 + 2.0.0-SNAPSHOT 2.6.4 2.6.0 2.41.0 @@ -40,7 +40,7 @@ 2.2.1 2.0.0-20231101.130425-7 2.0.0-20230831.113926-1 - 3.7.1 + 3.7.0-SNAPSHOT 1.25.0 1.14.0 diff --git a/frontend/Dockerfile b/frontend/Dockerfile index 35489eff0..2e35ff873 100644 --- a/frontend/Dockerfile +++ b/frontend/Dockerfile @@ -4,7 +4,7 @@ #-------------------------------------------- FROM --platform=$BUILDPLATFORM node:18-alpine as dev -ARG APP_SHELL_VERSION=5.5.0 +ARG APP_SHELL_VERSION=next RUN mkdir -p /app WORKDIR /app @@ -13,8 +13,8 @@ COPY spa-assemble-config.json . COPY spa-build-config.json . ARG CACHE_BUST -RUN npx --legacy-peer-deps openmrs@${APP_SHELL_VERSION:-5.5.0} assemble --manifest --mode config --config spa-assemble-config.json --target ./spa -RUN npx --legacy-peer-deps openmrs@${APP_SHELL_VERSION:-5.5.0} build --build-config spa-build-config.json --target ./spa +RUN npx --legacy-peer-deps openmrs@${APP_SHELL_VERSION:-next} assemble --manifest --mode config --config spa-assemble-config.json --target ./spa +RUN npx --legacy-peer-deps openmrs@${APP_SHELL_VERSION:-next} build --build-config spa-build-config.json --target ./spa RUN if [ ! -f ./spa/index.html ]; then echo 'Build failed. Please check the logs above for details. This may have happened because of an update to a library that OpenMRS depends on.'; exit 1; fi #-------------------------------------------- diff --git a/frontend/pom.xml b/frontend/pom.xml index 4ba3cb9bd..3f9daa30a 100644 --- a/frontend/pom.xml +++ b/frontend/pom.xml @@ -4,7 +4,7 @@ org.openmrs.distro referenceapplication - 3.0.0-beta.18 + 3.0.0-SNAPSHOT referenceapplication-frontend diff --git a/frontend/spa-assemble-config.json b/frontend/spa-assemble-config.json index 25d9d6e2e..aebf581da 100644 --- a/frontend/spa-assemble-config.json +++ b/frontend/spa-assemble-config.json @@ -1,40 +1,40 @@ { "frontendModules": { - "@openmrs/esm-devtools-app": "5.5.0", - "@openmrs/esm-implementer-tools-app": "5.5.0", - "@openmrs/esm-login-app": "5.5.0", - "@openmrs/esm-primary-navigation-app": "5.5.0", - "@openmrs/esm-home-app": "5.2.3", - "@openmrs/esm-form-entry-app": "7.1.0", - "@openmrs/esm-generic-patient-widgets-app": "7.1.0", - "@openmrs/esm-patient-allergies-app": "7.1.0", - "@openmrs/esm-patient-appointments-app": "7.1.0", - "@openmrs/esm-patient-attachments-app": "7.1.0", - "@openmrs/esm-patient-banner-app": "7.1.0", - "@openmrs/esm-patient-chart-app": "7.1.0", - "@openmrs/esm-patient-conditions-app": "7.1.0", - "@openmrs/esm-patient-forms-app": "7.1.0", - "@openmrs/esm-patient-flags-app": "7.1.0", - "@openmrs/esm-patient-immunizations-app": "7.1.0", - "@openmrs/esm-patient-labs-app": "7.1.0", - "@openmrs/esm-patient-lists-app": "7.1.0", - "@openmrs/esm-patient-medications-app": "7.1.0", - "@openmrs/esm-patient-notes-app": "7.1.0", - "@openmrs/esm-patient-orders-app": "7.1.0", - "@openmrs/esm-patient-programs-app": "7.1.0", - "@openmrs/esm-patient-vitals-app": "7.1.0", - "@openmrs/esm-active-visits-app": "6.1.0", - "@openmrs/esm-appointments-app": "6.1.0", - "@openmrs/esm-service-queues-app": "6.1.0", - "@openmrs/esm-patient-list-management-app": "6.1.0", - "@openmrs/esm-patient-registration-app": "6.1.0", - "@openmrs/esm-patient-search-app": "6.1.0", - "@openmrs/esm-openconceptlab-app": "4.0.2", - "@openmrs/esm-system-admin-app": "4.0.2", - "@openmrs/esm-dispensing-app": "1.3.1", - "@openmrs/esm-fast-data-entry-app": "1.0.1-pre.139", - "@openmrs/esm-cohort-builder-app": "3.0.1-pre.192", - "@openmrs/esm-form-builder-app": "2.4.0" + "@openmrs/esm-devtools-app": "next", + "@openmrs/esm-implementer-tools-app": "next", + "@openmrs/esm-login-app": "next", + "@openmrs/esm-primary-navigation-app": "next", + "@openmrs/esm-home-app": "next", + "@openmrs/esm-form-entry-app": "next", + "@openmrs/esm-generic-patient-widgets-app": "next", + "@openmrs/esm-patient-allergies-app": "next", + "@openmrs/esm-patient-appointments-app": "next", + "@openmrs/esm-patient-attachments-app": "next", + "@openmrs/esm-patient-banner-app": "next", + "@openmrs/esm-patient-chart-app": "next", + "@openmrs/esm-patient-conditions-app": "next", + "@openmrs/esm-patient-forms-app": "next", + "@openmrs/esm-patient-flags-app": "next", + "@openmrs/esm-patient-immunizations-app": "next", + "@openmrs/esm-patient-labs-app": "next", + "@openmrs/esm-patient-lists-app": "next", + "@openmrs/esm-patient-medications-app": "next", + "@openmrs/esm-patient-notes-app": "next", + "@openmrs/esm-patient-orders-app": "next", + "@openmrs/esm-patient-programs-app": "next", + "@openmrs/esm-patient-vitals-app": "next", + "@openmrs/esm-active-visits-app": "next", + "@openmrs/esm-appointments-app": "next", + "@openmrs/esm-service-queues-app": "next", + "@openmrs/esm-patient-list-management-app": "next", + "@openmrs/esm-patient-registration-app": "next", + "@openmrs/esm-patient-search-app": "next", + "@openmrs/esm-openconceptlab-app": "next", + "@openmrs/esm-system-admin-app": "next", + "@openmrs/esm-dispensing-app": "next", + "@openmrs/esm-fast-data-entry-app": "next", + "@openmrs/esm-cohort-builder-app": "next", + "@openmrs/esm-form-builder-app": "next" }, "excludedFrontendModules": [] } diff --git a/pom.xml b/pom.xml index 63c46bea0..1c417f2c0 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ Package and Run OpenMRS Convenient project to build an OpenMRS distribution and run it - 3.0.0-beta.18 + 3.0.0-SNAPSHOT pom From 9dd407f97e10f56b77bde9e2e978d9c583c1269b Mon Sep 17 00:00:00 2001 From: CynthiaKamau Date: Mon, 18 Mar 2024 15:41:58 +0300 Subject: [PATCH 5/9] O3-2912 Missing Invoice Number in Invoice Summary (#791) --- .../configuration/globalproperties/billing-core_demo.xml | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 distro/configuration/globalproperties/billing-core_demo.xml diff --git a/distro/configuration/globalproperties/billing-core_demo.xml b/distro/configuration/globalproperties/billing-core_demo.xml new file mode 100644 index 000000000..1210986d1 --- /dev/null +++ b/distro/configuration/globalproperties/billing-core_demo.xml @@ -0,0 +1,9 @@ + + + + cashier.systemReceiptNumberGenerator + org.openmrs.module.cashier.api.SequentialReceiptNumberGenerator + The fully qualified class name of the component responsible for generating sequential receipt numbers within the cashier system. This class contains functions and methods tailored to efficiently generate unique receipt numbers in sequential order. + + + \ No newline at end of file From 46ef585d156bb3678034a79fcc4437508ca80e74 Mon Sep 17 00:00:00 2001 From: Mark Goodrich Date: Mon, 18 Mar 2024 18:01:29 -0400 Subject: [PATCH 6/9] =?UTF-8?q?(refactor)=20O3-2891:=20Refactor=20Patient?= =?UTF-8?q?=20Appointments=20ESM=20into=20Appointmen=E2=80=A6=20(#794)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/spa-assemble-config.json | 1 - 1 file changed, 1 deletion(-) diff --git a/frontend/spa-assemble-config.json b/frontend/spa-assemble-config.json index aebf581da..cc3c61d48 100644 --- a/frontend/spa-assemble-config.json +++ b/frontend/spa-assemble-config.json @@ -8,7 +8,6 @@ "@openmrs/esm-form-entry-app": "next", "@openmrs/esm-generic-patient-widgets-app": "next", "@openmrs/esm-patient-allergies-app": "next", - "@openmrs/esm-patient-appointments-app": "next", "@openmrs/esm-patient-attachments-app": "next", "@openmrs/esm-patient-banner-app": "next", "@openmrs/esm-patient-chart-app": "next", From b13c94aae112d8b6fcdf48bdbdd979ec9c43261f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Bontyes?= Date: Tue, 19 Mar 2024 10:44:54 -0400 Subject: [PATCH 7/9] O3-2976 - Add Arabic language option to O3 RefApp (#795) --- distro/configuration/globalproperties/i18n-core_demo.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/distro/configuration/globalproperties/i18n-core_demo.xml b/distro/configuration/globalproperties/i18n-core_demo.xml index d5c39dbe8..c730a6144 100644 --- a/distro/configuration/globalproperties/i18n-core_demo.xml +++ b/distro/configuration/globalproperties/i18n-core_demo.xml @@ -2,7 +2,7 @@ locale.allowed.list - en, en_GB, es, fr, he, km + en, en_GB, es, fr, he, km, ar From 0eb6f5d8cbe1d914fc718dbdff32314ca1aad937 Mon Sep 17 00:00:00 2001 From: dkayiwa Date: Thu, 21 Mar 2024 00:53:28 +0300 Subject: [PATCH 8/9] Temporarily switch to openmrs core 2.7.0-SNAPSHOT https://talk.openmrs.org/t/optimizing-the-backend-examples-of-slow-responses-in-o3/40716/27 --- distro/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/distro/pom.xml b/distro/pom.xml index 90879ce07..5e4535d2f 100644 --- a/distro/pom.xml +++ b/distro/pom.xml @@ -24,7 +24,7 @@ 2.0.0-SNAPSHOT - 2.6.4 + 2.7.0-SNAPSHOT 2.6.0 2.41.0 2.17.0 From 29f2d413cf54e91f1164e3f2ddf356fdeb6061ae Mon Sep 17 00:00:00 2001 From: Ian Date: Thu, 21 Mar 2024 09:25:37 -0400 Subject: [PATCH 9/9] Fix typo in deploy check --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 3c7089011..4339ff4cd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,7 +12,7 @@ COPY pom.xml ./ COPY distro ./distro/ # Build the distro, but only deploy from the amd64 build -RUN --mount=type=secret,id=m2settings,target=/root/.m2/settings.xml if [[ "$MVN_ARGS" != "deploy" || "$(arch)" = "x84_64" ]]; then mvn $MVN_ARGS_SETTINGS $MVN_ARGS; else mvn $MVN_ARGS_SETTINGS install; fi +RUN --mount=type=secret,id=m2settings,target=/root/.m2/settings.xml if [[ "$MVN_ARGS" != "deploy" || "$(arch)" = "x86_64" ]]; then mvn $MVN_ARGS_SETTINGS $MVN_ARGS; else mvn $MVN_ARGS_SETTINGS install; fi RUN cp /openmrs_distro/distro/target/sdk-distro/web/openmrs.war /openmrs/distribution/openmrs_core/