Selaa lähdekoodia

Switch to Temurin base image and replace Java 16 with 17

Keegan Witt 4 vuotta sitten
vanhempi
sitoutus
f95868fdc5
2 muutettua tiedostoa jossa 37 lisäystä ja 150 poistoa
  1. 22 102
      library/gradle
  2. 15 48
      library/groovy

+ 22 - 102
library/gradle

@@ -1,121 +1,41 @@
 Maintainers: Keegan Witt <[email protected]> (@keeganwitt)
 GitRepo: https://github.com/keeganwitt/docker-gradle.git
 
-# Hotspot
 
-Tags: 7.2.0-jdk8, 7.2.0-jdk8-hotspot, 7.2-jdk8, 7.2-jdk8-hotspot, 7-jdk8, 7-jdk8-hotspot, jdk8, jdk8-hotspot, 7.2.0-jdk, 7.2.0-jdk-hotspot, 7.2-jdk, 7.2-jdk-hotspot, 7-jdk, 7-jdk-hotspot, jdk, jdk-hotspot, 7.2.0, 7.2.0-hotspot, 7.2, 7.2-hotspot, 7, 7-hotspot, latest, hotspot
-Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 314183716a384cb67c3dfd8e7a35c06aa0ab472e
-Directory: hotspot/jdk8
-
-Tags: 7.2.0-jre8, 7.2.0-jre8-hotspot, 7.2-jre8, 7.2-jre8-hotspot, 7-jre8, 7-jre8-hotspot, jre8, jre8-hotspot, 7.2.0-jre, 7.2.0-jre-hotspot, 7.2-jre, 7.2-jre-hotspot, 7-jre, 7-jre-hotspot, jre, jre-hotspot
-Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 314183716a384cb67c3dfd8e7a35c06aa0ab472e
-Directory: hotspot/jre8
+# Gradle 7.x
 
-Tags: 7.2.0-jdk11, 7.2.0-jdk11-hotspot, 7.2-jdk11, 7.2-jdk11-hotspot, 7-jdk11, 7-jdk11-hotspot, jdk11, jdk11-hotspot
-Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 314183716a384cb67c3dfd8e7a35c06aa0ab472e
-Directory: hotspot/jdk11
+Tags: 7.2.0-jdk8, 7.2-jdk8, 7-jdk8, jdk8
+Architectures: amd64, arm32v7, arm64v8, ppc64le
+GitCommit: 12de35caaf73bc28651fa6fa00c7dd4078695de9
+Directory: jdk8
 
-Tags: 7.2.0-jre11, 7.2.0-jre11-hotspot, 7.2-jre11, 7.2-jre11-hotspot, 7-jre11, 7-jre11-hotspot, jre11, jre11-hotspot
+Tags: 7.2.0-jdk11, 7.2-jdk11, 7-jdk11, jdk11
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 314183716a384cb67c3dfd8e7a35c06aa0ab472e
-Directory: hotspot/jre11
+GitCommit: 12de35caaf73bc28651fa6fa00c7dd4078695de9
+Directory: jdk11
 
-Tags: 7.2.0-jdk16, 7.2.0-jdk16-hotspot, 7.2-jdk16, 7.2-jdk16-hotspot, 7-jdk16, 7-jdk16-hotspot, jdk16, jdk16-hotspot
+Tags: 7.2.0-jdk17, 7.2-jdk17, 7-jdk17, jdk17, 7.2.0-jdk, 7.2-jdk, 7-jdk, jdk, 7.2.0, 7.2, 7, latest
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 314183716a384cb67c3dfd8e7a35c06aa0ab472e
-Directory: hotspot/jdk16
-
-Tags: 7.2.0-jre16, 7.2.0-jre16-hotspot, 7.2-jre16, 7.2-jre16-hotspot, 7-jre16, 7-jre16-hotspot, jre16, jre16-hotspot
-Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 314183716a384cb67c3dfd8e7a35c06aa0ab472e
-Directory: hotspot/jre16
-
-
-# OpenJ9
-
-Tags: 7.2.0-jdk8-openj9, 7.2-jdk8-openj9, 7-jdk8-openj9, jdk8-openj9, 7.2.0-jdk-openj9, 7.2-jdk-openj9, 7-jdk-openj9, jdk-openj9, 7.2.0-openj9, 7.2-openj9, 7-openj9, openj9
-Architectures: amd64, arm64v8, ppc64le, s390x
-GitCommit: 314183716a384cb67c3dfd8e7a35c06aa0ab472e
-Directory: openj9/jdk8
-
-Tags: 7.2.0-jre8-openj9, 7.2-jre8-openj9, 7-jre8-openj9, jre8-openj9, 7.2.0-jre-openj9, 7.2-jre-openj9, 7-jre-openj9, jre-openj9
-Architectures: amd64, arm64v8, ppc64le, s390x
-GitCommit: 314183716a384cb67c3dfd8e7a35c06aa0ab472e
-Directory: openj9/jre8
-
-Tags: 7.2.0-jdk11-openj9, 7.2-jdk11-openj9, 7-jdk11-openj9, jdk11-openj9
-Architectures: amd64, arm64v8, ppc64le, s390x
-GitCommit: 314183716a384cb67c3dfd8e7a35c06aa0ab472e
-Directory: openj9/jdk11
-
-Tags: 7.2.0-jre11-openj9, 7.2-jre11-openj9, 7-jre11-openj9, jre11-openj9
-Architectures: amd64, arm64v8, ppc64le, s390x
-GitCommit: 314183716a384cb67c3dfd8e7a35c06aa0ab472e
-Directory: openj9/jre11
-
-Tags: 7.2.0-jdk16-openj9, 7.2-jdk16-openj9, 7-jdk16-openj9, jdk16-openj9
-Architectures: amd64, arm64v8, ppc64le, s390x
-GitCommit: 314183716a384cb67c3dfd8e7a35c06aa0ab472e
-Directory: openj9/jdk16
-
-Tags: 7.2.0-jre16-openj9, 7.2-jre16-openj9, 7-jre16-openj9, jre16-openj9
-Architectures: amd64, arm64v8, ppc64le, s390x
-GitCommit: 314183716a384cb67c3dfd8e7a35c06aa0ab472e
-Directory: openj9/jre16
+GitCommit: 12de35caaf73bc28651fa6fa00c7dd4078695de9
+Directory: jdk17
 
 
-# Gradle 6.x Hotspot
+# Gradle 6.x
 
