Browse Source

Updates for Liberty 25.0.0.6 release (#19283)

* Updates for Liberty 25.0.0.6 release

* Correct Open Liberty commit hash

* Restore accidentally deleted info for 25.0.0.3-kernel-java8-ibmjava
Wendy Raschke 5 months ago
parent
commit
5272daff82
2 changed files with 26 additions and 84 deletions
  1. 13 43
      library/open-liberty
  2. 13 41
      library/websphere-liberty

+ 13 - 43
library/open-liberty

@@ -4,7 +4,7 @@ Maintainers: Gkerta Seferi <[email protected]> (@gkertasef),
              Wendy Raschke <[email protected]> (@wraschke)
 GitRepo: https://github.com/OpenLiberty/ci.docker.git
 GitFetch: refs/heads/main
-GitCommit: 099ba0885486a8cc480d64cbffdd86e65ef41ad8
+GitCommit: 8ab01f34341661854ed9c0db48f272fd2c053883
 Architectures: amd64, i386, ppc64le, s390x
 
 Tags: beta
@@ -52,36 +52,6 @@ Directory: releases/latest/full
 Architectures: amd64, arm64v8, ppc64le, s390x
 File: Dockerfile.ubuntu.openjdk17
 
-Tags: 24.0.0.12-kernel-slim-java8-openj9
-Directory: releases/24.0.0.12/kernel-slim
-Architectures: amd64, arm64v8, ppc64le, s390x
-File: Dockerfile.ubuntu.openjdk8
-
-Tags: 24.0.0.12-kernel-slim-java11-openj9
-Directory: releases/24.0.0.12/kernel-slim
-Architectures: amd64, arm64v8, ppc64le, s390x
-File: Dockerfile.ubuntu.openjdk11
-
-Tags: 24.0.0.12-kernel-slim-java17-openj9
-Directory: releases/24.0.0.12/kernel-slim
-Architectures: amd64, arm64v8, ppc64le, s390x
-File: Dockerfile.ubuntu.openjdk17
-
-Tags: 24.0.0.12-full-java8-openj9
-Directory: releases/24.0.0.12/full
-Architectures: amd64, arm64v8, ppc64le, s390x
-File: Dockerfile.ubuntu.openjdk8
-
-Tags: 24.0.0.12-full-java11-openj9
-Directory: releases/24.0.0.12/full
-Architectures: amd64, arm64v8, ppc64le, s390x
-File: Dockerfile.ubuntu.openjdk11
-
-Tags: 24.0.0.12-full-java17-openj9
-Directory: releases/24.0.0.12/full
-Architectures: amd64, arm64v8, ppc64le, s390x
-File: Dockerfile.ubuntu.openjdk17
-
 Tags: 25.0.0.3-kernel-slim-java8-openj9
 Directory: releases/25.0.0.3/kernel-slim
 Architectures: amd64, arm64v8, ppc64le, s390x
@@ -112,32 +82,32 @@ Directory: releases/25.0.0.3/full
 Architectures: amd64, arm64v8, ppc64le, s390x
 File: Dockerfile.ubuntu.openjdk17
 
-Tags: 25.0.0.5-kernel-slim-java8-openj9
-Directory: releases/25.0.0.5/kernel-slim
+Tags: 25.0.0.6-kernel-slim-java8-openj9
+Directory: releases/25.0.0.6/kernel-slim
 Architectures: amd64, arm64v8, ppc64le, s390x
 File: Dockerfile.ubuntu.openjdk8
 
-Tags: 25.0.0.5-kernel-slim-java11-openj9
-Directory: releases/25.0.0.5/kernel-slim
+Tags: 25.0.0.6-kernel-slim-java11-openj9
+Directory: releases/25.0.0.6/kernel-slim
 Architectures: amd64, arm64v8, ppc64le, s390x
 File: Dockerfile.ubuntu.openjdk11
 
-Tags: 25.0.0.5-kernel-slim-java17-openj9
-Directory: releases/25.0.0.5/kernel-slim
+Tags: 25.0.0.6-kernel-slim-java17-openj9
+Directory: releases/25.0.0.6/kernel-slim
 Architectures: amd64, arm64v8, ppc64le, s390x
 File: Dockerfile.ubuntu.openjdk17
 
-Tags: 25.0.0.5-full-java8-openj9
-Directory: releases/25.0.0.5/full
+Tags: 25.0.0.6-full-java8-openj9
+Directory: releases/25.0.0.6/full
 Architectures: amd64, arm64v8, ppc64le, s390x
 File: Dockerfile.ubuntu.openjdk8
 
-Tags: 25.0.0.5-full-java11-openj9
-Directory: releases/25.0.0.5/full
+Tags: 25.0.0.6-full-java11-openj9
+Directory: releases/25.0.0.6/full
 Architectures: amd64, arm64v8, ppc64le, s390x
 File: Dockerfile.ubuntu.openjdk11
 
-Tags: 25.0.0.5-full-java17-openj9
-Directory: releases/25.0.0.5/full
+Tags: 25.0.0.6-full-java17-openj9
+Directory: releases/25.0.0.6/full
 Architectures: amd64, arm64v8, ppc64le, s390x
 File: Dockerfile.ubuntu.openjdk17

+ 13 - 41
library/websphere-liberty

@@ -4,7 +4,7 @@ Maintainers: Gkerta Seferi <[email protected]> (@gkertasef),
              Wendy Raschke <[email protected]> (@wraschke)
 GitRepo: https://github.com/WASdev/ci.docker.git
 GitFetch: refs/heads/main
-GitCommit: c8dd82b972ab08fb1b63f65eff1e3681e58c3843
+GitCommit: 923e41779be731923cac0f6bb2d3c2f737eedd17
 Architectures: amd64, ppc64le, s390x
 
 Tags: kernel, kernel-java8-ibmjava
@@ -35,34 +35,6 @@ Directory: ga/latest/full
 Architectures: amd64, arm64v8, ppc64le, s390x
 File: Dockerfile.ubuntu.openjdk17
 
-Tags: 24.0.0.12-kernel-java8-ibmjava
-Directory: ga/24.0.0.12/kernel
-File: Dockerfile.ubuntu.ibmjava8
-
-Tags: 24.0.0.12-kernel-java11-openj9
-Directory: ga/24.0.0.12/kernel
-Architectures: amd64, arm64v8, ppc64le, s390x
-File: Dockerfile.ubuntu.openjdk11
-
-Tags: 24.0.0.12-kernel-java17-openj9
-Directory: ga/24.0.0.12/kernel
-Architectures: amd64, arm64v8, ppc64le, s390x
-File: Dockerfile.ubuntu.openjdk17
-
-Tags: 24.0.0.12-full-java8-ibmjava
-Directory: ga/24.0.0.12/full
-File: Dockerfile.ubuntu.ibmjava8
-
-Tags: 24.0.0.12-full-java11-openj9
-Directory: ga/24.0.0.12/full
-Architectures: amd64, arm64v8, ppc64le, s390x
-File: Dockerfile.ubuntu.openjdk11
-
-Tags: 24.0.0.12-full-java17-openj9
-Directory: ga/24.0.0.12/full
-Architectures: amd64, arm64v8, ppc64le, s390x
-File: Dockerfile.ubuntu.openjdk17
-
 Tags: 25.0.0.3-kernel-java8-ibmjava
 Directory: ga/25.0.0.3/kernel
 File: Dockerfile.ubuntu.ibmjava8
@@ -91,30 +63,30 @@ Directory: ga/25.0.0.3/full
 Architectures: amd64, arm64v8, ppc64le, s390x
 File: Dockerfile.ubuntu.openjdk17
 
-Tags: 25.0.0.5-kernel-java8-ibmjava
-Directory: ga/25.0.0.5/kernel
+Tags: 25.0.0.6-kernel-java8-ibmjava
+Directory: ga/25.0.0.6/kernel
 File: Dockerfile.ubuntu.ibmjava8
 
-Tags: 25.0.0.5-kernel-java11-openj9
-Directory: ga/25.0.0.5/kernel
+Tags: 25.0.0.6-kernel-java11-openj9
+Directory: ga/25.0.0.6/kernel
 Architectures: amd64, arm64v8, ppc64le, s390x
 File: Dockerfile.ubuntu.openjdk11
 
-Tags: 25.0.0.5-kernel-java17-openj9
-Directory: ga/25.0.0.5/kernel
+Tags: 25.0.0.6-kernel-java17-openj9
+Directory: ga/25.0.0.6/kernel
 Architectures: amd64, arm64v8, ppc64le, s390x
 File: Dockerfile.ubuntu.openjdk17
 
-Tags: 25.0.0.5-full-java8-ibmjava
-Directory: ga/25.0.0.5/full
+Tags: 25.0.0.6-full-java8-ibmjava
+Directory: ga/25.0.0.6/full
 File: Dockerfile.ubuntu.ibmjava8
 
-Tags: 25.0.0.5-full-java11-openj9
-Directory: ga/25.0.0.5/full
+Tags: 25.0.0.6-full-java11-openj9
+Directory: ga/25.0.0.6/full
 Architectures: amd64, arm64v8, ppc64le, s390x
 File: Dockerfile.ubuntu.openjdk11
 
-Tags: 25.0.0.5-full-java17-openj9
-Directory: ga/25.0.0.5/full
+Tags: 25.0.0.6-full-java17-openj9
+Directory: ga/25.0.0.6/full
 Architectures: amd64, arm64v8, ppc64le, s390x
 File: Dockerfile.ubuntu.openjdk17