Explorar el Código

Merge pull request #5976 from naumanna/open-liberty-java11

Add Open Liberty Java 11 images
Tianon Gravi hace 6 años
padre
commit
a43aef8f70
Se han modificado 2 ficheros con 38 adiciones y 2 borrados
  1. 37 1
      library/open-liberty
  2. 1 1
      test/tests/open-liberty-hello-world/run.sh

+ 37 - 1
library/open-liberty

@@ -1,7 +1,7 @@
 Maintainers: Andy Naumann <[email protected]> (@naumanna),
              Arthur De Magalhaes <[email protected]> (@arthurdm)
 GitRepo: https://github.com/OpenLiberty/ci.docker.git
-GitCommit: 85b178132def01af7bb8682ffb4da95b8d392b65
+GitCommit: 000a096c445bc96e89b59b11517e511ff82ac17c
 Architectures: amd64, i386, ppc64le, s390x
 
 Tags: kernel, kernel-java8-ibm
@@ -11,6 +11,10 @@ Tags: kernel-java8-ibmsfj
 Directory: official/kernel/java8/ibmsfj
 Architectures: amd64
 
+Tags: kernel-java11
+Directory: official/kernel/java11/openj9
+Architectures: amd64, ppc64le, s390x
+
 Tags: webProfile8, webProfile8-java8-ibm
 Directory: official/webProfile8/java8/ibmjava
 
@@ -18,6 +22,10 @@ Tags: webProfile8-java8-ibmsfj
 Directory: official/webProfile8/java8/ibmsfj
 Architectures: amd64
 
+Tags: webProfile8-java11
+Directory: official/webProfile8/java11/openj9
+Architectures: amd64, ppc64le, s390x
+
 Tags: javaee8, javaee8-java8-ibm, latest
 Directory: official/javaee8/java8/ibmjava
 
@@ -25,6 +33,10 @@ Tags: javaee8-java8-ibmsfj
 Directory: official/javaee8/java8/ibmsfj
 Architectures: amd64
 
+Tags: javaee8-java11
+Directory: official/javaee8/java11/openj9
+Architectures: amd64, ppc64le, s390x
+
 Tags: microProfile1, microProfile1-java8-ibm
 Directory: official/microProfile1/java8/ibmjava
 
@@ -32,6 +44,10 @@ Tags: microProfile1-java8-ibmsfj
 Directory: official/microProfile1/java8/ibmsfj
 Architectures: amd64
 
+Tags: microProfile1-java11
+Directory: official/microProfile1/java11/openj9
+Architectures: amd64, ppc64le, s390x
+
 Tags: microProfile2, microProfile2-java8-ibm
 Directory: official/microProfile2/java8/ibmjava
 
@@ -39,6 +55,10 @@ Tags: microProfile2-java8-ibmsfj
 Directory: official/microProfile2/java8/ibmsfj
 Architectures: amd64
 
+Tags: microProfile2-java11
+Directory: official/microProfile2/java11/openj9
+Architectures: amd64, ppc64le, s390x
+
 Tags: springBoot2, springBoot2-java8-ibm
 Directory: official/springBoot2/java8/ibmjava
 
@@ -46,6 +66,10 @@ Tags: springBoot2-java8-ibmsfj
 Directory: official/springBoot2/java8/ibmsfj
 Architectures: amd64
 
+Tags: springBoot2-java11
+Directory: official/springBoot2/java11/openj9
+Architectures: amd64, ppc64le, s390x
+
 Tags: webProfile7, webProfile7-java8-ibm
 Directory: official/webProfile7/java8/ibmjava
 
@@ -53,6 +77,10 @@ Tags: webProfile7-java8-ibmsfj
 Directory: official/webProfile7/java8/ibmsfj
 Architectures: amd64
 
+Tags: webProfile7-java11
+Directory: official/webProfile7/java11/openj9
+Architectures: amd64, ppc64le, s390x
+
 Tags: javaee7, javaee7-java8-ibm
 Directory: official/javaee7/java8/ibmjava
 
@@ -60,9 +88,17 @@ Tags: javaee7-java8-ibmsfj
 Directory: official/javaee7/java8/ibmsfj
 Architectures: amd64
 
+Tags: javaee7-java11
+Directory: official/javaee7/java11/openj9
+Architectures: amd64, ppc64le, s390x
+
 Tags: springBoot1, springBoot1-java8-ibm
 Directory: official/springBoot1/java8/ibmjava
 
 Tags: springBoot1-java8-ibmsfj
 Directory: official/springBoot1/java8/ibmsfj
 Architectures: amd64
+
+Tags: springBoot1-java11
+Directory: official/springBoot1/java11/openj9
+Architectures: amd64, ppc64le, s390x

+ 1 - 1
test/tests/open-liberty-hello-world/run.sh

@@ -6,7 +6,7 @@ dir="$(dirname "$(readlink -f "$BASH_SOURCE")")"
 image="$1"
 
 # Use the alpine image since it is small and has wget in it that we can use
-clientImage="alpine:latest"
+clientImage="alpine:3.9"
 
 serverImage="$1"