浏览代码

Merge pull request #10346 from crpotter/21.0.0.6-release

21.0.0.6 release
Tianon Gravi 4 年之前
父节点
当前提交
c1ca9f91b3
共有 2 个文件被更改,包括 18 次插入56 次删除
  1. 9 29
      library/open-liberty
  2. 9 27
      library/websphere-liberty

+ 9 - 29
library/open-liberty

@@ -2,7 +2,7 @@ Maintainers: Chris Potter <[email protected]> (@crpotter),
              Wendy Raschke <[email protected]> (@wraschke),
              Wendy Raschke <[email protected]> (@wraschke),
              Arthur De Magalhaes <[email protected]> (@arthurdm)
              Arthur De Magalhaes <[email protected]> (@arthurdm)
 GitRepo: https://github.com/OpenLiberty/ci.docker.git
 GitRepo: https://github.com/OpenLiberty/ci.docker.git
-GitCommit: 651f2794c93bc454aeae12eda58be1430f731e0e
+GitCommit: af5843fe3f3c594ca0e2dc7e3613d7660d4220e2
 Architectures: amd64, i386, ppc64le, s390x
 Architectures: amd64, i386, ppc64le, s390x
 
 
 Tags: beta
 Tags: beta
@@ -35,23 +35,23 @@ Directory: releases/latest/full
 Architectures: amd64, ppc64le, s390x
 Architectures: amd64, ppc64le, s390x
 File: Dockerfile.ubuntu.adoptopenjdk11
 File: Dockerfile.ubuntu.adoptopenjdk11
 
 
-Tags: 21.0.0.5-kernel-slim-java8-openj9
-Directory: releases/21.0.0.5/kernel-slim
+Tags: 21.0.0.6-kernel-slim-java8-openj9
+Directory: releases/21.0.0.6/kernel-slim
 Architectures: amd64, ppc64le, s390x
 Architectures: amd64, ppc64le, s390x
 File: Dockerfile.ubuntu.adoptopenjdk8
 File: Dockerfile.ubuntu.adoptopenjdk8
 
 
-Tags: 21.0.0.5-kernel-slim-java11-openj9
-Directory: releases/21.0.0.5/kernel-slim
+Tags: 21.0.0.6-kernel-slim-java11-openj9
+Directory: releases/21.0.0.6/kernel-slim
 Architectures: amd64, ppc64le, s390x
 Architectures: amd64, ppc64le, s390x
 File: Dockerfile.ubuntu.adoptopenjdk11
 File: Dockerfile.ubuntu.adoptopenjdk11
 
 
-Tags: 21.0.0.5-full-java8-openj9
-Directory: releases/21.0.0.5/full
+Tags: 21.0.0.6-full-java8-openj9
+Directory: releases/21.0.0.6/full
 Architectures: amd64, ppc64le, s390x
 Architectures: amd64, ppc64le, s390x
 File: Dockerfile.ubuntu.adoptopenjdk8
 File: Dockerfile.ubuntu.adoptopenjdk8
 
 
-Tags: 21.0.0.5-full-java11-openj9
-Directory: releases/21.0.0.5/full
+Tags: 21.0.0.6-full-java11-openj9
+Directory: releases/21.0.0.6/full
 Architectures: amd64, ppc64le, s390x
 Architectures: amd64, ppc64le, s390x
 File: Dockerfile.ubuntu.adoptopenjdk11
 File: Dockerfile.ubuntu.adoptopenjdk11
 
 
@@ -74,23 +74,3 @@ Tags: 21.0.0.3-full-java11-openj9
 Directory: releases/21.0.0.3/full
 Directory: releases/21.0.0.3/full
 Architectures: amd64, ppc64le, s390x
 Architectures: amd64, ppc64le, s390x
 File: Dockerfile.ubuntu.adoptopenjdk11
 File: Dockerfile.ubuntu.adoptopenjdk11
-
-Tags: 20.0.0.12-kernel-slim-java8-openj9
-Directory: releases/20.0.0.12/kernel-slim
-Architectures: amd64, ppc64le, s390x
-File: Dockerfile.ubuntu.adoptopenjdk8
-
-Tags: 20.0.0.12-kernel-slim-java11-openj9
-Directory: releases/20.0.0.12/kernel-slim
-Architectures: amd64, ppc64le, s390x
-File: Dockerfile.ubuntu.adoptopenjdk11
-
-Tags: 20.0.0.12-full-java8-openj9
-Directory: releases/20.0.0.12/full
-Architectures: amd64, ppc64le, s390x
-File: Dockerfile.ubuntu.adoptopenjdk8
-
-Tags: 20.0.0.12-full-java11-openj9
-Directory: releases/20.0.0.12/full
-Architectures: amd64, ppc64le, s390x
-File: Dockerfile.ubuntu.adoptopenjdk11