-Tags: 6.9.1-jdk8, 6.9.1-jdk8-hotspot, 6.9-jdk8, 6.9-jdk8-hotspot, 6-jdk8, 6-jdk8-hotspot, 6.9.1-jdk, 6.9.1-jdk-hotspot, 6.9-jdk, 6.9-jdk-hotspot, 6-jdk, 6-jdk-hotspot, 6.9.1, 6.9.1-hotspot, 6.9, 6.9-hotspot, 6, 6-hotspot
+Tags: 6.9.1-jdk8, 6.9-jdk8, 6-jdk8
 GitFetch: refs/heads/6
-Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 808c1e65276284d6f065488c4b4b81027341dcb8
-Directory: hotspot/jdk8
-
-Tags: 6.9.1-jre8, 6.9.1-jre8-hotspot, 6.9-jre8, 6.9-jre8-hotspot, 6-jre8, 6-jre8-hotspot, 6.9.1-jre, 6.9.1-jre-hotspot, 6.9-jre, 6.9-jre-hotspot, 6-jre, 6-jre-hotspot
-GitFetch: refs/heads/6
-Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 808c1e65276284d6f065488c4b4b81027341dcb8
-Directory: hotspot/jre8
+Architectures: amd64, arm32v7, arm64v8, ppc64le
+GitCommit: c1589fa3ca8eca327c505c1a088902e83cac9b3e
+Directory: jdk8
 
-Tags: 6.9.1-jdk11, 6.9.1-jdk11-hotspot, 6.9-jdk11, 6.9-jdk11-hotspot, 6-jdk11, 6-jdk11-hotspot
+Tags: 6.9.1-jdk11, 6.9-jdk11, 6-jdk11
 GitFetch: refs/heads/6
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 808c1e65276284d6f065488c4b4b81027341dcb8
-Directory: hotspot/jdk11
+GitCommit: c1589fa3ca8eca327c505c1a088902e83cac9b3e
+Directory: jdk11
 
-Tags: 6.9.1-jre11, 6.9.1-jre11-hotspot, 6.9-jre11, 6.9-jre11-hotspot, 6-jre11, 6-jre11-hotspot
+Tags: 6.9.1-jdk17, 6.9-jdk17, 6-jdk17, 6.9.1-jdk, 6.9-jdk, 6-jdk, 6.9.1, 6.9, 6
 GitFetch: refs/heads/6
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 808c1e65276284d6f065488c4b4b81027341dcb8
-Directory: hotspot/jre11
-
-
-# Gradle 6.x OpenJ9
-
-Tags: 6.9.1-jdk8-openj9, 6.9-jdk8-openj9, 6-jdk8-openj9, 6.9.1-jdk-openj9, 6.9-jdk-openj9, 6-jdk-openj9, 6.9.1-openj9, 6.9-openj9, 6-openj9
-GitFetch: refs/heads/6
-Architectures: amd64, arm64v8, ppc64le, s390x
-GitCommit: 808c1e65276284d6f065488c4b4b81027341dcb8
-Directory: openj9/jdk8
-
-Tags: 6.9.1-jre8-openj9, 6.9-jre8-openj9, 6-jre8-openj9, 6.9.1-jre-openj9, 6.9-jre-openj9, 6-jre-openj9
-GitFetch: refs/heads/6
-Architectures: amd64, arm64v8, ppc64le, s390x
-GitCommit: 808c1e65276284d6f065488c4b4b81027341dcb8
-Directory: openj9/jre8
-
-Tags: 6.9.1-jdk11-openj9, 6.9-jdk11-openj9, 6-jdk11-openj9
-GitFetch: refs/heads/6
-Architectures: amd64, arm64v8, ppc64le, s390x
-GitCommit: 808c1e65276284d6f065488c4b4b81027341dcb8
-Directory: openj9/jdk11
-
-Tags: 6.9.1-jre11-openj9, 6.9-jre11-openj9, 6-jre11-openj9
-GitFetch: refs/heads/6
-Architectures: amd64, arm64v8, ppc64le, s390x
-GitCommit: 808c1e65276284d6f065488c4b4b81027341dcb8
-Directory: openj9/jre11
+GitCommit: c1589fa3ca8eca327c505c1a088902e83cac9b3e
+Directory: jdk17

