Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert to latest stable releases of ozone and OpenMRS docker image #57

Merged
merged 6 commits into from
Nov 4, 2024
+59 −67
Merged

Revert to latest stable releases of ozone and OpenMRS docker image #57

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
197dfee
Revert to latest stable releases of ozone and OpenMRS docker image
jnsereko Oct 29, 2024
eef1812
ensure that an rc image is used
jnsereko Oct 29, 2024
8742df1
Revert to latest stable releases of ozone and OpenMRS docker image
jnsereko Oct 29, 2024
e6b4252
ensure that an rc image is used
jnsereko Oct 29, 2024
6b99841
Add billing and stock management esm version
jnsereko Oct 30, 2024
af6191e
Merge branch 'migrate_to_stable' of https://github.com/jnsereko/UVL-E…
michaelbontyes Nov 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 0 additions & 44 deletions distro/configs/openmrs/frontend_assembly/reference-application-spa-assemble-config.json
View file
Open in desktop

This file was deleted.

3 changes: 2 additions & 1 deletion distro/configs/openmrs/frontend_assembly/spa-assemble-config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
{
"coreVersion": "latest",
"frontendModules": {
"@openmrs/esm-cohort-builder-app": "latest",
"@openmrs/esm-home-app": "latest",
Expand Down
62 changes: 40 additions & 22 deletions distro/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.ozonehis</groupId>
<artifactId>maven-parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
<version>1.0.0-alpha.11</version>
<relativePath />
</parent>

Expand All @@ -20,7 +20,7 @@
<maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target>
<PatientIdentifierGeneratorVersion>0.1.0</PatientIdentifierGeneratorVersion>
<UVLReferenceapplicationDockerVersion>qa</UVLReferenceapplicationDockerVersion>
<UVLReferenceapplicationDockerVersion>3.2.0-rc.3</UVLReferenceapplicationDockerVersion>
<!-- Stock Management and Billing -->
<stockmanagement.version>2.0.2-SNAPSHOT</stockmanagement.version>
<billing.version>1.2.0-SNAPSHOT</billing.version>
Expand Down Expand Up @@ -79,24 +79,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<executions>
<execution>
<!-- Copy UVL reference-application-spa-assemble-config.json to frontend working directory -->
<id>Copy UVL reference-application-spa-assemble-config.json to local working directory</id>
<phase>generate-resources</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${project.build.directory}/openmrs_frontend</outputDirectory>
<overwrite>true</overwrite>
<resources>
<resource>
<directory>${project.basedir}/configs/openmrs/frontend_assembly</directory>
<filtering>false</filtering>
</resource>
</resources>
</configuration>
</execution>
<execution>
<!-- Override the Ozone files exclusion execution so to inherit all O3 Ref App files -->
<id>Exclude unneeded Ozone files</id>
Expand Down Expand Up @@ -191,7 +173,7 @@
</goals>
<configuration>
<target>
<echo message="Adding uvl frontend config"/>
<echo level="info" message="Adding uvl frontend config"/>
<replaceregexp file="${project.build.directory}/${project.artifactId}-${project.version}/run/docker/.env"
match="ozone-frontend-config.json" replace="uvl-frontend-config.json" />
</target>
Expand All @@ -205,9 +187,45 @@
</goals>
<configuration>
<target>
<echo message="Adding uvl docker image version"/>
<echo level="info" message="Adding uvl docker image version"/>
<replaceregexp file="${project.build.directory}/${project.artifactId}-${project.version}/run/docker/.env"
match="O3_DOCKER_IMAGE_TAG=.*" replace="O3_DOCKER_IMAGE_TAG=${UVLReferenceapplicationDockerVersion}" />
<replace file="${project.build.directory}/${project.artifactId}-${project.version}/run/docker/docker-compose-openmrs.yml"
token="3.0.0-beta.21" value="${O3_DOCKER_IMAGE_TAG:-nightly}" />
</target>
</configuration>
</execution>
<execution>
<id>Add UVL addons to ozone</id>
<phase>process-resources</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<target>
<echo level="info" message="Adding UVL core version"/>
<replaceregexp file="${project.build.directory}/openmrs/frontend_assembly/build-openmrs-frontend.groovy"
match="openmrsVersion =.*" replace='openmrsVersion = slurper.parse(Paths.get("${project.build.directory}", "openmrs_frontend", "spa-assemble-config.json").toFile())["coreVersion"] ?: "next"'/>

<echo level="info" message="Adding UVL project Name to ozone" />
<replace
dir="${project.build.directory}/${project.artifactId}-${project.version}/run/docker/scripts"
token='-p ozone'>
<include name="**/*.sh"/>
<replacevalue>
-p $PROJECT_NAME
</replacevalue>
</replace>
<replace
file="${project.build.directory}/${project.artifactId}-${project.version}/run/docker/scripts/utils.sh"
token='export BOLD=`tput bold`'>
<replacevalue>
export BOLD=`tput bold`&#10;export PROJECT_NAME="${project.artifactId}"
</replacevalue>
</replace>

<echo level="info" message="Setting executable permissions for the Ozone start.sh script" />
<chmod file="${project.build.directory}/${project.artifactId}-${project.version}/run/docker/scripts/*.sh" perm="700"/>
</target>
</configuration>
</execution>
Expand Down
14 changes: 14 additions & 0 deletions sites/mugamba/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,20 @@
</target>
</configuration>
</execution>
<execution>
<id>Add UVL project name configuration</id>
<phase>process-resources</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<target>
<echo level="info" message="Adding Mugamba project Name to ozone" />
<replaceregexp file="${project.build.directory}/${project.artifactId}-${project.version}/run/docker/scripts/utils.sh"
match="export PROJECT_NAME=.*" replace='export PROJECT_NAME="${project.artifactId}"' />
</target>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
Expand Down