Bläddra i källkod

Merge pull request #11092 from crpotter/21.0.0.10-release

21.0.0.10 release
Tianon Gravi 4 år sedan
förälder
incheckning
43921ac2a2
2 ändrade filer med 60 tillägg och 22 borttagningar
  1. 35 15
      library/open-liberty
  2. 25 7
      library/websphere-liberty

+ 35 - 15
library/open-liberty

@@ -2,75 +2,95 @@ Maintainers: Chris Potter <[email protected]> (@crpotter),
              Wendy Raschke <[email protected]> (@wraschke),
              Arthur De Magalhaes <[email protected]> (@arthurdm)
 GitRepo: https://github.com/OpenLiberty/ci.docker.git
-GitCommit: c0b16e39ba0d342f2d818ec0ece7ebade5b2ba63
+GitCommit: 225554a03cc6d1908d0ba683ad8da6a1cacf5863
 Architectures: amd64, i386, ppc64le, s390x
 
 Tags: beta
 Directory: releases/latest/beta
 Architectures: amd64, ppc64le, s390x
-File: Dockerfile.ubuntu.adoptopenjdk8
+File: Dockerfile.ubuntu.openjdk8
 
 Tags: beta-java11
 Directory: releases/latest/beta
 Architectures: amd64, ppc64le, s390x
-File: Dockerfile.ubuntu.adoptopenjdk11
+File: Dockerfile.ubuntu.openjdk11
 
 Tags: kernel-slim, kernel-slim-java8-openj9
 Directory: releases/latest/kernel-slim
 Architectures: amd64, ppc64le, s390x
-File: Dockerfile.ubuntu.adoptopenjdk8
+File: Dockerfile.ubuntu.openjdk8
 
 Tags: kernel-slim-java11-openj9
 Directory: releases/latest/kernel-slim
 Architectures: amd64, ppc64le, s390x
-File: Dockerfile.ubuntu.adoptopenjdk11
+File: Dockerfile.ubuntu.openjdk11
 
 Tags: full, full-java8-openj9, latest
 Directory: releases/latest/full
 Architectures: amd64, ppc64le, s390x
-File: Dockerfile.ubuntu.adoptopenjdk8
+File: Dockerfile.ubuntu.openjdk8
 
 Tags: full-java11-openj9
 Directory: releases/latest/full
 Architectures: amd64, ppc64le, s390x
-File: Dockerfile.ubuntu.adoptopenjdk11
+File: Dockerfile.ubuntu.openjdk11
+
+Tags: 21.0.0.10-kernel-slim-java8-openj9
+Directory: releases/21.0.0.10/kernel-slim
+Architectures: amd64, ppc64le, s390x
+File: Dockerfile.ubuntu.openjdk8
+
+Tags: 21.0.0.10-kernel-slim-java11-openj9
+Directory: releases/21.0.0.10/kernel-slim
+Architectures: amd64, ppc64le, s390x
+File: Dockerfile.ubuntu.openjdk11
+
+Tags: 21.0.0.10-full-java8-openj9
+Directory: releases/21.0.0.10/full
+Architectures: amd64, ppc64le, s390x
+File: Dockerfile.ubuntu.openjdk8
+
+Tags: 21.0.0.10-full-java11-openj9
+Directory: releases/21.0.0.10/full
+Architectures: amd64, ppc64le, s390x
+File: Dockerfile.ubuntu.openjdk11
 
 Tags: 21.0.0.9-kernel-slim-java8-openj9
 Directory: releases/21.0.0.9/kernel-slim
 Architectures: amd64, ppc64le, s390x
-File: Dockerfile.ubuntu.adoptopenjdk8
+File: Dockerfile.ubuntu.openjdk8
 
 Tags: 21.0.0.9-kernel-slim-java11-openj9
 Directory: releases/21.0.0.9/kernel-slim
 Architectures: amd64, ppc64le, s390x
-File: Dockerfile.ubuntu.adoptopenjdk11
+File: Dockerfile.ubuntu.openjdk11
 
 Tags: 21.0.0.9-full-java8-openj9
 Directory: releases/21.0.0.9/full
 Architectures: amd64, ppc64le, s390x
-File: Dockerfile.ubuntu.adoptopenjdk8
+File: Dockerfile.ubuntu.openjdk8
 
 Tags: 21.0.0.9-full-java11-openj9
 Directory: releases/21.0.0.9/full
 Architectures: amd64, ppc64le, s390x
-File: Dockerfile.ubuntu.adoptopenjdk11
+File: Dockerfile.ubuntu.openjdk11
 
 Tags: 21.0.0.6-kernel-slim-java8-openj9
 Directory: releases/21.0.0.6/kernel-slim
 Architectures: amd64, ppc64le, s390x
-File: Dockerfile.ubuntu.adoptopenjdk8
+File: Dockerfile.ubuntu.openjdk8
 
 Tags: 21.0.0.6-kernel-slim-java11-openj9
 Directory: releases/21.0.0.6/kernel-slim
 Architectures: amd64, ppc64le, s390x
