Эх сурвалжийг харах

22.0.0.6 release (#12690)

* Updates for the release of 22.0.0.6

* Remove stale versions and update commit SHA for open-liberty and websphere-liberty

* Change to main branch for open-liberty, websphere-liberty
crpotter 3 жил өмнө
parent
commit
6fd3a08e77

+ 14 - 43
library/open-liberty

@@ -1,7 +1,8 @@
 Maintainers: Chris Potter <[email protected]> (@crpotter),
              Wendy Raschke <[email protected]> (@wraschke)
 GitRepo: https://github.com/OpenLiberty/ci.docker.git
-GitCommit: 8bd87e90bc3469c3ba31bbe72283a6ca20fa6de9
+GitFetch: refs/heads/main
+GitCommit: 7c1b79af97021cd58162dc7292737b9422e68693
 Architectures: amd64, i386, ppc64le, s390x
 
 Tags: beta
@@ -49,33 +50,33 @@ Directory: releases/latest/full
 Architectures: amd64, ppc64le, s390x
 File: Dockerfile.ubuntu.openjdk17
 
-Tags: 22.0.0.5-kernel-slim-java8-openj9
-Directory: releases/22.0.0.5/kernel-slim
+Tags: 22.0.0.6-kernel-slim-java8-openj9
+Directory: releases/22.0.0.6/kernel-slim
 Architectures: amd64, ppc64le, s390x
 File: Dockerfile.ubuntu.openjdk8
 
-Tags: 22.0.0.5-kernel-slim-java11-openj9
-Directory: releases/22.0.0.5/kernel-slim
+Tags: 22.0.0.6-kernel-slim-java11-openj9
+Directory: releases/22.0.0.6/kernel-slim
 Architectures: amd64, ppc64le, s390x
 File: Dockerfile.ubuntu.openjdk11
 
-Tags: 22.0.0.5-kernel-slim-java17-openj9
-Directory: releases/22.0.0.5/kernel-slim
+Tags: 22.0.0.6-kernel-slim-java17-openj9
+Directory: releases/22.0.0.6/kernel-slim
 Architectures: amd64, ppc64le, s390x
 File: Dockerfile.ubuntu.openjdk17
 
-Tags: 22.0.0.5-full-java8-openj9
-Directory: releases/22.0.0.5/full
+Tags: 22.0.0.6-full-java8-openj9
+Directory: releases/22.0.0.6/full
 Architectures: amd64, ppc64le, s390x
 File: Dockerfile.ubuntu.openjdk8
 
-Tags: 22.0.0.5-full-java11-openj9
-Directory: releases/22.0.0.5/full
+Tags: 22.0.0.6-full-java11-openj9
+Directory: releases/22.0.0.6/full
 Architectures: amd64, ppc64le, s390x
 File: Dockerfile.ubuntu.openjdk11
 
-Tags: 22.0.0.5-full-java17-openj9
-Directory: releases/22.0.0.5/full
+Tags: 22.0.0.6-full-java17-openj9
+Directory: releases/22.0.0.6/full
 Architectures: amd64, ppc64le, s390x
 File: Dockerfile.ubuntu.openjdk17
 
@@ -108,33 +109,3 @@ Tags: 22.0.0.3-full-java17-openj9
 Directory: releases/22.0.0.3/full
 Architectures: amd64, ppc64le, s390x
 File: Dockerfile.ubuntu.openjdk17
-
-Tags: 21.0.0.12-kernel-slim-java8-openj9
-Directory: releases/21.0.0.12/kernel-slim
-Architectures: amd64, ppc64le, s390x
-File: Dockerfile.ubuntu.openjdk8
-
-Tags: 21.0.0.12-kernel-slim-java11-openj9
-Directory: releases/21.0.0.12/kernel-slim
-Architectures: amd64, ppc64le, s390x
-File: Dockerfile.ubuntu.openjdk11
-
-Tags: 21.0.0.12-kernel-slim-java17-openj9
-Directory: releases/21.0.0.12/kernel-slim
-Architectures: amd64, ppc64le, s390x
-File: Dockerfile.ubuntu.openjdk17
-
-Tags: 21.0.0.12-full-java8-openj9
-Directory: releases/21.0.0.12/full
-Architectures: amd64, ppc64le, s390x
-File: Dockerfile.ubuntu.openjdk8
-
-Tags: 21.0.0.12-full-java11-openj9
-Directory: releases/21.0.0.12/full
-Architectures: amd64, ppc64le, s390x
-File: Dockerfile.ubuntu.openjdk11
-
-Tags: 21.0.0.12-full-java17-openj9
-Directory: releases/21.0.0.12/full
-Architectures: amd64, ppc64le, s390x
-File: Dockerfile.ubuntu.openjdk17

+ 14 - 41
library/websphere-liberty

@@ -1,7 +1,8 @@
 Maintainers: Chris Potter <[email protected]> (@crpotter),
              Wendy Raschke <[email protected]> (@wraschke)
 GitRepo: https://github.com/WASdev/ci.docker.git
-GitCommit: 4066a70e3e5aaf6b10612ac42d9dccde25bd99fd
+GitFetch: refs/heads/main
+GitCommit: 4e00be6538ad7d1dc46873e9bb348bdf096eea70
 Architectures: amd64, ppc64le, s390x
 
 Tags: kernel
@@ -32,31 +33,31 @@ Directory: ga/latest/full
 Architectures: amd64, ppc64le, s390x
 File: Dockerfile.ubuntu.openjdk17
 
-Tags: 22.0.0.5-kernel-java8-ibmjava
-Directory: ga/22.0.0.5/kernel
+Tags: 22.0.0.6-kernel-java8-ibmjava
+Directory: ga/22.0.0.6/kernel
 File: Dockerfile.ubuntu.ibmjava8
 
-Tags: 22.0.0.5-kernel-java11-openj9
-Directory: ga/22.0.0.5/kernel
+Tags: 22.0.0.6-kernel-java11-openj9
+Directory: ga/22.0.0.6/kernel
 Architectures: amd64, ppc64le, s390x
 File: Dockerfile.ubuntu.openjdk11
 
-Tags: 22.0.0.5-kernel-java17-openj9
-Directory: ga/22.0.0.5/kernel
+Tags: 22.0.0.6-kernel-java17-openj9
+Directory: ga/22.0.0.6/kernel
 Architectures: amd64, ppc64le, s390x
 File: Dockerfile.ubuntu.openjdk17
 
-Tags: 22.0.0.5-full-java8-ibmjava
-Directory: ga/22.0.0.5/full
+Tags: 22.0.0.6-full-java8-ibmjava
+Directory: ga/22.0.0.6/full
 File: Dockerfile.ubuntu.ibmjava8
 
-Tags: 22.0.0.5-full-java11-openj9
-Directory: ga/22.0.0.5/full
+Tags: 22.0.0.6-full-java11-openj9
+Directory: ga/22.0.0.6/full
 Architectures: amd64, ppc64le, s390x
 File: Dockerfile.ubuntu.openjdk11
 
-Tags: 22.0.0.5-full-java17-openj9
-Directory: ga/22.0.0.5/full
+Tags: 22.0.0.6-full-java17-openj9
+Directory: ga/22.0.0.6/full
 Architectures: amd64, ppc64le, s390x
 File: Dockerfile.ubuntu.openjdk17
 
@@ -87,31 +88,3 @@ Tags: 22.0.0.3-full-java17-openj9
 Directory: ga/22.0.0.3/full
 Architectures: amd64, ppc64le, s390x
 File: Dockerfile.ubuntu.openjdk17
-
-Tags: 21.0.0.12-kernel-java8-ibmjava
-Directory: ga/21.0.0.12/kernel
-File: Dockerfile.ubuntu.ibmjava8
-
-Tags: 21.0.0.12-kernel-java11-openj9
-Directory: ga/21.0.0.12/kernel
-Architectures: amd64, ppc64le, s390x
-File: Dockerfile.ubuntu.openjdk11
-
-Tags: 21.0.0.12-kernel-java17-openj9
-Directory: ga/21.0.0.12/kernel
-Architectures: amd64, ppc64le, s390x
-File: Dockerfile.ubuntu.openjdk17
-
-Tags: 21.0.0.12-full-java8-ibmjava
-Directory: ga/21.0.0.12/full
-File: Dockerfile.ubuntu.ibmjava8
-
-Tags: 21.0.0.12-full-java11-openj9
-Directory: ga/21.0.0.12/full
-Architectures: amd64, ppc64le, s390x
-File: Dockerfile.ubuntu.openjdk11
-
-Tags: 21.0.0.12-full-java17-openj9
-Directory: ga/21.0.0.12/full
-Architectures: amd64, ppc64le, s390x
-File: Dockerfile.ubuntu.openjdk17