Skip to content

Commit

Permalink
Merge pull request #6509 from Pandrex247/FISH-8129-Release
Browse files Browse the repository at this point in the history 
FISH-8129 Add JDK 21 Docker Images (Release Branch)
  • Loading branch information
@abdulrahim458
abdulrahim458 authored Dec 14, 2023
2 parents 7893408 + f4a1468 commit 05b8f66
Show file tree
Hide file tree
Showing 2 changed files with 120 additions and 47 deletions.
155 changes: 114 additions & 41 deletions appserver/extras/docker-images/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -80,7 +81,7 @@
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
<version>0.33.0</version>
<version>0.43.4</version>
<extensions>true</extensions>
<configuration>
<verbose>true</verbose>
Expand Down Expand Up @@ -168,48 +169,120 @@
<goal>build</goal>
</goals>
<phase>package</phase>
<configuration>
<images>
<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}</tag>
</tags>
<cleanup>none</cleanup>
<noCache>${docker.noCache}</noCache>
<dockerFile>${project.build.directory}/antrun/Dockerfile.jdk11</dockerFile>
<assembly>
<mode>tar</mode>
<descriptor>assembly.xml</descriptor>
<tarLongFileMode>gnu</tarLongFileMode>
</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}-jdk17</tag>
</tags>
<cleanup>none</cleanup>
<noCache>${docker.noCache}</noCache>
<dockerFile>${project.build.directory}/antrun/Dockerfile.jdk17</dockerFile>
<assembly>
<mode>tar</mode>
<descriptor>assembly.xml</descriptor>
<tarLongFileMode>gnu</tarLongFileMode>
</assembly>
</build>
</image>
</images>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
<!-- Split into a separate profile for when we want to update images for distributions that don't support JDK 21 -->
<profile>
<id>generate-jdk21-docker-image</id>
<activation>
<file>
<!-- Essentially - Skip this aggregator pom -->
<exists>src/main/docker/Dockerfile</exists>
</file>
</activation>
<build>
<plugins>
<!-- Required until https://github.com/fabric8io/docker-maven-plugin/issues/859 is resolved -->
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
<id>filter-dockerfiles-jdk21</id>
<phase>package</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<target>
<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>
</executions>
</plugin>
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
<executions>
<execution>
<id>build-docker-image-jdk21</id>
<goals>
<goal>build</goal>
</goals>
<phase>package</phase>
<configuration>
<images>
<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>
</execution>
</executions>
<configuration>
<images>
<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}</tag>
</tags>
<cleanup>none</cleanup>
<noCache>${docker.noCache}</noCache>
<dockerFile>${project.build.directory}/antrun/Dockerfile.jdk11</dockerFile>
<assembly>
<mode>tar</mode>
<descriptor>assembly.xml</descriptor>
<tarLongFileMode>gnu</tarLongFileMode>
</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}-jdk17</tag>
</tags>
<cleanup>none</cleanup>
<noCache>${docker.noCache}</noCache>
<dockerFile>${project.build.directory}/antrun/Dockerfile.jdk17</dockerFile>
<assembly>
<mode>tar</mode>
<descriptor>assembly.xml</descriptor>
<tarLongFileMode>gnu</tarLongFileMode>
</assembly>
</build>
</image>
</images>
</configuration>
</plugin>
</plugins>
</build>
Expand Down
12 changes: 6 additions & 6 deletions appserver/extras/docker-images/tests/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,31 +73,31 @@
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>testcontainers</artifactId>
<version>1.15.1</version>
<version>1.19.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>junit-jupiter</artifactId>
<version>1.14.0</version>
<version>1.19.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<version>5.6.2</version>
<version>5.10.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.28</version>
<version>2.0.9</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>1.7.28</version>
<version>2.0.9</version>
<scope>test</scope>
</dependency>

Expand All @@ -109,7 +109,7 @@
<dependency>
<groupId>org.jboss.shrinkwrap.resolver</groupId>
<artifactId>shrinkwrap-resolver-impl-maven-archive</artifactId>
<version>3.1.3</version>
<version>3.2.1</version>
<scope>test</scope>
<exclusions>
<exclusion>
Expand Down

0 comments on commit 05b8f66

Please sign in to comment.