From 16df677a25dbd18c51c92285060d821d313ee2ce Mon Sep 17 00:00:00 2001
From: Alexandru-Eusebiu Epure <Alexandru.Epure@ness.com>
Date: Wed, 21 Mar 2018 17:57:01 +0200
Subject: [PATCH] REPO-3264: changes for release process.    Changed release
 stage repository from /enterprise-releases to /internal-releases    Refactor
 fabric8 maven plugin and the 3 profiles.    Comented push to dockerhub,
 change phase from install to deploy

---
 alfresco-docker-alfresco-pdf-renderer/pom.xml | 87 ++++++++++++-------
 alfresco-docker-imagemagick/Dockerfile        |  4 +-
 alfresco-docker-imagemagick/pom.xml           | 87 ++++++++++++-------
 alfresco-docker-libreoffice/pom.xml           | 87 ++++++++++++-------
 pom.xml                                       |  3 +-
 5 files changed, 169 insertions(+), 99 deletions(-)

diff --git a/alfresco-docker-alfresco-pdf-renderer/pom.xml b/alfresco-docker-alfresco-pdf-renderer/pom.xml
index 593da456..b1bca68a 100644
--- a/alfresco-docker-alfresco-pdf-renderer/pom.xml
+++ b/alfresco-docker-alfresco-pdf-renderer/pom.xml
@@ -13,6 +13,11 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
 
+    <properties>
+        <image.name>alfresco/${project.artifactId}</image.name>
+        <image.registry>quay.io</image.registry>
+        <public.image.registry>registry.hub.docker.com</public.image.registry>
+    </properties>
 
     <dependencyManagement>
         <dependencies>
@@ -71,27 +76,14 @@
                 <configuration>
                     <images>
                         <image>
-                            <name>alfresco/${project.artifactId}</name>
-                            <registry>quay.io</registry>
+                            <name>${image.name}:${image.tag}</name>
+                            <registry>${image.registry}</registry>
                             <build>
                                 <dockerFileDir>${project.basedir}/</dockerFileDir>
-                                <tags>
-                                    <tag>${project.version}</tag>
-                                </tags>
                             </build>
                         </image>
                     </images>
                 </configuration>
-                <executions>
-                    <execution>
-                        <id>buildAndPush</id>
-                        <goals>
-                            <goal>build</goal>
-                            <goal>push</goal>
-                        </goals>
-                        <phase>deploy</phase>
-                    </execution>
-                </executions>
             </plugin>
         </plugins>
     </build>
@@ -106,23 +98,10 @@
                         <groupId>io.fabric8</groupId>
                         <artifactId>fabric8-maven-plugin</artifactId>
                         <version>${dependency.fabric8.version}</version>
-                        <configuration>
-                            <images>
-                                <image>
-                                    <name>alfresco/${project.artifactId}</name>
-                                    <build>
-                                        <dockerFileDir>${project.basedir}/</dockerFileDir>
-                                        <tags>
-                                            <tag>local</tag>
-                                        </tags>
-                                    </build>
-                                </image>
-                            </images>
-                        </configuration>
                         <executions>
                             <execution>
+                                <id>build-image</id>
                                 <phase>install</phase>
-                                <id>build</id>
                                 <goals>
                                     <goal>build</goal>
                                 </goals>
@@ -134,7 +113,7 @@
         </profile>
 
         <profile>
-            <id>pushImages</id>
+            <id>internal</id>
             <build>
                 <plugins>
                     <plugin>
@@ -156,12 +135,56 @@
                         </configuration>
                         <executions>
                             <execution>
-                                <id>buildImage</id>
+                                <id>build-push-image</id>
+                                <phase>install</phase>
+                                <goals>
+                                    <goal>build</goal>
+                                    <goal>push</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+
+        <profile>
+            <id>release</id>
+            <build>
+                <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>
+                                <!-- This project is for enterprise use only, it will be pushed only to quay.io
+                                     Added the image push to dockerhub for a possible future use
+                                <image>
+                                    <name>${image.name}:${project.version}</name>
+                                    <registry>${public.image.registry}</registry>
+                                    <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>
-                                <phase>install</phase>
                             </execution>
                         </executions>
                     </plugin>
