diff --git a/library/amazoncorretto b/library/amazoncorretto index 02fbe2bd2b298..1b3b6452fd30b 100644 --- a/library/amazoncorretto +++ b/library/amazoncorretto @@ -15,7 +15,7 @@ Maintainers: Amazon Corretto Team (@corretto), Satyen Subramaniam (@satyenme) GitRepo: https://github.com/corretto/corretto-docker.git GitFetch: refs/heads/main -GitCommit: a89b6d623fc76020d390f55f2e95922ec852f3dd +GitCommit: 89bc34902ac1a084562a2c6e7b02190eff3613bb Tags: 8, 8u442, 8u442-al2, 8-al2-full, 8-al2-jdk, 8-al2-generic, 8u442-al2-generic, 8-al2-generic-jdk, latest Architectures: amd64, arm64v8 @@ -53,14 +53,22 @@ Tags: 8-alpine3.19-jre, 8u442-alpine3.19-jre Architectures: amd64, arm64v8 Directory: 8/jre/alpine/3.19 -Tags: 8-alpine3.20, 8u442-alpine3.20, 8-alpine3.20-full, 8-alpine3.20-jdk, 8-alpine, 8u442-alpine, 8-alpine-full, 8-alpine-jdk +Tags: 8-alpine3.20, 8u442-alpine3.20, 8-alpine3.20-full, 8-alpine3.20-jdk Architectures: amd64, arm64v8 Directory: 8/jdk/alpine/3.20 -Tags: 8-alpine3.20-jre, 8u442-alpine3.20-jre, 8-alpine-jre, 8u442-alpine-jre +Tags: 8-alpine3.20-jre, 8u442-alpine3.20-jre Architectures: amd64, arm64v8 Directory: 8/jre/alpine/3.20 +Tags: 8-alpine3.21, 8u442-alpine3.21, 8-alpine3.21-full, 8-alpine3.21-jdk, 8-alpine, 8u442-alpine, 8-alpine-full, 8-alpine-jdk +Architectures: amd64, arm64v8 +Directory: 8/jdk/alpine/3.21 + +Tags: 8-alpine3.21-jre, 8u442-alpine3.21-jre, 8-alpine-jre, 8u442-alpine-jre +Architectures: amd64, arm64v8 +Directory: 8/jre/alpine/3.21 + Tags: 11, 11.0.26, 11.0.26-al2, 11-al2-full, 11-al2-jdk, 11-al2-generic, 11.0.26-al2-generic, 11-al2-generic-jdk Architectures: amd64, arm64v8 Directory: 11/jdk/al2-generic @@ -93,10 +101,14 @@ Tags: 11-alpine3.19, 11.0.26-alpine3.19, 11-alpine3.19-full, 11-alpine3.19-jdk Architectures: amd64, arm64v8 Directory: 11/jdk/alpine/3.19 -Tags: 11-alpine3.20, 11.0.26-alpine3.20, 11-alpine3.20-full, 11-alpine3.20-jdk, 11-alpine, 11.0.26-alpine, 11-alpine-full, 11-alpine-jdk +Tags: 11-alpine3.20, 11.0.26-alpine3.20, 11-alpine3.20-full, 11-alpine3.20-jdk Architectures: amd64, arm64v8 Directory: 11/jdk/alpine/3.20 +Tags: 11-alpine3.21, 11.0.26-alpine3.21, 11-alpine3.21-full, 11-alpine3.21-jdk, 11-alpine, 11.0.26-alpine, 11-alpine-full, 11-alpine-jdk +Architectures: amd64, arm64v8 +Directory: 11/jdk/alpine/3.21 + Tags: 17, 17.0.14, 17.0.14-al2, 17-al2-full, 17-al2-jdk, 17-al2-generic, 17.0.14-al2-generic, 17-al2-generic-jdk Architectures: amd64, arm64v8 Directory: 17/jdk/al2-generic @@ -133,10 +145,14 @@ Tags: 17-alpine3.19, 17.0.14-alpine3.19, 17-alpine3.19-full, 17-alpine3.19-jdk Architectures: amd64, arm64v8 Directory: 17/jdk/alpine/3.19 -Tags: 17-alpine3.20, 17.0.14-alpine3.20, 17-alpine3.20-full, 17-alpine3.20-jdk, 17-alpine, 17.0.14-alpine, 17-alpine-full, 17-alpine-jdk +Tags: 17-alpine3.20, 17.0.14-alpine3.20, 17-alpine3.20-full, 17-alpine3.20-jdk Architectures: amd64, arm64v8 Directory: 17/jdk/alpine/3.20 +Tags: 17-alpine3.21, 17.0.14-alpine3.21, 17-alpine3.21-full, 17-alpine3.21-jdk, 17-alpine, 17.0.14-alpine, 17-alpine-full, 17-alpine-jdk +Architectures: amd64, arm64v8 +Directory: 17/jdk/alpine/3.21 + Tags: 21, 21.0.6, 21.0.6-al2, 21-al2-full, 21-al2-jdk, 21-al2-generic, 21.0.6-al2-generic, 21-al2-generic-jdk Architectures: amd64, arm64v8 Directory: 21/jdk/al2-generic @@ -161,10 +177,14 @@ Tags: 21-alpine3.19, 21.0.6-alpine3.19, 21-alpine3.19-full, 21-alpine3.19-jdk Architectures: amd64, arm64v8 Directory: 21/jdk/alpine/3.19 -Tags: 21-alpine3.20, 21.0.6-alpine3.20, 21-alpine3.20-full, 21-alpine3.20-jdk, 21-alpine, 21.0.6-alpine, 21-alpine-full, 21-alpine-jdk +Tags: 21-alpine3.20, 21.0.6-alpine3.20, 21-alpine3.20-full, 21-alpine3.20-jdk Architectures: amd64, arm64v8 Directory: 21/jdk/alpine/3.20 +Tags: 21-alpine3.21, 21.0.6-alpine3.21, 21-alpine3.21-full, 21-alpine3.21-jdk, 21-alpine, 21.0.6-alpine, 21-alpine-full, 21-alpine-jdk +Architectures: amd64, arm64v8 +Directory: 21/jdk/alpine/3.21 + Tags: 23-al2023, 23.0.2-al2023, 23-al2023-jdk, 23, 23-jdk Architectures: amd64, arm64v8 Directory: 23/jdk/al2023 @@ -185,6 +205,10 @@ Tags: 23-alpine3.19, 23.0.2-alpine3.19, 23-alpine3.19-full, 23-alpine3.19-jdk Architectures: amd64, arm64v8 Directory: 23/jdk/alpine/3.19 -Tags: 23-alpine3.20, 23.0.2-alpine3.20, 23-alpine3.20-full, 23-alpine3.20-jdk, 23-alpine, 23.0.2-alpine, 23-alpine-full, 23-alpine-jdk +Tags: 23-alpine3.20, 23.0.2-alpine3.20, 23-alpine3.20-full, 23-alpine3.20-jdk Architectures: amd64, arm64v8 Directory: 23/jdk/alpine/3.20 + +Tags: 23-alpine3.21, 23.0.2-alpine3.21, 23-alpine3.21-full, 23-alpine3.21-jdk, 23-alpine, 23.0.2-alpine, 23-alpine-full, 23-alpine-jdk +Architectures: amd64, arm64v8 +Directory: 23/jdk/alpine/3.21 diff --git a/library/couchbase b/library/couchbase index f36d83b2970b5..5c409dac88710 100644 --- a/library/couchbase +++ b/library/couchbase @@ -1,9 +1,9 @@ Maintainers: Couchbase Docker Team (@cb-robot) GitRepo: https://github.com/couchbase/docker -Tags: 7.6.4, enterprise-7.6.4, enterprise, latest -GitCommit: 9990e2cfabc94b37607e5666d9ef1eab69a397a6 -Directory: enterprise/couchbase-server/7.6.4 +Tags: 7.6.5, enterprise-7.6.5, enterprise, latest +GitCommit: ec16abff6f0551ced6c771bd5606a4392379dd31 +Directory: enterprise/couchbase-server/7.6.5 Architectures: amd64, arm64v8 Tags: community-7.6.2, community diff --git a/library/matomo b/library/matomo index 7568958e288f6..6afcfe6494de0 100644 --- a/library/matomo +++ b/library/matomo @@ -2,17 +2,17 @@ Maintainers: Matomo Community (@matomo-org) GitRepo: https://github.com/matomo-org/docker.git -Tags: 5.2.1-apache, 5.2-apache, 5-apache, apache, 5.2.1, 5.2, 5, latest +Tags: 5.2.2-apache, 5.2-apache, 5-apache, apache, 5.2.2, 5.2, 5, latest Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x -GitCommit: b9ae2e0b9147993c98de27c30778fe42c1fe2356 +GitCommit: 5b86004ed817298de0ef29a19beece1eb891b4ec Directory: apache -Tags: 5.2.1-fpm, 5.2-fpm, 5-fpm, fpm +Tags: 5.2.2-fpm, 5.2-fpm, 5-fpm, fpm Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x -GitCommit: b9ae2e0b9147993c98de27c30778fe42c1fe2356 +GitCommit: 5b86004ed817298de0ef29a19beece1eb891b4ec Directory: fpm -Tags: 5.2.1-fpm-alpine, 5.2-fpm-alpine, 5-fpm-alpine, fpm-alpine +Tags: 5.2.2-fpm-alpine, 5.2-fpm-alpine, 5-fpm-alpine, fpm-alpine Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x -GitCommit: b9ae2e0b9147993c98de27c30778fe42c1fe2356 +GitCommit: 5b86004ed817298de0ef29a19beece1eb891b4ec Directory: fpm-alpine diff --git a/test/tests/run-java-in-container.sh b/test/tests/run-java-in-container.sh index 48d941966f9e7..ba07736d709f2 100755 --- a/test/tests/run-java-in-container.sh +++ b/test/tests/run-java-in-container.sh @@ -14,10 +14,15 @@ tryJdks=( # try progressively less specific versions to try and find something that can compile an appropriate ".class" object for use in $image (working our way out from "Java 8" because that's going to be the most compatible) "${image%%:*}:8-jdk-slim" "${image%%:*}:8-jdk" + "${image%%:*}:8" + "${image%%:*}:11-jdk-slim" + "${image%%:*}:11-jdk" + "${image%%:*}:11" "${image%%:*}:jdk-slim" "${image%%:*}:jdk" "${image%%:*}:latest" 'eclipse-temurin:8-jdk' + 'eclipse-temurin:11-jdk' ) jdk= for potentialJdk in "${tryJdks[@]}"; do