From 3416f76b39e0cebc505b2906150ae92fbe8322cd Mon Sep 17 00:00:00 2001
From: Emmanuel Nyachoke <achachiez@gmail.com>
Date: Mon, 26 Aug 2024 19:02:08 +0300
Subject: [PATCH] Update Image names

---
 maven-parent/pom.xml                          | 231 ++++++++++++++++++
 pom.xml                                       | 218 -----------------
 .../generate-docker-embedded-compose.groovy   |   6 +-
 scripts/pom.xml                               |   3 +
 4 files changed, 237 insertions(+), 221 deletions(-)

diff --git a/maven-parent/pom.xml b/maven-parent/pom.xml
index 8a10721..2792ab4 100644
--- a/maven-parent/pom.xml
+++ b/maven-parent/pom.xml
@@ -381,4 +381,235 @@
 
     </plugins>
   </build>
+  <profiles>
+    <profile>
+      <id>docker</id>
+      <properties>
+        <!-- Ozone Docker embedded version-->
+        <ozoneDockerEmbedded>1.0.0-SNAPSHOT</ozoneDockerEmbedded>
+        <!-- Docker image properties-->
+        <docker.tag>${project.groupId}-${project.artifactId}-${project.version}</docker.tag>
+      </properties>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-dependency-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>Unpack Ozone Docker Embedded to a tempoarary location</id>
+                <phase>generate-resources</phase>
+                <goals>
+                  <goal>unpack-dependencies</goal>
+                </goals>
+                <configuration>
+                  <excludeTransitive>true</excludeTransitive>
+                  <outputDirectory>${project.build.directory}/embedded-build-tmp/docker-embedded</outputDirectory>
+                  <includeArtifactIds>ozone-docker-embedded</includeArtifactIds>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
+            <groupId>org.codehaus.gmavenplus</groupId>
+            <artifactId>gmavenplus-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>Generate Docker Compose Embedded yaml</id>
+                <goals>
+                  <goal>execute</goal>
+                </goals>
+                <phase>process-resources</phase>
+                <configuration>
+                  <scripts>
+                    <script>
+                      file://${project.build.directory}/scripts/openmrs/docker-embedded/generate-docker-embedded-compose.groovy</script>
+                  </scripts>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-resources-plugin</artifactId>
+            <executions>
+              <execution>
+                <!-- Copy Docker Embedded compose file to run directory -->
+                <id>Copy Docker Embedded 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}/embedded-build-tmp/docker-embedded</directory>
+                      <filtering>true</filtering>
+                      <includes>
+                        <include>docker-compose-embedded.yaml</include>
+                      </includes>
+                    </resource>
+                  </resources>
+                </configuration>
+              </execution>
+              <execution>
+                <!-- Copy Docker Embedded compose file to run directory -->
+                <id>Copy Ozone</id>
+                <phase>package</phase>
+                <goals>
+                  <goal>copy-resources</goal>
+                </goals>
+                <configuration>
+                  <outputDirectory>
+                    ${project.build.directory}/embedded-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>
+            <configuration>
+              <images>
+                <image>
+                  <name>ozone-embedded-openmrs-backend:${docker.tag}</name>
+                  <build>
+                    <dockerFile>
+                      ${project.build.directory}/embedded-build-tmp/docker-embedded/openmrs/Dockerfile</dockerFile>
+                    <contextDir>
+                      ${project.build.directory}/embedded-build-tmp/distro</contextDir>
+                  </build>
+                </image>
+                <image>
+                  <name>ozone-embedded-openmrs-frontend:${project.version}</name>
+                  <build>
+                    <dockerFile>
+                      ${project.build.directory}/embedded-build-tmp/docker-embedded/frontend/Dockerfile</dockerFile>
+                    <contextDir>
+                      ${project.build.directory}/embedded-build-tmp/</contextDir>
+                  </build>
+                </image>
+                <image>
+                  <name>ozone-embedded-proxy:${docker.tag}</name>
+                  <build>
+                    <dockerFile>
+                      ${project.build.directory}/embedded-build-tmp/docker-embedded/proxy/Dockerfile</dockerFile>
+                    <contextDir>
+                      ${project.build.directory}/embedded-build-tmp/</contextDir>
+                  </build>
+                </image>
+                <image>
+                  <name>ozone-embedded-odoo:${docker.tag}</name>
+                  <build>
+                    <dockerFile>
+                      ${project.build.directory}/embedded-build-tmp/docker-embedded/odoo/Dockerfile</dockerFile>
+                    <contextDir>
+                      ${project.build.directory}/embedded-build-tmp/distro</contextDir>
+                  </build>
+                </image>
+                <image>
+                  <name>ozone-embedded-senaite:${docker.tag}</name>
+                  <build>
+                    <dockerFile>
+                      ${project.build.directory}/embedded-build-tmp/docker-embedded/senaite/Dockerfile</dockerFile>
+                    <contextDir>
+                      ${project.build.directory}/embedded-build-tmp/distro</contextDir>
+                  </build>
+                </image>
+                <image>
+                  <name>ozone-embedded-erpnext:${docker.tag}</name>
+                  <build>
+                    <dockerFile>
+                      ${project.build.directory}/embedded-build-tmp/docker-embedded/erpnext/Dockerfile</dockerFile>
+                    <contextDir>
+                      ${project.build.directory}/embedded-build-tmp/distro</contextDir>
+                  </build>
+                </image>
+                <image>
+                  <name>ozone-embedded-eip-erpnext-openmrs:${docker.tag}</name>
+                  <build>
+                    <dockerFile>
+                      ${project.build.directory}/embedded-build-tmp/docker-embedded/eip-erpnext-openmrs/Dockerfile</dockerFile>
+                    <contextDir>
+                      ${project.build.directory}/embedded-build-tmp/distro</contextDir>
+                  </build>
+                </image>
+                <image>
+                  <name>ozone-embedded-eip-odoo-openmrs:${docker.tag}</name>
+                  <build>
+                    <dockerFile>
+                      ${project.build.directory}/embedded-build-tmp/docker-embedded/eip-odoo-openmrs/Dockerfile</dockerFile>
+                    <contextDir>
+                      ${project.build.directory}/embedded-build-tmp/distro</contextDir>
+                  </build>
+                </image>
+                <image>
+                  <name>ozone-embedded-eip-openmrs-senaite:${docker.tag}</name>
+                  <build>
+                    <dockerFile>
+                      ${project.build.directory}/embedded-build-tmp/docker-embedded/eip-openmrs-senaite/Dockerfile</dockerFile>
+                    <contextDir>
+                      ${project.build.directory}/embedded-build-tmp/distro</contextDir>
+                  </build>
+                </image>
+                <image>
+                  <name>ozone-embedded-postgresql:${project.version}</name>
+                  <build>
+                    <dockerFile>
+                      ${project.build.directory}/embedded-build-tmp/docker-embedded/postgresql/Dockerfile</dockerFile>
+                    <contextDir>
+                      ${project.build.directory}/embedded-build-tmp/distro</contextDir>
+                  </build>
+                </image>
+                <image>
+                  <name>ozone-embedded-mysql:${project.version}</name>
+                  <build>
+                    <dockerFile>
+                      ${project.build.directory}/embedded-build-tmp/docker-embedded/mysql/Dockerfile</dockerFile>
+                    <contextDir>
+                      ${project.build.directory}/embedded-build-tmp/distro</contextDir>
+                  </build>
+                </image>
+              </images>
+              <buildx>
+                <platforms>
+                  <platform>linux/amd64</platform>
+                  <platform>linux/arm64</platform>
+                </platforms>
+              </buildx>
+            </configuration>
+            <executions>
+              <execution>
+                <id>Build embedded docker images</id>
+                <goals>
+                  <goal>build</goal>
+                </goals>
+                <phase>package</phase>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+      <dependencies>
+        <dependency>
+          <groupId>com.ozonehis</groupId>
+          <artifactId>ozone-docker-embedded</artifactId>
+          <type>zip</type>
+          <version>${ozoneDockerEmbedded}</version>
+        </dependency>
+      </dependencies>
+    </profile>
+  </profiles>
 </project>
