From b6ebd48e8846b1d27dd3c7c1eaedb57ecfab2a70 Mon Sep 17 00:00:00 2001
From: Alexandru-Eusebiu Epure <Alexandru.Epure@ness.com>
Date: Mon, 12 Mar 2018 17:58:28 +0200
Subject: [PATCH] REPO-3336 : Deployment: Release Process: fabric8    Merge the
 two fabric8 plugins into a single one.

---
 docker-alfresco/pom.xml | 28 +++++-----------------------
 1 file changed, 5 insertions(+), 23 deletions(-)

diff --git a/docker-alfresco/pom.xml b/docker-alfresco/pom.xml
index fc3b9b2d05..0cb143421e 100644
--- a/docker-alfresco/pom.xml
+++ b/docker-alfresco/pom.xml
@@ -183,37 +183,18 @@
                                         <dockerFileDir>${project.basedir}/</dockerFileDir>
                                         <tags>
                                             <!--<tag>${bamboo.inject.tag}</tag>-->
-                                            <tag>rc1</tag>
+                                            <tag>testing-rc1</tag>
                                         </tags>
                                     </build>
                                 </image>
-                            </images>
-                        </configuration>
-                        <executions>
-                            <execution>
-                                <id>buildAndPushInternally</id>
-                                <goals>
-                                    <goal>build</goal>
-                                    <goal>push</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-
-                    <plugin>
-                        <groupId>io.fabric8</groupId>
-                        <artifactId>fabric8-maven-plugin</artifactId>
-                        <version>3.5.37</version>
-                        <configuration>
-                            <images>
                                 <image>
                                     <name>alfresco/alfresco-content-services-community</name>
                                     <registry>registry.hub.docker.com</registry>
                                     <build>
-                                        <dockerFileDir>${project.basedir}/</dockerFileDir>
+                                    	<dockerFileDir>${project.basedir}/</dockerFileDir>
                                         <tags>
                                             <!--<tag>${bamboo.inject.tag}</tag>-->
-                                            <tag>rc1</tag>
+                                            <tag>testing-rc2</tag>
                                         </tags>
                                     </build>
                                 </image>
@@ -221,8 +202,9 @@
                         </configuration>
                         <executions>
                             <execution>
-                                <id>pushDockerhub</id>
+                                <id>buildAndPush</id>
                                 <goals>
+                                    <goal>build</goal>
                                     <goal>push</goal>
                                 </goals>
                             </execution>