From 701705a7ce91234b412ddee7a6f762f6f55b7da4 Mon Sep 17 00:00:00 2001
From: cagache <claudia.agache@ness.com>
Date: Wed, 20 Jun 2018 12:03:22 +0300
Subject: [PATCH 1/2] RM-6138 Create docker images for rm-enterprise-share and
 rm-enterprise-repo

---
 pom.xml | 159 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 159 insertions(+)

diff --git a/pom.xml b/pom.xml
index 2a45b46f49..e554aed1d1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -327,6 +327,160 @@
             </plugins>
          </build>
       </profile>
+      <!--Docker profiles-->
+      <profile>
+         <id>buildDockerImage</id>
+         <build>
+            <pluginManagement>
+               <plugins>
+                  <plugin>
+                     <groupId>io.fabric8</groupId>
+                     <artifactId>fabric8-maven-plugin</artifactId>
+                     <version>${dependency.fabric8.version}</version>
+                     <configuration>
+                        <images>
+                           <image>
+                              <name>${image.name}</name>
+                              <build>
+                                 <dockerFileDir>${project.basedir}/</dockerFileDir>
+                              </build>
+                           </image>
+                        </images>
+                     </configuration>
+                     <executions>
+                        <execution>
+                           <id>build-image</id>
+                           <phase>install</phase>
+                           <goals>
+                              <goal>build</goal>
+                           </goals>
+                        </execution>
+                     </executions>
+                  </plugin>
+               </plugins>
+            </pluginManagement>
+         </build>
+      </profile>
+
+      <profile>
+         <id>internal</id>
+         <build>
+            <pluginManagement>
+               <plugins>
+                  <plugin>
+                     <groupId>io.fabric8</groupId>
+                     <artifactId>fabric8-maven-plugin</artifactId>
+                     <version>${dependency.fabric8.version}</version>
+                     <configuration>
+                        <images>
+                           <image>
+                              <name>${image.name}:${image.tag}</name>
+                              <registry>${image.registry}</registry>
+                              <build>
+                                 <dockerFileDir>${project.basedir}/</dockerFileDir>
+                              </build>
+                           </image>
+                        </images>
+                     </configuration>
+                     <executions>
+                        <execution>
+                           <id>build-push-image</id>
+                           <phase>install</phase>
+                           <goals>
+                              <goal>build</goal>
+                              <goal>push</goal>
+                           </goals>
+                        </execution>
+                     </executions>
+                  </plugin>
+               </plugins>
+            </pluginManagement>
+         </build>
+      </profile>
+
+      <profile>
+         <id>master</id>
+         <build>
+            <pluginManagement>
+               <plugins>
+                  <plugin>
+                     <groupId>io.fabric8</groupId>
+                     <artifactId>fabric8-maven-plugin</artifactId>
+                     <version>${dependency.fabric8.version}</version>
+                     <configuration>
+                        <images>
+                           <image>
+                              <name>${image.name}</name>
+                              <registry>${image.registry}</registry>
+                              <build>
+                                 <dockerFileDir>${project.basedir}/</dockerFileDir>
+                              </build>
+                           </image>
+                           <image>
+                              <name>${image.name}</name>
+                              <build>
+                                 <dockerFileDir>${project.basedir}/</dockerFileDir>
+                              </build>
+                           </image>
+                        </images>
+                     </configuration>
+                     <executions>
+                        <execution>
+                           <id>build-push-image</id>
+                           <phase>install</phase>
+                           <goals>
+                              <goal>build</goal>
+                              <goal>push</goal>
+                           </goals>
+                        </execution>
+                     </executions>
+                  </plugin>
+               </plugins>
+            </pluginManagement>
+         </build>
+      </profile>
+
+      <profile>
+         <id>release</id>
+         <build>
+            <pluginManagement>
+               <plugins>
+                  <plugin>
+                     <groupId>io.fabric8</groupId>
+                     <artifactId>fabric8-maven-plugin</artifactId>
+                     <version>${dependency.fabric8.version}</version>
+                     <configuration>
+                        <images>
+                           <image>
+                              <name>${image.name}:${project.version}</name>
+                              <registry>${image.registry}</registry>
+                              <build>
+                                 <dockerFileDir>${project.basedir}/</dockerFileDir>
+                              </build>
+                           </image>
+                           <image>
+                              <name>${image.name}:${project.version}</name>
+                              <build>
+                                 <dockerFileDir>${project.basedir}/</dockerFileDir>
+                              </build>
+                           </image>
+                        </images>
+                     </configuration>
+                     <executions>
+                        <execution>
+                           <id>build-push-image</id>
+                           <phase>deploy</phase>
+                           <goals>
+                              <goal>build</goal>
+                              <goal>push</goal>
+                           </goals>
+                        </execution>
+                     </executions>
+                  </plugin>
+               </plugins>
+            </pluginManagement>
+         </build>
+      </profile>
    </profiles>
 
    <properties>
