Skip to content

Commit

Permalink
Copy config files to the correct directory
Browse files Browse the repository at this point in the history
  • Loading branch information
jayasanka-sack committed Jan 16, 2025
1 parent f2af331 commit 4fa4e1d
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
9 changes: 3 additions & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,9 @@ RUN --mount=type=secret,id=m2settings,target=/usr/share/maven/ref/settings-docke
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/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
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/
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
Expand Down
5 changes: 4 additions & 1 deletion distro/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@
<phase>package</phase>
<configuration>
<target>
<copy todir="${project.build.directory}/openmrs_config">
<copy todir="${project.build.directory}/sdk-distro/web/openmrs_config">
<fileset dir="${project.basedir}/configuration"/>
</copy>
</target>
Expand Down Expand Up @@ -333,6 +333,9 @@
<goals>
<goal>validate-configurations</goal>
</goals>
<configuration>
<sourceDir>${project.build.directory}/sdk-distro/web/openmrs_config</sourceDir>
</configuration>
</execution>
</executions>
</plugin>
Expand Down

0 comments on commit 4fa4e1d

Please sign in to comment.