From 6c405b3b6e5016afda934ddf27c2f76fffd633df Mon Sep 17 00:00:00 2001
From: Andrew Pielage <pandrex247@hotmail.com>
Date: Thu, 7 Dec 2023 16:14:54 +0000
Subject: [PATCH] FISH-8129 Build additional JDK 21 image

Signed-off-by: Andrew Pielage <pandrex247@hotmail.com>
---
 appserver/extras/docker-images/pom.xml | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/appserver/extras/docker-images/pom.xml b/appserver/extras/docker-images/pom.xml
index 673705f6cf9..a2b6ec7e775 100644
--- a/appserver/extras/docker-images/pom.xml
+++ b/appserver/extras/docker-images/pom.xml
@@ -59,6 +59,7 @@
         <docker.java.repository>azul/zulu-openjdk</docker.java.repository>
         <docker.jdk11.tag>11.0.21</docker.jdk11.tag>
         <docker.jdk17.tag>17.0.9</docker.jdk17.tag>
+        <docker.jdk21.tag>21.0.1</docker.jdk21.tag>
 
         <docker.payara.domainName>domain1</docker.payara.domainName>
         <docker.payara.rootDirectoryName>payara6</docker.payara.rootDirectoryName>
@@ -153,6 +154,12 @@
                                                 <filter token="docker.payara.tag" value="${docker.payara.tag}-jdk17"/>
                                             </filterset>
                                         </copy>
+                                        <copy file="src/main/docker/Dockerfile" toFile="target/antrun/Dockerfile.jdk21">
+                                            <filterset>
+                                                <filter token="docker.java.image" value="${docker.java.repository}:${docker.jdk21.tag}"/>
+                                                <filter token="docker.payara.tag" value="${docker.payara.tag}-jdk21"/>
+                                            </filterset>
+                                        </copy>
                                     </target>
                                 </configuration>
                             </execution>
@@ -208,6 +215,24 @@
                                         </assembly>
                                     </build>
                                 </image>
+                                <image>
+                                    <name>${docker.payara.repository}</name>
+                                    <build>
+                                        <!-- On Windows with default setting ${*}, $PATH would get filtered as well -->
+                                        <filter>@</filter>
+                                        <tags>
+                                            <tag>${docker.payara.tag}-jdk21</tag>
+                                        </tags>
+                                        <cleanup>none</cleanup>
+                                        <noCache>${docker.noCache}</noCache>
+                                        <dockerFile>${project.build.directory}/antrun/Dockerfile.jdk21</dockerFile>
+                                        <assembly>
+                                            <mode>tar</mode>
+                                            <descriptor>assembly.xml</descriptor>
+                                            <tarLongFileMode>gnu</tarLongFileMode>
+                                        </assembly>
+                                    </build>
+                                </image>
                             </images>
                         </configuration>
                     </plugin>