diff --git a/alfresco-docker-imagemagick/Dockerfile b/alfresco-docker-imagemagick/Dockerfile
index 7cf9e932..ce980cfc 100644
--- a/alfresco-docker-imagemagick/Dockerfile
+++ b/alfresco-docker-imagemagick/Dockerfile
@@ -2,8 +2,8 @@
 
 FROM quay.io/alfresco/alfresco-base-java:9
 
-ENV IMAGEMAGICK_RPM_URL=https://www.imagemagick.org/download/linux/CentOS/x86_64/ImageMagick-7.0.7-26.x86_64.rpm
-ENV IMAGEMAGICK_LIB_RPM_URL=https://www.imagemagick.org/download/linux/CentOS/x86_64/ImageMagick-libs-7.0.7-26.x86_64.rpm
+ENV IMAGEMAGICK_RPM_URL=https://www.imagemagick.org/download/linux/CentOS/x86_64/ImageMagick-7.0.7-27.x86_64.rpm
+ENV IMAGEMAGICK_LIB_RPM_URL=https://www.imagemagick.org/download/linux/CentOS/x86_64/ImageMagick-libs-7.0.7-27.x86_64.rpm
 
 COPY target/alfresco-docker-imagemagick*.jar /usr/bin
 
diff --git a/alfresco-docker-imagemagick/pom.xml b/alfresco-docker-imagemagick/pom.xml
index c60d9d4b..c4549b23 100644
--- a/alfresco-docker-imagemagick/pom.xml
+++ b/alfresco-docker-imagemagick/pom.xml
@@ -13,6 +13,11 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
 
+    <properties>
+        <image.name>alfresco/${project.artifactId}</image.name>
+        <image.registry>quay.io</image.registry>
+        <public.image.registry>registry.hub.docker.com</public.image.registry>
+    </properties>
 
     <dependencyManagement>
         <dependencies>
@@ -71,27 +76,14 @@
                 <configuration>
                     <images>
                         <image>
-                            <name>alfresco/${project.artifactId}</name>
-                            <registry>quay.io</registry>
+                            <name>${image.name}:${image.tag}</name>
+                            <registry>${image.registry}</registry>
                             <build>
                                 <dockerFileDir>${project.basedir}/</dockerFileDir>
-                                <tags>
-                                    <tag>${project.version}</tag>
-                                </tags>
                             </build>
                         </image>
                     </images>
                 </configuration>
-                <executions>
-                    <execution>
-                        <id>buildAndPush</id>
-                        <goals>
-                            <goal>build</goal>
-                            <goal>push</goal>
-                        </goals>
-                        <phase>deploy</phase>
-                    </execution>
-                </executions>
             </plugin>
         </plugins>
     </build>
@@ -106,23 +98,10 @@
                         <groupId>io.fabric8</groupId>
                         <artifactId>fabric8-maven-plugin</artifactId>
                         <version>${dependency.fabric8.version}</version>
-                        <configuration>
-                            <images>
-                                <image>
-                                    <name>alfresco/${project.artifactId}</name>
-                                    <build>
-                                        <dockerFileDir>${project.basedir}/</dockerFileDir>
-                                        <tags>
-                                            <tag>local</tag>
-                                        </tags>
-                                    </build>
-                                </image>
-                            </images>
-                        </configuration>
                         <executions>
                             <execution>
+                                <id>build-image</id>
                                 <phase>install</phase>
-                                <id>build</id>
                                 <goals>
                                     <goal>build</goal>
                                 </goals>
@@ -134,7 +113,7 @@
         </profile>
 
         <profile>
-            <id>pushImages</id>
+            <id>internal</id>
             <build>
                 <plugins>
                     <plugin>
@@ -156,12 +135,56 @@
                         </configuration>
                         <executions>
                             <execution>
-                                <id>buildImage</id>
+                                <id>build-push-image</id>
+                                <phase>install</phase>
+                                <goals>
+                                    <goal>build</goal>
+                                    <goal>push</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+
+        <profile>
+            <id>release</id>
+            <build>
+                <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>
+                                <!-- This project is for enterprise use only, it will be pushed only to quay.io
+                                     Added the image push to dockerhub for a possible future use
+                                <image>
+                                    <name>${image.name}:${project.version}</name>
+                                    <registry>${public.image.registry}</registry>
+                                    <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>
-                                <phase>install</phase>
                             </execution>
                         </executions>
                     </plugin>