+ 9 - 27
library/websphere-liberty

@@ -2,7 +2,7 @@ Maintainers: Chris Potter <[email protected]> (@crpotter),
              Wendy Raschke <[email protected]> (@wraschke),
              Wendy Raschke <[email protected]> (@wraschke),
              Arthur De Magalhaes <[email protected]> (@arthurdm)
              Arthur De Magalhaes <[email protected]> (@arthurdm)
 GitRepo: https://github.com/WASdev/ci.docker.git
 GitRepo: https://github.com/WASdev/ci.docker.git
-GitCommit: 8d30234391a62a3a6b2c32b45801cb5e914781fa
+GitCommit: 17cdd8ad817f7830f0732c95b90843d83f6a4908
 Architectures: amd64, i386, ppc64le, s390x
 Architectures: amd64, i386, ppc64le, s390x
 
 
 Tags: kernel
 Tags: kernel
@@ -23,21 +23,21 @@ Directory: ga/latest/full
 Architectures: amd64, ppc64le, s390x
 Architectures: amd64, ppc64le, s390x
 File: Dockerfile.ubuntu.adoptopenjdk11
 File: Dockerfile.ubuntu.adoptopenjdk11
 
 
-Tags: 21.0.0.5-kernel-java8-ibmjava
-Directory: ga/21.0.0.5/kernel
+Tags: 21.0.0.6-kernel-java8-ibmjava
+Directory: ga/21.0.0.6/kernel
 File: Dockerfile.ubuntu.ibmjava8
 File: Dockerfile.ubuntu.ibmjava8
 
 
-Tags: 21.0.0.5-kernel-java11-openj9
-Directory: ga/21.0.0.5/kernel
+Tags: 21.0.0.6-kernel-java11-openj9
+Directory: ga/21.0.0.6/kernel
 Architectures: amd64, ppc64le, s390x
 Architectures: amd64, ppc64le, s390x
 File: Dockerfile.ubuntu.adoptopenjdk11
 File: Dockerfile.ubuntu.adoptopenjdk11
 
 
-Tags: 21.0.0.5-full-java8-ibmjava
-Directory: ga/21.0.0.5/full
+Tags: 21.0.0.6-full-java8-ibmjava
+Directory: ga/21.0.0.6/full
 File: Dockerfile.ubuntu.ibmjava8
 File: Dockerfile.ubuntu.ibmjava8
 
 
-Tags: 21.0.0.5-full-java11-openj9
-Directory: ga/21.0.0.5/full
+Tags: 21.0.0.6-full-java11-openj9
+Directory: ga/21.0.0.6/full
 Architectures: amd64, ppc64le, s390x
 Architectures: amd64, ppc64le, s390x
 File: Dockerfile.ubuntu.adoptopenjdk11
 File: Dockerfile.ubuntu.adoptopenjdk11
 
 
@@ -58,21 +58,3 @@ Tags: 21.0.0.3-full-java11-openj9
 Directory: ga/21.0.0.3/full
 Directory: ga/21.0.0.3/full
 Architectures: amd64, ppc64le, s390x
 Architectures: amd64, ppc64le, s390x
 File: Dockerfile.ubuntu.adoptopenjdk11
 File: Dockerfile.ubuntu.adoptopenjdk11
-
-Tags: 20.0.0.12-kernel-java8-ibmjava
-Directory: ga/20.0.0.12/kernel
-File: Dockerfile.ubuntu.ibmjava8
-
-Tags: 20.0.0.12-kernel-java11-openj9
-Directory: ga/20.0.0.12/kernel
-Architectures: amd64, ppc64le, s390x
-File: Dockerfile.ubuntu.adoptopenjdk11
-
-Tags: 20.0.0.12-full-java8-ibmjava
-Directory: ga/20.0.0.12/full
-File: Dockerfile.ubuntu.ibmjava8
-
-Tags: 20.0.0.12-full-java11-openj9
-Directory: ga/20.0.0.12/full
-Architectures: amd64, ppc64le, s390x
-File: Dockerfile.ubuntu.adoptopenjdk11