diff --git a/pom.xml b/pom.xml
index 7b87a2c..52f77df 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,209 +61,6 @@
       <version>${ozoneDockerComposeVersion}</version>
     </dependency>
   </dependencies>
-
-  <profiles>
-    <profile>
-      <id>docker</id>
-      <properties>
-        <!-- Docker image properties-->
-        <docker.repo.name>ozone-embedded</docker.repo.name>
-        <docker.repo>mekomsolutions</docker.repo>
-      </properties>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-dependency-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>Unpack Ozone Docker Embedded to a tempoarary location</id>
-                <phase>generate-resources</phase>
-                <goals>
-                  <goal>unpack-dependencies</goal>
-                </goals>
-                <configuration>
-                  <excludeTransitive>true</excludeTransitive>
-                  <outputDirectory>${project.build.directory}/${project.artifactId}-${project.version}/docker-embedded</outputDirectory>
-                  <includeArtifactIds>ozone-docker-embedded</includeArtifactIds>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-          <plugin>
-            <groupId>org.codehaus.gmavenplus</groupId>
-            <artifactId>gmavenplus-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>Generate Docker Compose Embedded yaml</id>
-                <goals>
-                  <goal>execute</goal>
-                </goals>
-                <phase>process-resources</phase>
-                <configuration>
-                  <scripts>
-                    <script>
-                      file://${project.basedir}/scripts/openmrs/docker-embedded/generate-docker-embedded-compose.groovy</script>
-                  </scripts>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-          <plugin>
-            <groupId>io.fabric8</groupId>
-            <artifactId>docker-maven-plugin</artifactId>
-            <configuration>
-              <images>
-                <image>
-                  <name>mekomsolutions/ozone-embedded-openmrs-3-backend:${project.version}</name>
-                  <build>
-                    <dockerFile>
-                      ${project.build.directory}/${project.artifactId}-${project.version}/docker-embedded/openmrs/Dockerfile</dockerFile>
-                    <contextDir>
-                      ${project.build.directory}/${project.artifactId}-${project.version}/distro</contextDir>
-                  </build>
-                </image>
-                <image>
-                  <name>mekomsolutions/ozone-embedded-openmrs-3-frontend:${project.version}</name>
-                  <build>
-                    <dockerFile>
-                      ${project.build.directory}/${project.artifactId}-${project.version}/docker-embedded/frontend/Dockerfile</dockerFile>
-                    <contextDir>
-                      ${project.build.directory}/${project.artifactId}-${project.version}/</contextDir>
-                  </build>
-                </image>
-                <image>
-                  <name>mekomsolutions/ozone-embedded-odoo:${project.version}</name>
-                  <build>
-                    <dockerFile>
-                      ${project.build.directory}/${project.artifactId}-${project.version}/docker-embedded/odoo/Dockerfile</dockerFile>
-                    <contextDir>
-                      ${project.build.directory}/${project.artifactId}-${project.version}/distro</contextDir>
-                  </build>
-                </image>
-                <image>
-                  <name>mekomsolutions/ozone-embedded-senaite:${project.version}</name>
-                  <build>
-                    <dockerFile>
-                      ${project.build.directory}/${project.artifactId}-${project.version}/docker-embedded/senaite/Dockerfile</dockerFile>
-                    <contextDir>
-                      ${project.build.directory}/${project.artifactId}-${project.version}/distro</contextDir>
-                  </build>
-                </image>
-                <image>
-                  <name>mekomsolutions/ozone-embedded-erpnext:${project.version}</name>
-                  <build>
-                    <dockerFile>
-                      ${project.build.directory}/${project.artifactId}-${project.version}/docker-embedded/erpnext/Dockerfile</dockerFile>
-                    <contextDir>
-                      ${project.build.directory}/${project.artifactId}-${project.version}/distro</contextDir>
-                  </build>
-                </image>
-                <image>
-                  <name>mekomsolutions/ozone-embedded-eip-erpnext-openmrs:${project.version}</name>
-                  <build>
-                    <dockerFile>
-                      ${project.build.directory}/${project.artifactId}-${project.version}/docker-embedded/eip-erpnext-openmrs/Dockerfile</dockerFile>
-                    <contextDir>
-                      ${project.build.directory}/${project.artifactId}-${project.version}/distro</contextDir>
-                  </build>
-                </image>
-                <image>
-                  <name>mekomsolutions/ozone-embedded-eip-odoo-openmrs:${project.version}</name>
-                  <build>
-                    <dockerFile>
-                      ${project.build.directory}/${project.artifactId}-${project.version}/docker-embedded/eip-odoo-openmrs/Dockerfile</dockerFile>
-                    <contextDir>
-                      ${project.build.directory}/${project.artifactId}-${project.version}/distro</contextDir>
-                  </build>
-                </image>
-                <image>
-                  <name>mekomsolutions/ozone-embedded-eip-openmrs-senaite:${project.version}</name>
-                  <build>
-                    <dockerFile>
-                      ${project.build.directory}/${project.artifactId}-${project.version}/docker-embedded/eip-openmrs-senaite/Dockerfile</dockerFile>
-                    <contextDir>
-                      ${project.build.directory}/${project.artifactId}-${project.version}/distro</contextDir>
-                  </build>
-                </image>
-                <image>
-                  <name>mekomsolutions/ozone-embedded-postgresql:${project.version}</name>
-                  <build>
-                    <dockerFile>
-                      ${project.build.directory}/${project.artifactId}-${project.version}/docker-embedded/postgresql/Dockerfile</dockerFile>
-                    <contextDir>
-                      ${project.build.directory}/${project.artifactId}-${project.version}/distro</contextDir>
-                  </build>
-                </image>
-                <image>
-                  <name>mekomsolutions/ozone-embedded-mysql:${project.version}</name>
-                  <build>
-                    <dockerFile>
-                      ${project.build.directory}/${project.artifactId}-${project.version}/docker-embedded/mysql/Dockerfile</dockerFile>
-                    <contextDir>
-                      ${project.build.directory}/${project.artifactId}-${project.version}/distro</contextDir>
-                  </build>
-                </image>
-              </images>
-              <buildx>
-                <platforms>
-                  <platform>linux/amd64</platform>
-                  <platform>linux/arm64</platform>
-                </platforms>
-              </buildx>
-            </configuration>
-            <executions>
-              <execution>
-                <id>Build embedded docker images</id>
-                <goals>
-                  <goal>build</goal>
-                </goals>
-                <phase>package</phase>
-              </execution>
-            </executions>
-          </plugin>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-resources-plugin</artifactId>
-            <executions>
-              <execution>
-                <!-- Copy Docker Embedded compose file to run directory -->
-                <id>Copy Docker Embedded 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}/${project.artifactId}-${project.version}/docker-embedded</directory>
-                      <filtering>true</filtering>
-                      <includes>
-                        <include>docker-compose-embedded.yaml</include>
-                      </includes>
-                    </resource>
-                  </resources>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-      <dependencies>
-        <dependency>
-          <groupId>com.ozonehis</groupId>
-          <artifactId>ozone-docker-embedded</artifactId>
-          <type>zip</type>
-          <version>1.0.0-SNAPSHOT</version>
-        </dependency>
-      </dependencies>
-    </profile>
-  </profiles>
-
   <build>
     <plugins>
 
