From caaa8f79daf846a4c59c78361b312a264a04c7dd Mon Sep 17 00:00:00 2001
From: "Damian.Ujma@hyland.com" <Damian.Ujma@hyland.com>
Date: Thu, 2 Mar 2023 15:40:42 +0100
Subject: [PATCH 1/4] ACS-4140 Use build for 'push-docker-images' and 'release'
 profiles

---
 docker-share/ags/pom.xml | 89 ++++++++++++++++++++++++++++++++++++++--
 1 file changed, 85 insertions(+), 4 deletions(-)

diff --git a/docker-share/ags/pom.xml b/docker-share/ags/pom.xml
index 27e657211..63f9d36e5 100644
--- a/docker-share/ags/pom.xml
+++ b/docker-share/ags/pom.xml
@@ -158,8 +158,20 @@
                      <images>
                         <!-- Quay image -->
                         <image>
-                           <name>${image.name}:${image.tag}</name>
-                           <registry>${image.registry}</registry>
+                           <name>${image.registry}/${image.name}:${image.tag}</name>
+                           <build>
+                              <buildx>
+                                 <builderName>${builder.name}</builderName>
+                                 <platforms>
+                                    <platform>linux/amd64</platform>
+                                    <platform>linux/arm64</platform>
+                                 </platforms>
+                              </buildx>
+                              <dockerFileDir>${project.basedir}</dockerFileDir>
+                              <args>
+                                 <BASE_IMAGE>${local.registry}/${base.image}</BASE_IMAGE>
+                              </args>
+                           </build>
                         </image>
                      </images>
                   </configuration>
@@ -174,6 +186,28 @@
                      </execution>
                   </executions>
                </plugin>
+               <plugin>
+                  <artifactId>exec-maven-plugin</artifactId>
+                  <groupId>org.codehaus.mojo</groupId>
+                  <executions>
+                     <execution>
+                        <id>prepare-buildx</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                           <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                           <executable>${scripts.directory}/prepare_buildx.sh</executable>
+                           <arguments>
+                              <argument>${builder.name}</argument>
+                              <argument>${image.registry}</argument>
+                              <argument>${image.name}</argument>
+                              <argument>${image.tag}</argument>
+                           </arguments>
+                        </configuration>
+                     </execution>
+                  </executions>
+               </plugin>
             </plugins>
          </build>
       </profile>
@@ -195,6 +229,19 @@
                               <!-- DockerHub image -->
                               <image>
                                  <name>${image.name}:${project.version}</name>
+                                 <build>
+                                    <buildx>
+                                       <builderName>${builder.name}</builderName>
+                                       <platforms>
+                                          <platform>linux/amd64</platform>
+                                          <platform>linux/arm64</platform>
+                                       </platforms>
+                                    </buildx>
+                                    <dockerFileDir>${project.basedir}</dockerFileDir>
+                                    <args>
+                                       <BASE_IMAGE>${local.registry}/${base.image}</BASE_IMAGE>
+                                    </args>
+                                 </build>
                               </image>
                            </images>
                         </configuration>
@@ -210,8 +257,20 @@
                            <images>
                               <!-- Quay image -->
                               <image>
-                                 <name>${image.name}:${project.version}</name>
-                                 <registry>${image.registry}</registry>
+                                 <name>${image.registry}/${image.name}:${project.version}</name>
+                                 <build>
+                                    <buildx>
+                                       <builderName>${builder.name}</builderName>
+                                       <platforms>
+                                          <platform>linux/amd64</platform>
+                                          <platform>linux/arm64</platform>
+                                       </platforms>
+                                    </buildx>
+                                    <dockerFileDir>${project.basedir}</dockerFileDir>
+                                    <args>
+                                       <BASE_IMAGE>${local.registry}/${base.image}</BASE_IMAGE>
+                                    </args>
+                                 </build>
                               </image>
                            </images>
                         </configuration>
@@ -222,6 +281,28 @@
                      </execution>
                   </executions>
                </plugin>
+               <plugin>
+                  <artifactId>exec-maven-plugin</artifactId>
+                  <groupId>org.codehaus.mojo</groupId>
+                  <executions>
+                     <execution>
+                        <id>prepare-buildx</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                           <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                           <executable>${scripts.directory}/prepare_buildx.sh</executable>
+                           <arguments>
+                              <argument>${builder.name}</argument>
+                              <argument>${image.registry}</argument>
+                              <argument>${image.name}</argument>
+                              <argument>${image.tag}</argument>
+                           </arguments>
+                        </configuration>
+                     </execution>
+                  </executions>
+               </plugin>
             </plugins>
          </build>
       </profile>