+ 15 - 48
library/groovy

@@ -4,71 +4,38 @@ GitRepo: https://github.com/groovy/docker-groovy.git
 
 # Groovy 3
 
-Tags: 3.0.9-jdk8, 3.0-jdk8, 3.0.9-jdk, 3.0-jdk, jdk8, jdk
-Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 400c5ce5baad6936a4fa3f6a52400345acb0dd9d
+Tags: 3.0.9-jdk8, 3.0-jdk8, jdk8
+Architectures: amd64, arm32v7, arm64v8, ppc64le
+GitCommit: e46b8fbd268e1b4559178b87358aac7385f694d2
 Directory: jdk8
 
-Tags: 3.0.9-jre8, 3.0-jre8, 3.0.9-jre, 3.0-jre, 3.0.9, 3.0, jre8, jre, latest
-Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 400c5ce5baad6936a4fa3f6a52400345acb0dd9d
-Directory: jre8
-
 Tags: 3.0.9-jdk11, 3.0-jdk11, jdk11
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 400c5ce5baad6936a4fa3f6a52400345acb0dd9d
+GitCommit: e46b8fbd268e1b4559178b87358aac7385f694d2
 Directory: jdk11
 
-Tags: 3.0.9-jre11, 3.0-jre11, jre11
+Tags: 3.0.9-jdk17, 3.0-jdk17, jdk17, 3.0.9-jdk, 3.0-jdk, 3.0.9, 3.0, 3, jdk, latest
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 400c5ce5baad6936a4fa3f6a52400345acb0dd9d
-Directory: jre11
-
-Tags: 3.0.9-jdk16, 3.0-jdk16, jdk16
-Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 400c5ce5baad6936a4fa3f6a52400345acb0dd9d
-Directory: jdk16
-
-Tags: 3.0.9-jre16, 3.0-jre16, jre16
-Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 400c5ce5baad6936a4fa3f6a52400345acb0dd9d
-Directory: jre16
+GitCommit: e46b8fbd268e1b4559178b87358aac7385f694d2
+Directory: jdk17
 
 
 # Groovy 4
 
-Tags: 4.0.0-beta-1-jdk8, 4.0-jdk8, 4.0.0-beta-1-jdk, 4.0-jdk
+Tags: 4.0.0-beta-1-jdk8, 4.0.0-jdk8, 4.0-jdk8
 GitFetch: refs/heads/4.0
-Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 368212f8ca90051f5542f9d64523e22bc8130a66
+Architectures: amd64, arm32v7, arm64v8, ppc64le
+GitCommit: 86f6ece313350fad2a27d2ce89e127804bb098f6
 Directory: jdk8
 
-Tags: 4.0.0-beta-1-jre8, 4.0-jre8, 4.0.0-beta-1-jre, 4.0-jre, 4.0.0-beta-1, 4.0
+Tags: 4.0.0-beta-1-jdk11, 4.0.0-jdk11, 4.0-jdk11
 GitFetch: refs/heads/4.0
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 368212f8ca90051f5542f9d64523e22bc8130a66
-Directory: jre8
-
-Tags: 4.0.0-beta-1-jdk11, 4.0-jdk11
-GitFetch: refs/heads/4.0
-Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 368212f8ca90051f5542f9d64523e22bc8130a66
+GitCommit: 86f6ece313350fad2a27d2ce89e127804bb098f6
 Directory: jdk11
 
-Tags: 4.0.0-beta-1-jre11, 4.0-jre11
-GitFetch: refs/heads/4.0
-Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 368212f8ca90051f5542f9d64523e22bc8130a66
-Directory: jre11
-
-Tags: 4.0.0-beta-1-jdk16, 4.0-jdk16
-GitFetch: refs/heads/4.0
-Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 368212f8ca90051f5542f9d64523e22bc8130a66
-Directory: jdk16
-
-Tags: 4.0.0-beta-1-jre16, 4.0-jre16
+Tags: 4.0.0-beta-1-jdk17, 4.0.0-jdk17, 4.0-jdk17, 4.0.0-beta-1-jdk, 4.0.0-jdk, 4.0.0-beta-1, 4.0.0, 4.0, 4
 GitFetch: refs/heads/4.0
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 368212f8ca90051f5542f9d64523e22bc8130a66
-Directory: jre16
+GitCommit: 86f6ece313350fad2a27d2ce89e127804bb098f6
+Directory: jdk17