-File: Dockerfile.ubuntu.adoptopenjdk11
+File: Dockerfile.ubuntu.openjdk11
 
 Tags: 21.0.0.6-full-java8-openj9
 Directory: releases/21.0.0.6/full
 Architectures: amd64, ppc64le, s390x
-File: Dockerfile.ubuntu.adoptopenjdk8
+File: Dockerfile.ubuntu.openjdk8
 
 Tags: 21.0.0.6-full-java11-openj9
 Directory: releases/21.0.0.6/full
 Architectures: amd64, ppc64le, s390x
-File: Dockerfile.ubuntu.adoptopenjdk11
+File: Dockerfile.ubuntu.openjdk11

+ 25 - 7
library/websphere-liberty

@@ -2,7 +2,7 @@ Maintainers: Chris Potter <[email protected]> (@crpotter),
              Wendy Raschke <[email protected]> (@wraschke),
              Arthur De Magalhaes <[email protected]> (@arthurdm)
 GitRepo: https://github.com/WASdev/ci.docker.git
-GitCommit: 11a30fa86e6aba0f81deecc54d0b83f8b39f322c
+GitCommit: 4de6970d7654cd41f27a8806f5cd1a609471151e
 Architectures: amd64, i386, ppc64le, s390x
 
 Tags: kernel
@@ -12,7 +12,7 @@ File: Dockerfile.ubuntu.ibmjava8
 Tags: kernel-java11-openj9
 Directory: ga/latest/kernel
 Architectures: amd64, ppc64le, s390x
-File: Dockerfile.ubuntu.adoptopenjdk11
+File: Dockerfile.ubuntu.openjdk11
 
 Tags: full, latest
 Directory: ga/latest/full
@@ -21,7 +21,25 @@ File: Dockerfile.ubuntu.ibmjava8
 Tags: full-java11-openj9
 Directory: ga/latest/full
 Architectures: amd64, ppc64le, s390x
-File: Dockerfile.ubuntu.adoptopenjdk11
+File: Dockerfile.ubuntu.openjdk11
+
+Tags: 21.0.0.10-kernel-java8-ibmjava
+Directory: ga/21.0.0.10/kernel
+File: Dockerfile.ubuntu.ibmjava8
+
+Tags: 21.0.0.10-kernel-java11-openj9
+Directory: ga/21.0.0.10/kernel
+Architectures: amd64, ppc64le, s390x
+File: Dockerfile.ubuntu.openjdk11
+
+Tags: 21.0.0.10-full-java8-ibmjava
+Directory: ga/21.0.0.10/full
+File: Dockerfile.ubuntu.ibmjava8
+
+Tags: 21.0.0.10-full-java11-openj9
+Directory: ga/21.0.0.10/full
+Architectures: amd64, ppc64le, s390x
+File: Dockerfile.ubuntu.openjdk11
 
 Tags: 21.0.0.9-kernel-java8-ibmjava
 Directory: ga/21.0.0.9/kernel
@@ -30,7 +48,7 @@ File: Dockerfile.ubuntu.ibmjava8
 Tags: 21.0.0.9-kernel-java11-openj9
 Directory: ga/21.0.0.9/kernel
 Architectures: amd64, ppc64le, s390x
-File: Dockerfile.ubuntu.adoptopenjdk11
+File: Dockerfile.ubuntu.openjdk11
 
 Tags: 21.0.0.9-full-java8-ibmjava
 Directory: ga/21.0.0.9/full
@@ -39,7 +57,7 @@ File: Dockerfile.ubuntu.ibmjava8
 Tags: 21.0.0.9-full-java11-openj9
 Directory: ga/21.0.0.9/full
 Architectures: amd64, ppc64le, s390x
-File: Dockerfile.ubuntu.adoptopenjdk11
+File: Dockerfile.ubuntu.openjdk11
 
 Tags: 21.0.0.6-kernel-java8-ibmjava
 Directory: ga/21.0.0.6/kernel
@@ -48,7 +66,7 @@ File: Dockerfile.ubuntu.ibmjava8
 Tags: 21.0.0.6-kernel-java11-openj9
 Directory: ga/21.0.0.6/kernel
 Architectures: amd64, ppc64le, s390x
-File: Dockerfile.ubuntu.adoptopenjdk11
+File: Dockerfile.ubuntu.openjdk11
 
 Tags: 21.0.0.6-full-java8-ibmjava
 Directory: ga/21.0.0.6/full
@@ -57,4 +75,4 @@ File: Dockerfile.ubuntu.ibmjava8
 Tags: 21.0.0.6-full-java11-openj9
 Directory: ga/21.0.0.6/full
 Architectures: amd64, ppc64le, s390x
-File: Dockerfile.ubuntu.adoptopenjdk11
+File: Dockerfile.ubuntu.openjdk11