From 5c91f2e2f8c83afcd4669e9e26b5826470ddcbad Mon Sep 17 00:00:00 2001
From: "Damian.Ujma@hyland.com" <Damian.Ujma@hyland.com>
Date: Thu, 2 Mar 2023 15:45:31 +0100
Subject: [PATCH 2/4] ACS-4140 Remove comments

---
 docker-alfresco/pom.xml  | 1 -
 docker-share/ags/pom.xml | 1 -
 2 files changed, 2 deletions(-)

diff --git a/docker-alfresco/pom.xml b/docker-alfresco/pom.xml
index 193142e97..104a8df7a 100644
--- a/docker-alfresco/pom.xml
+++ b/docker-alfresco/pom.xml
@@ -105,7 +105,6 @@
 
         <profile>
             <id>build-multiarch-docker-images</id>
-            <!-- builds multi Architecture "images:latest" locally -->
             <build>
                 <plugins>
                     <plugin>
diff --git a/docker-share/ags/pom.xml b/docker-share/ags/pom.xml
index 63f9d36e5..bb7359b8a 100644
--- a/docker-share/ags/pom.xml
+++ b/docker-share/ags/pom.xml
@@ -84,7 +84,6 @@
       </profile>
       <profile>
          <id>build-multiarch-docker-images</id>
-         <!-- builds multi Architecture "images:latest" locally -->
          <build>
             <plugins>
                <plugin>

From 4a2b73ad62e97d75d630b56a0b94015598a774d2 Mon Sep 17 00:00:00 2001
From: "Damian.Ujma@hyland.com" <Damian.Ujma@hyland.com>
Date: Tue, 7 Mar 2023 12:51:47 +0100
Subject: [PATCH 3/4] ACS-4140 Add missing properties

---
 docker-share/ags/pom.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docker-share/ags/pom.xml b/docker-share/ags/pom.xml
index bb7359b8a..59132f458 100644
--- a/docker-share/ags/pom.xml
+++ b/docker-share/ags/pom.xml
@@ -15,6 +15,8 @@
       <image.name>alfresco/alfresco-governance-share-community</image.name>
       <docker.quay-expires.value>NEVER</docker.quay-expires.value>
       <base.image>alfresco/alfresco-share-base:${share.image.tag}</base.image>
+      <local.registry>127.0.0.1:5000</local.registry>
+      <builder.name>entitled-builder</builder.name>
       <scripts.directory>${project.parent.parent.basedir}/scripts/dev</scripts.directory>
    </properties>
 
@@ -82,6 +84,7 @@
             </plugins>
          </build>
       </profile>
+
       <profile>
          <id>build-multiarch-docker-images</id>
          <build>
@@ -145,6 +148,7 @@
             </plugins>
          </build>
       </profile>
+
       <profile>
          <id>push-docker-images</id>
          <!-- publishes "image:latest" to Quay -->

From d340f5e9245d277120d02bd7df0d306bf7130b07 Mon Sep 17 00:00:00 2001
From: "Damian.Ujma@hyland.com" <Damian.Ujma@hyland.com>
Date: Tue, 7 Mar 2023 16:47:48 +0100
Subject: [PATCH 4/4] ACS-4140 Inherit required properties

---
 docker-alfresco/pom.xml  | 2 --
 docker-share/ags/pom.xml | 2 --
 2 files changed, 4 deletions(-)

diff --git a/docker-alfresco/pom.xml b/docker-alfresco/pom.xml
index 104a8df7a..af7294cea 100644
--- a/docker-alfresco/pom.xml
+++ b/docker-alfresco/pom.xml
@@ -13,9 +13,7 @@
     <properties>
         <image.name>alfresco/alfresco-content-repository-community</image.name>
         <docker.quay-expires.value>NEVER</docker.quay-expires.value>
-        <local.registry>127.0.0.1:5000</local.registry>
         <base.image>alfresco/alfresco-community-repo-base:${repo.image.tag}</base.image>
-        <builder.name>entitled-builder</builder.name>
         <scripts.directory>${project.parent.basedir}/scripts/dev</scripts.directory>
     </properties>
 
diff --git a/docker-share/ags/pom.xml b/docker-share/ags/pom.xml
index 59132f458..829f8dc72 100644
--- a/docker-share/ags/pom.xml
+++ b/docker-share/ags/pom.xml
@@ -15,8 +15,6 @@
       <image.name>alfresco/alfresco-governance-share-community</image.name>
       <docker.quay-expires.value>NEVER</docker.quay-expires.value>
       <base.image>alfresco/alfresco-share-base:${share.image.tag}</base.image>
-      <local.registry>127.0.0.1:5000</local.registry>
-      <builder.name>entitled-builder</builder.name>
       <scripts.directory>${project.parent.parent.basedir}/scripts/dev</scripts.directory>
    </properties>