Merge pull request #372 from gradle/cobexer/gradle-9-2-1

cobexer · web-flow · commit a5f13d37ce71 · 2025-11-14T16:55:13.000+01:00
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -30,13 +30,15 @@ jobs:
           - jdk17-noble
           - jdk17-alpine
           - jdk17-corretto
+          - jdk17-ubi10
           - jdk17-ubi9
           - jdk17-jammy-graal
           - jdk17-noble-graal
           - jdk21-jammy
           - jdk21-noble
           - jdk21-alpine
           - jdk21-corretto
+          - jdk21-ubi10
           - jdk21-ubi9
           - jdk21-jammy-graal
           - jdk21-noble-graal
diff --git a/README.md b/README.md
@@ -13,8 +13,8 @@ Maintained by the [Gradle team](https://github.com/gradle/docker-gradle) as an [
 
 - **JDK 8** → [`jdk8`, `jdk8-jammy`](https://github.com/gradle/docker-gradle/blob/8/jdk8-jammy/Dockerfile), [`jdk8-corretto`](https://github.com/gradle/docker-gradle/blob/8/jdk8-corretto/Dockerfile), [`jdk8-ubi9`](https://github.com/gradle/docker-gradle/tree/8/jdk8-ubi9/Dockerfile)
 - **JDK 11** → [`jdk11`, `jdk11-noble`](https://github.com/gradle/docker-gradle/tree/8/jdk11-noble/Dockerfile), [`jdk11-jammy`](https://github.com/gradle/docker-gradle/tree/8/jdk11-jammy/Dockerfile), [`jdk11-alpine`](https://github.com/gradle/docker-gradle/tree/8/jdk11-alpine/Dockerfile), [`jdk11-corretto`](https://github.com/gradle/docker-gradle/tree/8/jdk11-corretto/Dockerfile), [`jdk11-ubi9`](https://github.com/gradle/docker-gradle/tree/8/jdk11-ubi9/Dockerfile)
-- **JDK 17** → [`jdk17`, `jdk17-noble`](jdk17-noble/Dockerfile), [`jdk17-jammy`](jdk17-jammy/Dockerfile), [`jdk17-alpine`](jdk17-alpine/Dockerfile), [`jdk17-corretto`](jdk17-corretto/Dockerfile), [`jdk17-ubi9`](jdk17-ubi9/Dockerfile), [`jdk17-noble-graal`](jdk17-noble-graal/Dockerfile)
-- **JDK 21** → [`jdk21`, `jdk21-noble`](jdk21-noble/Dockerfile), [`jdk21-jammy`](jdk21-jammy/Dockerfile), [`jdk21-alpine`](jdk21-alpine/Dockerfile), [`jdk21-corretto`](jdk21-corretto/Dockerfile), [`jdk21-ubi9`](jdk21-ubi9/Dockerfile), [`jdk21-graal`](jdk21-noble-graal/Dockerfile)
+- **JDK 17** → [`jdk17`, `jdk17-noble`](jdk17-noble/Dockerfile), [`jdk17-jammy`](jdk17-jammy/Dockerfile), [`jdk17-alpine`](jdk17-alpine/Dockerfile), [`jdk17-corretto`](jdk17-corretto/Dockerfile), [`jdk17-ubi10`](jdk17-ubi10/Dockerfile), [`jdk17-ubi9`](jdk17-ubi9/Dockerfile), [`jdk17-noble-graal`](jdk17-noble-graal/Dockerfile)
+- **JDK 21** → [`jdk21`, `jdk21-noble`](jdk21-noble/Dockerfile), [`jdk21-jammy`](jdk21-jammy/Dockerfile), [`jdk21-alpine`](jdk21-alpine/Dockerfile), [`jdk21-corretto`](jdk21-corretto/Dockerfile), [`jdk21-ubi10`](jdk21-ubi10/Dockerfile), [`jdk21-ubi9`](jdk21-ubi9/Dockerfile), [`jdk21-graal`](jdk21-noble-graal/Dockerfile)
 - **JDK 25 (LTS)** → [`jdk25`, `jdk25-noble`, `latest`](jdk25-noble/Dockerfile), [`jdk25-alpine`, `alpine`](jdk25-alpine/Dockerfile), [`jdk25-corretto`, `corretto`](jdk25-corretto/Dockerfile), [`jdk25-ubi10`, `ubi`](jdk25-ubi10/Dockerfile), [`jdk25-graal`, `graal`](jdk25-noble-graal/Dockerfile)
 
 See all tags on [Docker Hub](https://hub.docker.com/_/gradle/tags).
diff --git a/jdk-lts-and-current-alpine/Dockerfile b/jdk-lts-and-current-alpine/Dockerfile
@@ -84,6 +84,6 @@ USER gradle
 
 RUN set -o errexit -o nounset \
     && echo "Testing Gradle installation" \
-    && gradle --version
+    && gradle --stacktrace --debug --version
 
 USER root
diff --git a/jdk-lts-and-current-corretto/Dockerfile b/jdk-lts-and-current-corretto/Dockerfile
@@ -83,7 +83,12 @@ RUN set -o errexit -o nounset \
     && unzip gradle.zip \
     && rm gradle.zip \
     && mv "gradle-${GRADLE_VERSION}" "${GRADLE_HOME}/" \
-    && ln --symbolic "${GRADLE_HOME}/bin/gradle" /usr/bin/gradle \
-    \
+    && ln --symbolic "${GRADLE_HOME}/bin/gradle" /usr/bin/gradle
+
+USER gradle
+
+RUN set -o errexit -o nounset \
     && echo "Testing Gradle installation" \
-    && gradle --version
+    && gradle --stacktrace --debug --version
+
+USER root
diff --git a/jdk-lts-and-current-graal/Dockerfile b/jdk-lts-and-current-graal/Dockerfile
@@ -154,10 +154,12 @@ RUN set -o errexit -o nounset \
     && unzip gradle.zip \
     && rm gradle.zip \
     && mv "gradle-${GRADLE_VERSION}" "${GRADLE_HOME}/" \
-    && ln --symbolic "${GRADLE_HOME}/bin/gradle" /usr/bin/gradle \
-    \
+    && ln --symbolic "${GRADLE_HOME}/bin/gradle" /usr/bin/gradle
+
+USER gradle
+
+RUN set -o errexit -o nounset \
     && echo "Testing Gradle installation" \
-    && gradle --version \
-    \
-    # chown last so that it applies to /home/gradle/.gradle/native
-    && chown --recursive gradle:gradle /home/gradle
+    && gradle --stacktrace --debug --version
+
+USER root
diff --git a/jdk-lts-and-current/Dockerfile b/jdk-lts-and-current/Dockerfile
@@ -87,7 +87,12 @@ RUN set -o errexit -o nounset \
     && unzip gradle.zip \
     && rm gradle.zip \
     && mv "gradle-${GRADLE_VERSION}" "${GRADLE_HOME}/" \
-    && ln --symbolic "${GRADLE_HOME}/bin/gradle" /usr/bin/gradle \
-    \
+    && ln --symbolic "${GRADLE_HOME}/bin/gradle" /usr/bin/gradle
+
+USER gradle
+
+RUN set -o errexit -o nounset \
     && echo "Testing Gradle installation" \
-    && gradle --version
+    && gradle --stacktrace --debug --version
+
+USER root
diff --git a/jdk17-alpine/Dockerfile b/jdk17-alpine/Dockerfile
@@ -73,6 +73,6 @@ USER gradle
 
 RUN set -o errexit -o nounset \
     && echo "Testing Gradle installation" \
-    && gradle --version
+    && gradle --stacktrace --debug --version
 
 USER root
diff --git a/jdk17-corretto/Dockerfile b/jdk17-corretto/Dockerfile
@@ -79,6 +79,6 @@ USER gradle
 
 RUN set -o errexit -o nounset \
     && echo "Testing Gradle installation" \
-    && gradle --version
+    && gradle --stacktrace --debug --version
 
 USER root
diff --git a/jdk17-jammy-graal/Dockerfile b/jdk17-jammy-graal/Dockerfile
@@ -127,6 +127,6 @@ USER gradle
 
 RUN set -o errexit -o nounset \
     && echo "Testing Gradle installation" \
-    && gradle --version
+    && gradle --stacktrace --debug --version
 
 USER root
diff --git a/jdk17-jammy/Dockerfile b/jdk17-jammy/Dockerfile
@@ -78,6 +78,6 @@ USER gradle
 
 RUN set -o errexit -o nounset \
     && echo "Testing Gradle installation" \
-    && gradle --version
+    && gradle --stacktrace --debug --version
 
 USER root
diff --git a/jdk17-noble-graal/Dockerfile b/jdk17-noble-graal/Dockerfile
@@ -129,6 +129,6 @@ USER gradle
 
 RUN set -o errexit -o nounset \
     && echo "Testing Gradle installation" \
-    && gradle --version
+    && gradle --stacktrace --debug --version
 
 USER root
diff --git a/jdk17-noble/Dockerfile b/jdk17-noble/Dockerfile
@@ -81,6 +81,6 @@ USER gradle
 
 RUN set -o errexit -o nounset \
     && echo "Testing Gradle installation" \
-    && gradle --version
+    && gradle --stacktrace --debug --version
 
 USER root
diff --git a/jdk17-ubi10/Dockerfile b/jdk17-ubi10/Dockerfile
@@ -0,0 +1,82 @@
+FROM eclipse-temurin:17-jdk-ubi10-minimal
+
+CMD ["gradle"]
+
+ENV GRADLE_HOME=/opt/gradle
+
+RUN set -o errexit -o nounset \
+    && echo "Adding gradle user and group" \
+    && groupadd --system --gid 101 gradle \
+    && useradd --system --gid gradle --uid 101 --shell /bin/bash --create-home gradle \
+    && mkdir /home/gradle/.gradle \
+    && chown --recursive gradle:gradle /home/gradle \
+    && chmod --recursive o+rwx /home/gradle \
+    \
+    && echo "Symlinking root Gradle cache to gradle Gradle cache" \
+    && ln --symbolic /home/gradle/.gradle /root/.gradle
+
+VOLUME /home/gradle/.gradle
+
+WORKDIR /home/gradle
+
+RUN set -o errexit -o nounset \
+    && microdnf install -y \
+        # common utilities
+        make \
+        curl-minimal \
+        wget \
+        tar \
+        \
+        # Gradle dependencies
+        findutils \
+        \
+        # Dockerfile dependencies
+        unzip \
+        which \
+        \
+        # VCS dependencies
+        git \
+        git-lfs \
+        subversion \
+    && microdnf clean all \
+    \
+    && echo "Testing common utilities" \
+    && which awk \
+    && which curl \
+    && which cut \
+    && which grep \
+    && which gunzip \
+    && which sha256sum \
+    && which sed \
+    && which tar \
+    && which tr \
+    && which unzip \
+    && which wget \
+    \
+    && echo "Testing VCSes" \
+    && which git \
+    && which git-lfs \
+    && which svn
+
+ENV GRADLE_VERSION=9.2.0
+ARG GRADLE_DOWNLOAD_SHA256=df67a32e86e3276d011735facb1535f64d0d88df84fa87521e90becc2d735444
+RUN set -o errexit -o nounset \
+    && echo "Downloading Gradle" \
+    && wget --no-verbose --output-document=gradle.zip "https://services.gradle.org/distributions/gradle-${GRADLE_VERSION}-bin.zip" \
+    \
+    && echo "Checking Gradle download hash" \
+    && echo "${GRADLE_DOWNLOAD_SHA256} *gradle.zip" | sha256sum --check - \
+    \
+    && echo "Installing Gradle" \
+    && unzip -DD gradle.zip \
+    && rm gradle.zip \
+    && mv "gradle-${GRADLE_VERSION}" "${GRADLE_HOME}/" \
+    && ln --symbolic "${GRADLE_HOME}/bin/gradle" /usr/bin/gradle
+
+USER gradle
+
+RUN set -o errexit -o nounset \
+    && echo "Testing Gradle installation" \
+    && gradle --stacktrace --debug --version
+
+USER root
diff --git a/jdk17-ubi9/Dockerfile b/jdk17-ubi9/Dockerfile
@@ -77,6 +77,6 @@ USER gradle
 
 RUN set -o errexit -o nounset \
     && echo "Testing Gradle installation" \
-    && gradle --version
+    && gradle --stacktrace --debug --version
 
 USER root
diff --git a/jdk21-alpine/Dockerfile b/jdk21-alpine/Dockerfile
@@ -73,6 +73,6 @@ USER gradle
 
 RUN set -o errexit -o nounset \
     && echo "Testing Gradle installation" \
-    && gradle --version
+    && gradle --stacktrace --debug --version
 
 USER root
diff --git a/jdk21-corretto/Dockerfile b/jdk21-corretto/Dockerfile
@@ -80,6 +80,6 @@ USER gradle
 
 RUN set -o errexit -o nounset \
     && echo "Testing Gradle installation" \
-    && gradle --version
+    && gradle --stacktrace --debug --version
 
 USER root
diff --git a/jdk21-jammy-graal/Dockerfile b/jdk21-jammy-graal/Dockerfile
@@ -126,6 +126,6 @@ USER gradle
 
 RUN set -o errexit -o nounset \
     && echo "Testing Gradle installation" \
-    && gradle --version
+    && gradle --stacktrace --debug --version
 
 USER root
diff --git a/jdk21-jammy/Dockerfile b/jdk21-jammy/Dockerfile
@@ -79,6 +79,6 @@ USER gradle
 
 RUN set -o errexit -o nounset \
     && echo "Testing Gradle installation" \
-    && gradle --version
+    && gradle --stacktrace --debug --version
 
 USER root
diff --git a/jdk21-noble-graal/Dockerfile b/jdk21-noble-graal/Dockerfile
@@ -128,6 +128,6 @@ USER gradle
 
 RUN set -o errexit -o nounset \
     && echo "Testing Gradle installation" \
-    && gradle --version
+    && gradle --stacktrace --debug --version
 
 USER root
diff --git a/jdk21-noble/Dockerfile b/jdk21-noble/Dockerfile
@@ -81,6 +81,6 @@ USER gradle
 
 RUN set -o errexit -o nounset \
     && echo "Testing Gradle installation" \
-    && gradle --version
+    && gradle --stacktrace --debug --version
 
 USER root
diff --git a/jdk21-ubi10/Dockerfile b/jdk21-ubi10/Dockerfile
@@ -0,0 +1,82 @@
+FROM eclipse-temurin:21-jdk-ubi10-minimal
+
+CMD ["gradle"]
+
+ENV GRADLE_HOME=/opt/gradle
+
+RUN set -o errexit -o nounset \
+    && echo "Adding gradle user and group" \
+    && groupadd --system --gid 101 gradle \
+    && useradd --system --gid gradle --uid 101 --shell /bin/bash --create-home gradle \
+    && mkdir /home/gradle/.gradle \
+    && chown --recursive gradle:gradle /home/gradle \
+    && chmod --recursive o+rwx /home/gradle \
+    \
+    && echo "Symlinking root Gradle cache to gradle Gradle cache" \
+    && ln --symbolic /home/gradle/.gradle /root/.gradle
+
+VOLUME /home/gradle/.gradle
+
+WORKDIR /home/gradle
+
+RUN set -o errexit -o nounset \
+    && microdnf install -y \
+        # common utilities
+        make \
+        curl-minimal \
+        wget \
+        tar \
+        \
+        # Gradle dependencies
+        findutils \
+        \
+        # Dockerfile dependencies
+        unzip \
+        which \
+        \
+        # VCS dependencies
+        git \
+        git-lfs \
+        subversion \
+    && microdnf clean all \
+    \
+    && echo "Testing common utilities" \
+    && which awk \
+    && which curl \
+    && which cut \
+    && which grep \
+    && which gunzip \
+    && which sha256sum \
+    && which sed \
+    && which tar \
+    && which tr \
+    && which unzip \
+    && which wget \
+    \
+    && echo "Testing VCSes" \
+    && which git \
+    && which git-lfs \
+    && which svn
+
+ENV GRADLE_VERSION=9.2.0
+ARG GRADLE_DOWNLOAD_SHA256=df67a32e86e3276d011735facb1535f64d0d88df84fa87521e90becc2d735444
+RUN set -o errexit -o nounset \
+    && echo "Downloading Gradle" \
+    && wget --no-verbose --output-document=gradle.zip "https://services.gradle.org/distributions/gradle-${GRADLE_VERSION}-bin.zip" \
+    \
+    && echo "Checking Gradle download hash" \
+    && echo "${GRADLE_DOWNLOAD_SHA256} *gradle.zip" | sha256sum --check - \
+    \
+    && echo "Installing Gradle" \
+    && unzip -DD gradle.zip \
+    && rm gradle.zip \
+    && mv "gradle-${GRADLE_VERSION}" "${GRADLE_HOME}/" \
+    && ln --symbolic "${GRADLE_HOME}/bin/gradle" /usr/bin/gradle
+
+USER gradle
+
+RUN set -o errexit -o nounset \
+    && echo "Testing Gradle installation" \
+    && gradle --stacktrace --debug --version
+
+USER root
diff --git a/jdk21-ubi9/Dockerfile b/jdk21-ubi9/Dockerfile
@@ -77,6 +77,6 @@ USER gradle
 
 RUN set -o errexit -o nounset \
     && echo "Testing Gradle installation" \
-    && gradle --version
+    && gradle --stacktrace --debug --version
 
 USER root
diff --git a/jdk25-alpine/Dockerfile b/jdk25-alpine/Dockerfile
@@ -73,6 +73,6 @@ USER gradle
 
 RUN set -o errexit -o nounset \
     && echo "Testing Gradle installation" \
-    && gradle --version
+    && gradle --stacktrace --debug --version
 
 USER root
diff --git a/jdk25-corretto/Dockerfile b/jdk25-corretto/Dockerfile
@@ -80,6 +80,6 @@ USER gradle
 
 RUN set -o errexit -o nounset \
     && echo "Testing Gradle installation" \
-    && gradle --version
+    && gradle --stacktrace --debug --version
 
 USER root
diff --git a/jdk25-noble-graal/Dockerfile b/jdk25-noble-graal/Dockerfile
@@ -128,6 +128,6 @@ USER gradle
 
 RUN set -o errexit -o nounset \
     && echo "Testing Gradle installation" \
-    && gradle --version
+    && gradle --stacktrace --debug --version
 
 USER root
diff --git a/jdk25-noble/Dockerfile b/jdk25-noble/Dockerfile
@@ -81,6 +81,6 @@ USER gradle
 
 RUN set -o errexit -o nounset \
     && echo "Testing Gradle installation" \
-    && gradle --version
+    && gradle --stacktrace --debug --version
 
 USER root
diff --git a/jdk25-ubi10/Dockerfile b/jdk25-ubi10/Dockerfile