@@ -298,21 +95,6 @@
               <includeArtifactIds>ozone-distro</includeArtifactIds>
             </configuration>
           </execution>
-
-          <!-- <execution>
-            <id>Copy Ozone Docker Embedded Files</id>
-            <phase>generate-resources</phase>
-            <goals>
-              <goal>unpack-dependencies</goal>
-            </goals>
-            <configuration>
-              <excludeTransitive>true</excludeTransitive>
-              <outputDirectory>
-                ${project.build.directory}/${project.artifactId}-${project.version}/docker-embedded</outputDirectory>
-              <includeArtifactIds>ozone-docker-embedded</includeArtifactIds>
-            </configuration>
-          </execution> -->
-
         </executions>
       </plugin>
 
diff --git a/scripts/openmrs/docker-embedded/generate-docker-embedded-compose.groovy b/scripts/openmrs/docker-embedded/generate-docker-embedded-compose.groovy
index b132e78..dc9c444 100644
--- a/scripts/openmrs/docker-embedded/generate-docker-embedded-compose.groovy
+++ b/scripts/openmrs/docker-embedded/generate-docker-embedded-compose.groovy
@@ -4,14 +4,14 @@ import java.text.SimpleDateFormat
 import groovy.text.* 
 import groovy.json.JsonBuilder
 
