From e04e757daf46b227f0fd67908d11bc64838ee920 Mon Sep 17 00:00:00 2001
From: Alan Davis <alan.davis@alfresco.com>
Date: Mon, 22 Feb 2021 10:54:42 +0000
Subject: [PATCH] ACS-1110 replace fabric8 with docker-maven-plugin (#1252)

The community repo image was not being updated on DockerHub or quay.io after the original commit for this issue. It appears the new io.fabric8:docker-maven-plugin is only able to push to one registry. We had images for quay.io and dockerhub.

On a branch we managed to release 7.0.0-A27c. In order to do so we temporarily had to comment out the upstream dependency check in build.sh.

[skip ci]
---
 distribution/pom.xml    |  4 ----
 docker-alfresco/pom.xml | 27 ++++-----------------------
 2 files changed, 4 insertions(+), 27 deletions(-)

diff --git a/distribution/pom.xml b/distribution/pom.xml
index 7ae27fa7f..4c6eea3b6 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -25,10 +25,6 @@
             <groupId>org.alfresco</groupId>
             <artifactId>alfresco-repository</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.alfresco</groupId>
-            <artifactId>alfresco-data-model</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.alfresco</groupId>
             <artifactId>alfresco-server-root</artifactId>
diff --git a/docker-alfresco/pom.xml b/docker-alfresco/pom.xml
index a85a3088b..1aebe4964 100644
--- a/docker-alfresco/pom.xml
+++ b/docker-alfresco/pom.xml
@@ -1,7 +1,7 @@
 <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">
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>content-services-community-docker-alfresco</artifactId>
-    <name>ACS Community Docker Image Builder for Alfresco Community</name>
+    <artifactId>content-services-community-docker</artifactId>
+    <name>ACS Community Docker Image Builder</name>
     <packaging>pom</packaging>
 
     <parent>
@@ -54,20 +54,6 @@
                                     <overWrite>false</overWrite>
                                     <outputDirectory>${project.build.directory}/amps</outputDirectory>
                                 </artifactItem>
-<!--                                <artifactItem>-->
-<!--                                    <groupId>org.alfresco.aos-module</groupId>-->
-<!--                                    <artifactId>alfresco-aos-module</artifactId>-->
-<!--                                    <type>amp</type>-->
-<!--                                    <overWrite>false</overWrite>-->
-<!--                                    <outputDirectory>${project.build.directory}/amps</outputDirectory>-->
-<!--                                </artifactItem>-->
-<!--                                <artifactItem>-->
-<!--                                    <groupId>org.alfresco.integrations</groupId>-->
-<!--                                    <artifactId>alfresco-googledrive-repo-community</artifactId>-->
-<!--                                    <type>amp</type>-->
-<!--                                    <overWrite>false</overWrite>-->
-<!--                                    <outputDirectory>${project.build.directory}/amps</outputDirectory>-->
-<!--                                </artifactItem>-->
                             </artifactItems>
                         </configuration>
                     </execution>
@@ -108,7 +94,7 @@
 
         <profile>
             <id>internal</id>
-            <!-- publishes "image:latest" on Quay & DockerHub -->
+            <!-- publishes "image:latest" to Quay -->
             <build>
                 <plugins>
                     <plugin>
@@ -140,7 +126,7 @@
 
         <profile>
             <id>release</id>
-            <!-- publishes "image:release_version" on Quay & DockerHub -->
+            <!-- publishes "image:release_version" to DockerHub -->
             <build>
                 <plugins>
                     <plugin>
@@ -148,11 +134,6 @@
                         <artifactId>docker-maven-plugin</artifactId>
                         <configuration combine.self="override">
                             <images>
-                                <!-- Quay image -->
-                                <image>
-                                    <name>${image.name}:${project.version}</name>
-                                    <registry>${image.registry}</registry>
-                                </image>
                                 <!-- DockerHub image -->
                                 <image>
                                     <name>${image.name}:${project.version}</name>