@@ -381,6 +535,11 @@
       <app.properties.folder>src/main/properties/local</app.properties.folder>
       <app.properties.test.include>**</app.properties.test.include>
       <app.properties.test.folder>src/test/properties/local</app.properties.test.folder>
+
+      <dependency.fabric8.version>3.5.37</dependency.fabric8.version>
+      <image.name>imageNameNotSet</image.name>
+      <image.tag>latest</image.tag>
+      <image.registry>quay.io</image.registry>
    </properties>
 
    <dependencyManagement>

From 91a64d6eb873c876a6bd8855dc92df1090fd43a4 Mon Sep 17 00:00:00 2001
From: cagache <claudia.agache@ness.com>
Date: Wed, 20 Jun 2018 15:32:17 +0300
Subject: [PATCH 2/2] Applied code review changes

---
 pom.xml                                | 18 ++++++++++++------
 rm-community/rm-community-repo/pom.xml |  2 +-
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index e554aed1d1..960c830995 100644
--- a/pom.xml
+++ b/pom.xml
@@ -328,6 +328,7 @@
          </build>
       </profile>
       <!--Docker profiles-->
+      <!-- Profile used only to build docker images-->
       <profile>
          <id>buildDockerImage</id>
          <build>
@@ -336,7 +337,7 @@
                   <plugin>
                      <groupId>io.fabric8</groupId>
                      <artifactId>fabric8-maven-plugin</artifactId>
-                     <version>${dependency.fabric8.version}</version>
+                     <version>${fabric8.maven.version}</version>
                      <configuration>
                         <images>
                            <image>
@@ -362,6 +363,7 @@
          </build>
       </profile>
 
+      <!-- Profile used to build docker images with given tag and push them to the given image registry (quay.io) -->
       <profile>
          <id>internal</id>
          <build>
@@ -370,7 +372,7 @@
                   <plugin>
                      <groupId>io.fabric8</groupId>
                      <artifactId>fabric8-maven-plugin</artifactId>
-                     <version>${dependency.fabric8.version}</version>
+                     <version>${fabric8.maven.version}</version>
                      <configuration>
                         <images>
                            <image>
@@ -398,6 +400,8 @@
          </build>
       </profile>
 
+      <!-- Profile used to build and push docker images with latest tag to the given image registry (quay.io) and
+       hub.docker -->
       <profile>
          <id>master</id>
          <build>
@@ -406,7 +410,7 @@
                   <plugin>
                      <groupId>io.fabric8</groupId>
                      <artifactId>fabric8-maven-plugin</artifactId>
-                     <version>${dependency.fabric8.version}</version>
+                     <version>${fabric8.maven.version}</version>
                      <configuration>
                         <images>
                            <image>
@@ -440,6 +444,8 @@
          </build>
       </profile>
 
+      <!-- Profile used to build and push docker images with project.version tag to the given image registry (quay.io) and
+       hub.docker -->
       <profile>
          <id>release</id>
          <build>
@@ -448,7 +454,7 @@
                   <plugin>
                      <groupId>io.fabric8</groupId>
                      <artifactId>fabric8-maven-plugin</artifactId>
-                     <version>${dependency.fabric8.version}</version>
+                     <version>${fabric8.maven.version}</version>
                      <configuration>
                         <images>
                            <image>
@@ -509,7 +515,7 @@
       <maven.resources.version>2.7</maven.resources.version>
       <maven.tomcat.port>8080</maven.tomcat.port>
 
-      <fabric8.version>0.25.0</fabric8.version>
+      <fabric8.docker.version>0.25.0</fabric8.docker.version>
       <mockito.version>1.10.19</mockito.version>
       <postgresql.version>42.2.1</postgresql.version>
       <postgresql.port>5432</postgresql.port>
@@ -536,7 +542,7 @@
       <app.properties.test.include>**</app.properties.test.include>
       <app.properties.test.folder>src/test/properties/local</app.properties.test.folder>
 
-      <dependency.fabric8.version>3.5.37</dependency.fabric8.version>
+      <fabric8.maven.version>3.5.37</fabric8.maven.version>
       <image.name>imageNameNotSet</image.name>
       <image.tag>latest</image.tag>
       <image.registry>quay.io</image.registry>
diff --git a/rm-community/rm-community-repo/pom.xml b/rm-community/rm-community-repo/pom.xml
index 87d41dd0bb..a8e2d02bef 100644
--- a/rm-community/rm-community-repo/pom.xml
+++ b/rm-community/rm-community-repo/pom.xml
@@ -130,7 +130,7 @@
          <plugin>
             <groupId>io.fabric8</groupId>
             <artifactId>docker-maven-plugin</artifactId>
-            <version>${fabric8.version}</version>
+            <version>${fabric8.docker.version}</version>
             <configuration>
                <images>
                   <image>