-myver  = "${project.version}"
+myver  = "${project.groupId}-${project.artifactId}-${project.version}"
 
-def dockerComposeTemplate = Paths.get("${project.build.directory}/${project.artifactId}-${project.version}", "docker-embedded", "docker-compose-embedded.yaml.template").toFile()
+def dockerComposeTemplate = Paths.get("${project.build.directory}", "/embedded-build-tmp", "docker-embedded", "docker-compose-embedded.yaml.template").toFile()
 def binding = ['dockertag' : myver ]			  
 def engine = new SimpleTemplateEngine() 
 def template = engine.createTemplate(dockerComposeTemplate) 
 def writable = template.make(binding) 
 
-def dockerComposePath = Paths.get("${project.build.directory}/${project.artifactId}-${project.version}", "docker-embedded", "docker-compose-embedded.yaml").toAbsolutePath().toString()
+def dockerComposePath = Paths.get("${project.build.directory}", "/embedded-build-tmp", "docker-embedded", "docker-compose-embedded.yaml").toAbsolutePath().toString()
 def myFile = new File(dockerComposePath)
 myFile.write(writable.toString())
\ No newline at end of file
diff --git a/scripts/pom.xml b/scripts/pom.xml
index 160bd1a..c5a5ce3 100644
--- a/scripts/pom.xml
+++ b/scripts/pom.xml
@@ -48,6 +48,9 @@
                 <resource>
                   <directory>${project.basedir}/../scripts</directory>
                   <includes>
+                    <include>
+                      openmrs/docker-embedded/generate-docker-embedded-compose.groovy
+                    </include>
                     <include>
                       openmrs/frontend_assembly/build-openmrs-frontend.groovy
                     </include>