@@ -28,7 +28,7 @@ tasks.create("pushMatrix", DockerPushImage) {
28
28
29
29
// Each line under appserver describes one matrix of (version x vm x jdk), dockerfile key overrides
30
30
// Dockerfile name, args key passes raw arguments to docker build
31
- def linuxTargets = [
31
+ def targets = [
32
32
" jetty" : [
33
33
[version : [" 9.4.39" ], vm : [" hotspot" ], jdk : [" 8" , " 11" , " 17" ], args : [sourceVersion : " 9.4.39.v20210325" ]],
34
34
[version : [" 9.4.39" ], vm : [" openj9" ], jdk : [" 8" , " 11" , " 16" ], args : [sourceVersion : " 9.4.39.v20210325" ]],
@@ -60,32 +60,16 @@ def linuxTargets = [
60
60
" wildfly" : [
61
61
[version : [" 13.0.0.Final" ], vm : [" hotspot" , " openj9" ], jdk : [" 8" ]],
62
62
[version : [" 17.0.1.Final" , " 21.0.0.Final" ], vm : [" hotspot" ], jdk : [" 8" , " 11" , " 17" ]],
63
- // there's no openj9 image for jdk 17
64
63
[version : [" 17.0.1.Final" , " 21.0.0.Final" ], vm : [" openj9" ], jdk : [" 8" , " 11" , " 16" ]]
65
64
],
66
65
" liberty" : [
67
66
// running configure.sh is failing while building the image with Java 17
68
- [version : [" 20.0.0.12" ], vm : [" hotspot" , " openj9" ], jdk : [" 8" , " 11" , " 16" ]]
69
- ]
70
- ]
71
-
72
- def windowsTargets = [
73
- " jetty" : linuxTargets[" jetty" ],
74
- " tomcat" : linuxTargets[" tomcat" ],
75
- " tomee" : linuxTargets[" tomee" ],
76
- " payara" : linuxTargets[" payara" ],
77
- " wildfly" : [
78
- [version : [" 13.0.0.Final" ], vm : [" hotspot" , " openj9" ], jdk : [" 8" ]],
79
- [version : [" 17.0.1.Final" , " 21.0.0.Final" ], vm : [" hotspot" ], jdk : [" 8" , " 11" , " 17" ]],
80
- [version : [" 17.0.1.Final" , " 21.0.0.Final" ], vm : [" openj9" ], jdk : [" 8" , " 11" , " 16" ]]
81
- ],
82
- " liberty" : [
83
67
[version : [" 20.0.0.12" ], vm : [" hotspot" , " openj9" ], jdk : [" 8" , " 11" , " 16" ], args : [release : " 2020-11-11_0736" ]]
84
68
]
85
69
]
86
70
87
- createDockerTasks(buildLinuxTestImagesTask, linuxTargets , false )
88
- createDockerTasks(buildWindowsTestImagesTask, windowsTargets , true )
71
+ createDockerTasks(buildLinuxTestImagesTask, targets , false )
72
+ createDockerTasks(buildWindowsTestImagesTask, targets , true )
89
73
90
74
def configureImage (Task parentTask , server , dockerfile , version , vm , jdk , warProject , Map<String , String > extraArgs , boolean isWindows , String extraTag ) {
91
75
// Using separate build directory for different war files allows using the same app.war filename
0 commit comments