Use referenceapplication content package

openmrs · Jan 6, 2025 · e50ae3e · e50ae3e
1 parent b4c1027
commit e50ae3e
Show file tree

Hide file tree

Showing 10 changed files with 12 additions and 77 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -12,13 +12,16 @@ COPY pom.xml ./
 COPY distro ./distro/
 
 # Build the distro, but only deploy from the amd64 build
-RUN --mount=type=secret,id=m2settings,target=/usr/share/maven/ref/settings-docker.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/
+RUN --mount=type=secret,id=m2settings,target=/usr/share/maven/ref/settings-docker.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_core/openmrs.war /openmrs/distribution/openmrs_core/
 RUN cp /openmrs_distro/distro/target/sdk-distro/web/openmrs-distro.properties /openmrs/distribution/
-RUN cp -R /openmrs_distro/distro/target/sdk-distro/web/modules /openmrs/distribution/openmrs_modules
-RUN cp -R /openmrs_distro/distro/target/sdk-distro/web/owa /openmrs/distribution/openmrs_owas
+RUN cp -R /openmrs_distro/distro/target/sdk-distro/web/openmrs_modules /openmrs/distribution/openmrs_modules
+RUN cp -R /openmrs_distro/distro/target/sdk-distro/web/openmrs_owas /openmrs/distribution/openmrs_owas
+
+# Copy configuration from the distro and content packages
+RUN cp -R /openmrs_distro/distro/configuration /openmrs/distribution/openmrs_config
+RUN cp -R /openmrs_distro/distro/target/sdk-distro/web/openmrs_config/* /openmrs/distribution/openmrs_config
 
 # Clean up after copying needed artifacts
 RUN mvn $MVN_ARGS_SETTINGS clean
@@ -33,4 +36,4 @@ COPY --from=dev /openmrs/distribution/openmrs_core/openmrs.war /openmrs/distribu
 COPY --from=dev /openmrs/distribution/openmrs-distro.properties /openmrs/distribution/
 COPY --from=dev /openmrs/distribution/openmrs_modules /openmrs/distribution/openmrs_modules
 COPY --from=dev /openmrs/distribution/openmrs_owas /openmrs/distribution/openmrs_owas
-COPY --from=dev /openmrs_distro/distro/configuration /openmrs/distribution/openmrs_config
+COPY --from=dev  /openmrs/distribution/openmrs_config /openmrs/distribution/openmrs_config
diff --git a/distro/configuration/conceptclasses/conceptclasses-core_data.csv b/distro/configuration/conceptclasses/conceptclasses-core_data.csv
diff --git a/distro/configuration/conceptsources/conceptsources-core_data.csv b/distro/configuration/conceptsources/conceptsources-core_data.csv
diff --git a/distro/configuration/fhirconceptsources/fhir_concept_sources-core_data.csv b/distro/configuration/fhirconceptsources/fhir_concept_sources-core_data.csv
diff --git a/distro/configuration/globalproperties/globalproperties-core_data.xml b/distro/configuration/globalproperties/globalproperties-core_data.xml
diff --git a/distro/configuration/locationtags/locationtags-core_demo.csv b/distro/configuration/locationtags/locationtags-core_demo.csv
diff --git a/...o/configuration/ocl/openmrs_CIELImmunizationContent_v9_autoexpand-9.2023-10-29_230040.zip b/...o/configuration/ocl/openmrs_CIELImmunizationContent_v9_autoexpand-9.2023-10-29_230040.zip
diff --git a/distro/configuration/ocl/openmrs_PD_v7_autoexpand-7.2024-06-04_200232.zip b/distro/configuration/ocl/openmrs_PD_v7_autoexpand-7.2024-06-04_200232.zip
diff --git a/distro/distro.properties b/distro/distro.properties
@@ -33,3 +33,4 @@ omod.event=${event.version}
 omod.bedmanagement=${bedmanagement.version}
 omod.stockmanagement=${stockmanagement.version}
 omod.billing=${billing.version}
+content.referenceapplication=1.0.0-SNAPSHOT
diff --git a/pom.xml b/pom.xml
@@ -109,7 +109,8 @@
         <plugin>
           <groupId>org.openmrs.maven.plugins</groupId>
           <artifactId>openmrs-sdk-maven-plugin</artifactId>
-          <version>5.15.0</version>
+          <version>6.1.0-SNAPSHOT</version>
+
         </plugin>
         <plugin>
           <groupId>org.openmrs.maven.plugins</groupId>