diff --git a/alfresco-docker-libreoffice/pom.xml b/alfresco-docker-libreoffice/pom.xml
index f3d49e6f..872c9bfc 100644
--- a/alfresco-docker-libreoffice/pom.xml
+++ b/alfresco-docker-libreoffice/pom.xml
@@ -13,6 +13,11 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
 
+    <properties>
+        <image.name>alfresco/${project.artifactId}</image.name>
+        <image.registry>quay.io</image.registry>
+        <public.image.registry>registry.hub.docker.com</public.image.registry>
+    </properties>
 
     <dependencyManagement>
         <dependencies>
@@ -81,27 +86,14 @@
                 <configuration>
                     <images>
                         <image>
-                            <name>alfresco/${project.artifactId}</name>
-                            <registry>quay.io</registry>
+                            <name>${image.name}:${image.tag}</name>
+                            <registry>${image.registry}</registry>
                             <build>
                                 <dockerFileDir>${project.basedir}/</dockerFileDir>
-                                <tags>
-                                    <tag>${project.version}</tag>
-                                </tags>
                             </build>
                         </image>
                     </images>
                 </configuration>
-                <executions>
-                    <execution>
-                        <id>buildAndPush</id>
-                        <goals>
-                            <goal>build</goal>
-                            <goal>push</goal>
-                        </goals>
-                        <phase>deploy</phase>
-                    </execution>
-                </executions>
             </plugin>
         </plugins>
     </build>
@@ -116,23 +108,10 @@
                         <groupId>io.fabric8</groupId>
                         <artifactId>fabric8-maven-plugin</artifactId>
                         <version>${dependency.fabric8.version}</version>
-                        <configuration>
-                            <images>
-                                <image>
-                                    <name>alfresco/${project.artifactId}</name>
-                                    <build>
-                                        <dockerFileDir>${project.basedir}/</dockerFileDir>
-                                        <tags>
-                                            <tag>local</tag>
-                                        </tags>
-                                    </build>
-                                </image>
-                            </images>
-                        </configuration>
                         <executions>
                             <execution>
+                                <id>build-image</id>
                                 <phase>install</phase>
-                                <id>build</id>
                                 <goals>
                                     <goal>build</goal>
                                 </goals>
@@ -144,7 +123,7 @@
         </profile>
 
         <profile>
-            <id>pushImages</id>
+            <id>internal</id>
             <build>
                 <plugins>
                     <plugin>
@@ -166,12 +145,56 @@
                         </configuration>
                         <executions>
                             <execution>
-                                <id>buildImage</id>
+                                <id>build-push-image</id>
+                                <phase>install</phase>
+                                <goals>
+                                    <goal>build</goal>
+                                    <goal>push</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+
+        <profile>
+            <id>release</id>
+            <build>
+                <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>
+                                <!-- This project is for enterprise use only, it will be pushed only to quay.io
+                                     Added the image push to dockerhub for a possible future use
+                                <image>
+                                    <name>${image.name}:${project.version}</name>
+                                    <registry>${public.image.registry}</registry>
+                                    <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>
-                                <phase>install</phase>
                             </execution>
                         </executions>
                     </plugin>
diff --git a/pom.xml b/pom.xml
index c6123971..5c3649f9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,6 +16,7 @@
 
     <properties>
         <java.version>1.8</java.version>
+        <image.tag>local</image.tag>
         <dependency.pdfbox.version>2.0.8</dependency.pdfbox.version>
         <dependency.fabric8.version>3.5.37</dependency.fabric8.version>
         <dependency.spring-boot.version>1.5.10.RELEASE</dependency.spring-boot.version>
@@ -41,7 +42,7 @@
     <distributionManagement>
         <repository>
             <id>alfresco-internal</id>
-            <url>https://artifacts.alfresco.com/nexus/content/repositories/enterprise-releases</url>
+            <url>https://artifacts.alfresco.com/nexus/content/repositories/internal-releases</url>
         </repository>
         <snapshotRepository>
             <id>alfresco-internal-snapshots</id>