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

OZ-668: Add Ability to run Ozone in a single and standalone (distro-embedded) Docker Compose file #83

Merged
merged 14 commits into from
Sep 3, 2024
Merged

OZ-668: Add Ability to run Ozone in a single and standalone (distro-embedded) Docker Compose file #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
9686c9e
(WIP) OZ-668: Add Ability to run Ozone in a single and standalone (di…
enyachoke Aug 9, 2024
1b989fb
Finish bulding images
enyachoke Aug 21, 2024
705b599
Address pr feedback
enyachoke Aug 22, 2024
3416f76
Update Image names
enyachoke Aug 26, 2024
2a9322e
Update tags
enyachoke Aug 26, 2024
3f711e8
Rename profile
enyachoke Aug 27, 2024
b504d8d
Change docker profile name
enyachoke Aug 27, 2024
da31c16
Refactor
enyachoke Aug 28, 2024
37fb63f
Refactor image names
enyachoke Sep 2, 2024
439e72b
Remove docker.tag property
enyachoke Sep 2, 2024
68f3509
Remove unneed exclude
enyachoke Sep 2, 2024
9c57109
Remove extra newline
enyachoke Sep 2, 2024
d72743f
Clean disk
enyachoke Sep 3, 2024
be1e1e1
Revert disk cleanup step
enyachoke Sep 3, 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
6 changes: 5 additions & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
with:
java-version: "8"
maven-phase: "install"
maven-args: "-P validator" # OMRS config validation
maven-args: "-Pvalidator -Pbundled-docker" # Validate OpenMRS configs & build Docker images embedding the distro bins and configs
secrets:
NEXUS_USERNAME: ${{ secrets.NEXUS_USERNAME }}
NEXUS_PASSWORD: ${{ secrets.NEXUS_PASSWORD }}
Expand All @@ -23,6 +23,10 @@ jobs:
if: ${{ (github.event_name == 'push' && github.ref == 'refs/heads/main') || github.event_name == 'release' }}
needs: validate
uses: mekomsolutions/shared-github-workflow/.github/workflows/maven-publish.yml@main
with:
maven-args: "-Pbundled-docker" # Build Docker images embedding the distro bins and configs
secrets:
NEXUS_USERNAME: ${{ secrets.NEXUS_USERNAME }}
NEXUS_PASSWORD: ${{ secrets.NEXUS_PASSWORD }}
DOCKER_HUB_USERNAME: ${{ secrets.DOCKER_HUB_USERNAME }}
DOCKER_HUB_PASSWORD: ${{ secrets.DOCKER_HUB_PASSWORD }}
4 changes: 1 addition & 3 deletions assembly.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@
<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="
http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2
http://maven.apache.org/xsd/assembly-1.1.2.xsd"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd"
>
<id>zip-distro-dir</id>
<formats>
Expand Down
6 changes: 2 additions & 4 deletions distro/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@
<type>zip</type>
<version>${referenceapplicationDistroVersion}</version>
</dependency>

<!-- Odoo addons-->
<dependency>
<groupId>net.mekomsolutions.odoo</groupId>
Expand Down Expand Up @@ -227,7 +226,6 @@
<includeArtifactIds>referenceapplication-distro</includeArtifactIds>
</configuration>
</execution>

<execution>
<id>Unpack OpenMRS Ref App frontend configuration</id>
<phase>generate-resources</phase>
Expand All @@ -249,14 +247,14 @@
</goals>
<configuration>
<excludeTransitive>true</excludeTransitive>
<outputDirectory>${project.build.directory}/${project.artifactId}-${project.version}/configs/superset</outputDirectory>
<outputDirectory>
${project.build.directory}/${project.artifactId}-${project.version}/configs/superset</outputDirectory>
<includeArtifactIds>ozone-superset-configs</includeArtifactIds>
</configuration>
</execution>

</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
Expand Down
280 changes: 270 additions & 10 deletions maven-parent/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
Expand Down Expand Up @@ -87,7 +87,7 @@
<includeTypes>jar, omod</includeTypes>
</configuration>
</execution>

<execution>
<id>Unpack Ozone Scripts</id>
<phase>generate-resources</phase>
Expand All @@ -107,9 +107,10 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<executions>
<execution>
<execution>
<!-- Exclude files from Ozone -->
<!-- We exclude nothing here, but distros should override this with any exclusions they need -->
<!-- We exclude nothing here, but distros should override this with any exclusions they
need -->
<id>Exclude unneeded Ozone files</id>
<phase>process-resources</phase>
<goals>
Expand Down Expand Up @@ -139,7 +140,8 @@
<overwrite>true</overwrite>
<resources>
<resource>
<directory>${project.build.directory}/${ozone.artifactId}/distro/configs/openmrs/frontend_assembly</directory>
<directory>
${project.build.directory}/${ozone.artifactId}/distro/configs/openmrs/frontend_assembly</directory>
<filtering>false</filtering>
</resource>
</resources>
Expand Down Expand Up @@ -304,11 +306,13 @@
</goals>
<configuration>
<target>
<taskdef resource="net/sf/antcontrib/antcontrib.properties" classpathref="maven.plugin.classpath"/>
<taskdef resource="net/sf/antcontrib/antcontrib.properties"
classpathref="maven.plugin.classpath" />
<mkdir dir="${project.build.directory}/openmrs_modules" />
<if>
<resourcecount when="greater" count="0">
<fileset dir="${project.build.directory}/openmrs_modules" includes="*-omod-*.jar" />
<fileset dir="${project.build.directory}/openmrs_modules"
includes="*-omod-*.jar" />
</resourcecount>
<then>
<move todir="${project.build.directory}/openmrs_modules">
Expand Down Expand Up @@ -351,7 +355,8 @@
<phase>process-resources</phase>
<configuration>
<scripts>
<script>file://${project.build.directory}/openmrs/frontend_assembly/build-openmrs-frontend.groovy</script>
<script>
file://${project.build.directory}/openmrs/frontend_assembly/build-openmrs-frontend.groovy</script>
</scripts>
</configuration>
</execution>
Expand Down Expand Up @@ -381,4 +386,259 @@

</plugins>
</build>
</project>
<profiles>
<profile>
<id>bundled-docker</id>
<properties>
<!-- Groovy template version-->
<groovyTemplatesVersion>3.0.22</groovyTemplatesVersion>
<!-- Ozone Bundled version-->
<ozoneBundledDocker>1.0.0-SNAPSHOT</ozoneBundledDocker>
<!-- Fabric8 Docker Maven Plugin version-->
<dockerMavenPlugin>0.45.0</dockerMavenPlugin>
<!-- Docker push registry-->
<docker.push.registry>docker.io</docker.push.registry>
<!-- Docker push registry username-->
<docker.push.registry.username>mekomsolutions</docker.push.registry.username>
</properties>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<id>Unpack Ozone Bundled Docker to a tempoarary location</id>
<phase>generate-resources</phase>
<goals>
<goal>unpack-dependencies</goal>
</goals>
<configuration>
<excludeTransitive>true</excludeTransitive>
<outputDirectory>
${project.build.directory}/bundled-docker-build-tmp/bundled-docker</outputDirectory>
<includeArtifactIds>bundled-docker</includeArtifactIds>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.gmavenplus</groupId>
<artifactId>gmavenplus-plugin</artifactId>
<executions>
<execution>
<id>Generate Docker Compose Bundled yaml</id>
<goals>
<goal>execute</goal>
</goals>
<phase>process-resources</phase>
<configuration>
<scripts>
<script>
file://${project.build.directory}/scripts/openmrs/bundled-docker/generate-bundled-docker-compose.groovy</script>
</scripts>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<executions>
<execution>
<!-- Copy Docker Bundled compose file to run directory -->
<id>Copy Docker compose file</id>
<phase>package</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>
${project.build.directory}/${project.artifactId}-${project.version}/run/docker</outputDirectory>
<overwrite>true</overwrite>
<resources>
<resource>
<directory>
${project.build.directory}/bundled-docker-build-tmp/bundled-docker</directory>
<filtering>true</filtering>
<includes>
<include>docker-compose-bundled.yml</include>
</includes>
</resource>
</resources>
</configuration>
</execution>
<execution>
<!-- Copy Distro to tmp folder-->
<id>Copy Distro</id>
<phase>package</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>
${project.build.directory}/bundled-docker-build-tmp/distro</outputDirectory>
<overwrite>true</overwrite>
<resources>
<resource>
<directory>
${project.build.directory}/${project.artifactId}-${project.version}/distro</directory>
<filtering>false</filtering>
</resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
<version>${dockerMavenPlugin}</version>
<configuration>
<pushRegistry>${docker.push.registry}</pushRegistry>
<images>
<image>
<name>${docker.push.registry.username}/%a-openmrs-backend</name>
<build>
<dockerFile>
${project.build.directory}/bundled-docker-build-tmp/bundled-docker/openmrs/Dockerfile</dockerFile>
<contextDir>
${project.build.directory}/bundled-docker-build-tmp/distro</contextDir>
</build>
</image>
<image>
<name>${docker.push.registry.username}/%a-openmrs-frontend</name>
<build>
<dockerFile>
${project.build.directory}/bundled-docker-build-tmp/bundled-docker/frontend/Dockerfile</dockerFile>
<contextDir>
${project.build.directory}/bundled-docker-build-tmp/</contextDir>
</build>
</image>
<image>
<name>${docker.push.registry.username}/%a-proxy</name>
<build>
<dockerFile>
${project.build.directory}/bundled-docker-build-tmp/bundled-docker/proxy/Dockerfile</dockerFile>
<contextDir>
${project.build.directory}/bundled-docker-build-tmp/</contextDir>
</build>
</image>
<image>
<name>${docker.push.registry.username}/%a-odoo</name>
<build>
<dockerFile>
${project.build.directory}/bundled-docker-build-tmp/bundled-docker/odoo/Dockerfile</dockerFile>
<contextDir>
${project.build.directory}/bundled-docker-build-tmp/distro</contextDir>
</build>
</image>
<image>
<name>${docker.push.registry.username}/%a-senaite</name>
<build>
<dockerFile>
${project.build.directory}/bundled-docker-build-tmp/bundled-docker/senaite/Dockerfile</dockerFile>
<contextDir>
${project.build.directory}/bundled-docker-build-tmp/distro</contextDir>
</build>
</image>
<image>
<name>${docker.push.registry.username}/%a-erpnext</name>
<build>
<dockerFile>
${project.build.directory}/bundled-docker-build-tmp/bundled-docker/erpnext/Dockerfile</dockerFile>
<contextDir>
${project.build.directory}/bundled-docker-build-tmp/distro</contextDir>
</build>
</image>
<image>
<name>${docker.push.registry.username}/%a-eip-erpnext-openmrs</name>
<build>
<dockerFile>
${project.build.directory}/bundled-docker-build-tmp/bundled-docker/eip-erpnext-openmrs/Dockerfile</dockerFile>
<contextDir>
${project.build.directory}/bundled-docker-build-tmp/distro</contextDir>
</build>
</image>
<image>
<name>${docker.push.registry.username}/%a-eip-odoo-openmrs</name>
<build>
<dockerFile>
${project.build.directory}/bundled-docker-build-tmp/bundled-docker/eip-odoo-openmrs/Dockerfile</dockerFile>
<contextDir>
${project.build.directory}/bundled-docker-build-tmp/distro</contextDir>
</build>
</image>
<image>
<name>${docker.push.registry.username}/%a-eip-openmrs-senaite</name>
<build>
<dockerFile>
${project.build.directory}/bundled-docker-build-tmp/bundled-docker/eip-openmrs-senaite/Dockerfile</dockerFile>
<contextDir>
${project.build.directory}/bundled-docker-build-tmp/distro</contextDir>
</build>
</image>
<image>
<name>${docker.push.registry.username}/%a-postgresql</name>
<build>
<dockerFile>
${project.build.directory}/bundled-docker-build-tmp/bundled-docker/postgresql/Dockerfile</dockerFile>
<contextDir>
${project.build.directory}/bundled-docker-build-tmp/distro</contextDir>
</build>
</image>
<image>
<name>${docker.push.registry.username}/%a-mysql</name>
<build>
<dockerFile>
${project.build.directory}/bundled-docker-build-tmp/bundled-docker/mysql/Dockerfile</dockerFile>
<contextDir>
${project.build.directory}/bundled-docker-build-tmp/distro</contextDir>
</build>
</image>
</images>
<tags>
<tag>%l</tag>
</tags>
<buildx>
<platforms>
<platform>linux/amd64</platform>
<platform>linux/arm64</platform>
</platforms>
</buildx>
</configuration>
<executions>
<execution>
<id>Build Bundled Docker images</id>
<goals>
<goal>build</goal>
</goals>
<phase>package</phase>
</execution>
<execution>
<id>Push Bundled Docker images</id>
<goals>
<goal>push</goal>
</goals>
<phase>deploy</phase>
</execution>
</executions>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>com.ozonehis</groupId>
<artifactId>bundled-docker</artifactId>
<type>zip</type>
<version>${ozoneBundledDocker}</version>
</dependency>
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-templates</artifactId>
<version>${groovyTemplatesVersion}</version>
</dependency>
</dependencies>
</profile>
</profiles>
</project>
Loading
Loading