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] 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>