Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Ensure .gradle directory contents are owned by gradle user #15214

Merged
merged 1 commit into from
Aug 16, 2023
Merged

Ensure .gradle directory contents are owned by gradle user #15214

merged 1 commit into from
Aug 16, 2023

Conversation

keeganwitt
Copy link
Contributor

and rebase Gradle 6 and 7 images

@keeganwitt keeganwitt mentioned this pull request Aug 16, 2023
Closed
@github-actions
Copy link

Diff for bb13e66: 
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 92dff8c..7da7969 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -4,134 +4,134 @@ GitRepo: https://github.com/keeganwitt/docker-gradle.git
 Tags: 6.9.4-jdk8, 6.9-jdk8, 6-jdk8, 6.9.4-jdk8-jammy, 6.9-jdk8-jammy, 6-jdk8-jammy
 Architectures: amd64, arm32v7, arm64v8, ppc64le
 GitFetch: refs/heads/6
-GitCommit: 71d126ec98c6eda90e1818a575486e461adef750
+GitCommit: 06672bd7ca729b51ef850b51306882c61a8ca606
 Directory: jdk8
 
 Tags: 6.9.4-jdk8-focal, 6.9-jdk8-focal, 6-jdk8-focal
 Architectures: amd64, arm32v7, arm64v8, ppc64le
 GitFetch: refs/heads/6
-GitCommit: 71d126ec98c6eda90e1818a575486e461adef750
+GitCommit: 06672bd7ca729b51ef850b51306882c61a8ca606
 Directory: jdk8-focal
 
 Tags: 6.9.4-jdk11, 6.9-jdk11, 6-jdk11, 6.9.4-jdk11-jammy, 6.9-jdk11-jammy, 6-jdk11-jammy
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
 GitFetch: refs/heads/6
-GitCommit: 71d126ec98c6eda90e1818a575486e461adef750
+GitCommit: 06672bd7ca729b51ef850b51306882c61a8ca606
 Directory: jdk11
 
 Tags: 6.9.4-jdk11-alpine, 6.9-jdk11-alpine, 6-jdk11-alpine
 GitFetch: refs/heads/6
-GitCommit: 71d126ec98c6eda90e1818a575486e461adef750
+GitCommit: 06672bd7ca729b51ef850b51306882c61a8ca606
 Directory: jdk11-alpine
 
 Tags: 6.9.4-jdk11-focal, 6.9-jdk11-focal, 6-jdk11-focal
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
 GitFetch: refs/heads/6
-GitCommit: 71d126ec98c6eda90e1818a575486e461adef750
+GitCommit: 06672bd7ca729b51ef850b51306882c61a8ca606
 Directory: jdk11-focal
 
 Tags: 6.9.4-jdk17, 6.9-jdk17, 6-jdk17, 6.9.4-jdk, 6.9-jdk, 6-jdk, 6.9.4, 6.9, 6, 6.9.4-jdk17-jammy, 6.9-jdk17-jammy, 6-jdk17-jammy, 6.9.4-jdk-jammy, 6.9-jdk-jammy, 6-jdk-jammy, 6.9.4-jammy, 6.9-jammy, 6-jammy
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
 GitFetch: refs/heads/6
-GitCommit: 71d126ec98c6eda90e1818a575486e461adef750
+GitCommit: 06672bd7ca729b51ef850b51306882c61a8ca606
 Directory: jdk17
 
 Tags: 6.9.4-jdk17-alpine, 6.9-jdk17-alpine, 6-jdk17-alpine, 6.9.4-jdk-alpine, 6.9-jdk-alpine, 6-jdk-alpine, 6.9.4-alpine, 6.9-alpine, 6-alpine
 GitFetch: refs/heads/6
-GitCommit: 71d126ec98c6eda90e1818a575486e461adef750
+GitCommit: 06672bd7ca729b51ef850b51306882c61a8ca606
 Directory: jdk17-alpine
 
 Tags: 6.9.4-jdk17-focal, 6.9-jdk17-focal, 6-jdk17-focal, 6.9.4-jdk-focal, 6.9-jdk-focal, 6-jdk-focal, 6.9.4-focal, 6.9-focal, 6-focal
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
 GitFetch: refs/heads/6
-GitCommit: 71d126ec98c6eda90e1818a575486e461adef750
+GitCommit: 06672bd7ca729b51ef850b51306882c61a8ca606
 Directory: jdk17-focal
 
 Tags: 7.6.2-jdk8, 7.6-jdk8, 7-jdk8, 7.6.2-jdk8-jammy, 7.6-jdk8-jammy, 7-jdk8-jammy
 Architectures: amd64, arm32v7, arm64v8, ppc64le
 GitFetch: refs/heads/7
-GitCommit: 2eda35a6c1ea9f446bc27b6c311bb2909b955bcc
+GitCommit: 2b40b42e9b856c796fcb15b33bea409118b5c745
 Directory: jdk8
 
 Tags: 7.6.2-jdk8-focal, 7.6-jdk8-focal, 7-jdk8-focal
 Architectures: amd64, arm32v7, arm64v8, ppc64le
 GitFetch: refs/heads/7
-GitCommit: 2eda35a6c1ea9f446bc27b6c311bb2909b955bcc
+GitCommit: 2b40b42e9b856c796fcb15b33bea409118b5c745
 Directory: jdk8-focal
 
 Tags: 7.6.2-jdk11, 7.6-jdk11, 7-jdk11, 7.6.2-jdk11-jammy, 7.6-jdk11-jammy, 7-jdk11-jammy
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
 GitFetch: refs/heads/7
-GitCommit: 2eda35a6c1ea9f446bc27b6c311bb2909b955bcc
+GitCommit: 2b40b42e9b856c796fcb15b33bea409118b5c745
 Directory: jdk11
 
 Tags: 7.6.2-jdk11-alpine, 7.6-jdk11-alpine, 7-jdk11-alpine
 GitFetch: refs/heads/7
-GitCommit: 2eda35a6c1ea9f446bc27b6c311bb2909b955bcc
+GitCommit: 2b40b42e9b856c796fcb15b33bea409118b5c745
 Directory: jdk11-alpine
 
 Tags: 7.6.2-jdk11-focal, 7.6-jdk11-focal, 7-jdk11-focal
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
 GitFetch: refs/heads/7
-GitCommit: 2eda35a6c1ea9f446bc27b6c311bb2909b955bcc
+GitCommit: 2b40b42e9b856c796fcb15b33bea409118b5c745
 Directory: jdk11-focal
 
 Tags: 7.6.2-jdk17, 7.6-jdk17, 7-jdk17, 7.6.2-jdk, 7.6-jdk, 7-jdk, 7.6.2, 7.6, 7, 7.6.2-jdk17-jammy, 7.6-jdk17-jammy, 7-jdk17-jammy, 7.6.2-jdk-jammy, 7.6-jdk-jammy, 7-jdk-jammy, 7.6.2-jammy, 7.6-jammy, 7-jammy
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
 GitFetch: refs/heads/7
-GitCommit: 2eda35a6c1ea9f446bc27b6c311bb2909b955bcc
+GitCommit: 2b40b42e9b856c796fcb15b33bea409118b5c745
 Directory: jdk17
 
 Tags: 7.6.2-jdk17-alpine, 7.6-jdk17-alpine, 7-jdk17-alpine, 7.6.2-jdk-alpine, 7.6-jdk-alpine, 7-jdk-alpine, 7.6.2-alpine, 7.6-alpine, 7-alpine
 GitFetch: refs/heads/7
-GitCommit: 2eda35a6c1ea9f446bc27b6c311bb2909b955bcc
+GitCommit: 2b40b42e9b856c796fcb15b33bea409118b5c745
 Directory: jdk17-alpine
 
 Tags: 7.6.2-jdk17-focal, 7.6-jdk17-focal, 7-jdk17-focal, 7.6.2-jdk-focal, 7.6-jdk-focal, 7-jdk-focal, 7.6.2-focal, 7.6-focal, 7-focal
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
 GitFetch: refs/heads/7
-GitCommit: 2eda35a6c1ea9f446bc27b6c311bb2909b955bcc
+GitCommit: 2b40b42e9b856c796fcb15b33bea409118b5c745
 Directory: jdk17-focal
 
 Tags: 8.2.1-jdk8, 8.2-jdk8, 8-jdk8, jdk8, 8.2.1-jdk8-jammy, 8.2-jdk8-jammy, 8-jdk8-jammy, jdk8-jammy
 Architectures: amd64, arm32v7, arm64v8, ppc64le
-GitCommit: e24445c1fe2bcf086d2370b10200266f6ce18865
+GitCommit: 5346f2dce507db6bb4cec7818c6dbd5b8a74b829
 Directory: jdk8
 
 Tags: 8.2.1-jdk8-focal, 8.2-jdk8-focal, 8-jdk8-focal, jdk8-focal
 Architectures: amd64, arm32v7, arm64v8, ppc64le
-GitCommit: e24445c1fe2bcf086d2370b10200266f6ce18865
+GitCommit: 5346f2dce507db6bb4cec7818c6dbd5b8a74b829
 Directory: jdk8-focal
 
 Tags: 8.2.1-jdk11, 8.2-jdk11, 8-jdk11, jdk11, 8.2.1-jdk11-jammy, 8.2-jdk11-jammy, 8-jdk11-jammy, jdk11-jammy
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: e24445c1fe2bcf086d2370b10200266f6ce18865
+GitCommit: 5346f2dce507db6bb4cec7818c6dbd5b8a74b829
 Directory: jdk11
 
 Tags: 8.2.1-jdk11-alpine, 8.2-jdk11-alpine, 8-jdk11-alpine, jdk11-alpine
-GitCommit: e24445c1fe2bcf086d2370b10200266f6ce18865
+GitCommit: 5346f2dce507db6bb4cec7818c6dbd5b8a74b829
 Directory: jdk11-alpine
 
 Tags: 8.2.1-jdk11-focal, 8.2-jdk11-focal, 8-jdk11-focal, jdk11-focal
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: e24445c1fe2bcf086d2370b10200266f6ce18865
+GitCommit: 5346f2dce507db6bb4cec7818c6dbd5b8a74b829
 Directory: jdk11-focal
 
 Tags: 8.2.1-jdk17, 8.2-jdk17, 8-jdk17, jdk17, 8.2.1-jdk, 8.2-jdk, 8-jdk, jdk, 8.2.1, 8.2, 8, latest, 8.2.1-jdk17-jammy, 8.2-jdk17-jammy, 8-jdk17-jammy, jdk17-jammy, 8.2.1-jdk-jammy, 8.2-jdk-jammy, 8-jdk-jammy, jdk-jammy, 8.2.1-jammy, 8.2-jammy, 8-jammy, jammy
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: e24445c1fe2bcf086d2370b10200266f6ce18865
+GitCommit: 5346f2dce507db6bb4cec7818c6dbd5b8a74b829
 Directory: jdk17
 
 Tags: 8.2.1-jdk17-alpine, 8.2-jdk17-alpine, 8-jdk17-alpine, jdk17-alpine, 8.2.1-jdk-alpine, 8.2-jdk-alpine, 8-jdk-alpine, jdk-alpine, 8.2.1-alpine, 8.2-alpine, 8-alpine, alpine
-GitCommit: e24445c1fe2bcf086d2370b10200266f6ce18865
+GitCommit: 5346f2dce507db6bb4cec7818c6dbd5b8a74b829
 Directory: jdk17-alpine
 
 Tags: 8.2.1-jdk17-focal, 8.2-jdk17-focal, 8-jdk17-focal, jdk17-focal, 8.2.1-jdk-focal, 8.2-jdk-focal, 8-jdk-focal, jdk-focal, 8.2.1-focal, 8.2-focal, 8-focal, focal
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: e24445c1fe2bcf086d2370b10200266f6ce18865
+GitCommit: 5346f2dce507db6bb4cec7818c6dbd5b8a74b829
 Directory: jdk17-focal
 
 Tags: 8.2.1-jdk17-graal, 8.2-jdk17-graal, 8-jdk17-graal, jdk17-graal, 8.2.1-jdk-graal, 8.2-jdk-graal, 8-jdk-graal, jdk-graal, 8.2.1-graal, 8.2-graal, 8-graal, graal, 8.2.1-jdk17-graal-jammy, 8.2-jdk17-graal-jammy, 8-jdk17-graal-jammy, jdk17-graal-jammy, 8.2.1-jdk-graal-jammy, 8.2-jdk-graal-jammy, 8-jdk-graal-jammy, jdk-graal-jammy, 8.2.1-graal-jammy, 8.2-graal-jammy, 8-graal-jammy, graal-jammy
 Architectures: amd64, arm64v8
-GitCommit: e24445c1fe2bcf086d2370b10200266f6ce18865
+GitCommit: 5346f2dce507db6bb4cec7818c6dbd5b8a74b829
 Directory: jdk17-graal
diff --git a/gradle_6-alpine/Dockerfile b/gradle_6-alpine/Dockerfile
index b1726b6..72548d7 100644
--- a/gradle_6-alpine/Dockerfile
+++ b/gradle_6-alpine/Dockerfile
@@ -38,14 +38,19 @@ 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 download hash" \
+    && echo "Checking Gradle download hash" \
     && echo "${GRADLE_DOWNLOAD_SHA256} *gradle.zip" | sha256sum -c - \
     \
     && echo "Installing Gradle" \
     && unzip gradle.zip \
     && rm gradle.zip \
     && mv "gradle-${GRADLE_VERSION}" "${GRADLE_HOME}/" \
-    && ln -s "${GRADLE_HOME}/bin/gradle" /usr/bin/gradle \
-    \
+    && ln -s "${GRADLE_HOME}/bin/gradle" /usr/bin/gradle
+
+USER gradle
+
+RUN set -o errexit -o nounset \
     && echo "Testing Gradle installation" \
     && gradle --version
+
+USER root
diff --git a/gradle_6-focal/Dockerfile b/gradle_6-focal/Dockerfile
index d329a86..443d637 100644
--- a/gradle_6-focal/Dockerfile
+++ b/gradle_6-focal/Dockerfile
@@ -45,14 +45,19 @@ 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 download hash" \
+    && echo "Checking Gradle download hash" \
     && echo "${GRADLE_DOWNLOAD_SHA256} *gradle.zip" | sha256sum --check - \
     \
     && echo "Installing Gradle" \
     && 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
+
+USER root
diff --git a/gradle_6-jammy/Dockerfile b/gradle_6-jammy/Dockerfile
index d7f9c85..c8f56bd 100644
--- a/gradle_6-jammy/Dockerfile
+++ b/gradle_6-jammy/Dockerfile
@@ -45,14 +45,19 @@ 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 download hash" \
+    && echo "Checking Gradle download hash" \
     && echo "${GRADLE_DOWNLOAD_SHA256} *gradle.zip" | sha256sum --check - \
     \
     && echo "Installing Gradle" \
     && 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
+
+USER root
diff --git a/gradle_6-jdk11-alpine/Dockerfile b/gradle_6-jdk11-alpine/Dockerfile
index 105d6b7..0271f78 100644
--- a/gradle_6-jdk11-alpine/Dockerfile
+++ b/gradle_6-jdk11-alpine/Dockerfile
@@ -38,14 +38,19 @@ 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 download hash" \
+    && echo "Checking Gradle download hash" \
     && echo "${GRADLE_DOWNLOAD_SHA256} *gradle.zip" | sha256sum -c - \
     \
     && echo "Installing Gradle" \
     && unzip gradle.zip \
     && rm gradle.zip \
     && mv "gradle-${GRADLE_VERSION}" "${GRADLE_HOME}/" \
-    && ln -s "${GRADLE_HOME}/bin/gradle" /usr/bin/gradle \
-    \
+    && ln -s "${GRADLE_HOME}/bin/gradle" /usr/bin/gradle
+
+USER gradle
+
+RUN set -o errexit -o nounset \
     && echo "Testing Gradle installation" \
     && gradle --version
+
+USER root
diff --git a/gradle_6-jdk11-focal/Dockerfile b/gradle_6-jdk11-focal/Dockerfile
index 1caeb4a..bd3722c 100644
--- a/gradle_6-jdk11-focal/Dockerfile
+++ b/gradle_6-jdk11-focal/Dockerfile
@@ -45,14 +45,19 @@ 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 download hash" \
+    && echo "Checking Gradle download hash" \
     && echo "${GRADLE_DOWNLOAD_SHA256} *gradle.zip" | sha256sum --check - \
     \
     && echo "Installing Gradle" \
     && 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
+
+USER root
diff --git a/gradle_6-jdk11-jammy/Dockerfile b/gradle_6-jdk11-jammy/Dockerfile
index 173ea4a..422cb57 100644
--- a/gradle_6-jdk11-jammy/Dockerfile
+++ b/gradle_6-jdk11-jammy/Dockerfile
@@ -45,14 +45,19 @@ 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 download hash" \
+    && echo "Checking Gradle download hash" \
     && echo "${GRADLE_DOWNLOAD_SHA256} *gradle.zip" | sha256sum --check - \
     \
     && echo "Installing Gradle" \
     && 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
+
+USER root
diff --git a/gradle_6-jdk8-focal/Dockerfile b/gradle_6-jdk8-focal/Dockerfile
index f047dde..c12b5a5 100644
--- a/gradle_6-jdk8-focal/Dockerfile
+++ b/gradle_6-jdk8-focal/Dockerfile
@@ -45,14 +45,19 @@ 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 download hash" \
+    && echo "Checking Gradle download hash" \
     && echo "${GRADLE_DOWNLOAD_SHA256} *gradle.zip" | sha256sum --check - \
     \
     && echo "Installing Gradle" \
     && 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
+
+USER root
diff --git a/gradle_6-jdk8-jammy/Dockerfile b/gradle_6-jdk8-jammy/Dockerfile
index d38e9be..9600952 100644
--- a/gradle_6-jdk8-jammy/Dockerfile
+++ b/gradle_6-jdk8-jammy/Dockerfile
@@ -45,14 +45,19 @@ 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 download hash" \
+    && echo "Checking Gradle download hash" \
     && echo "${GRADLE_DOWNLOAD_SHA256} *gradle.zip" | sha256sum --check - \
     \
     && echo "Installing Gradle" \
     && 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
+
+USER root
diff --git a/gradle_7-alpine/Dockerfile b/gradle_7-alpine/Dockerfile
index f73b97c..7ca35ed 100644
--- a/gradle_7-alpine/Dockerfile
+++ b/gradle_7-alpine/Dockerfile
@@ -38,14 +38,19 @@ 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 download hash" \
+    && echo "Checking Gradle download hash" \
     && echo "${GRADLE_DOWNLOAD_SHA256} *gradle.zip" | sha256sum -c - \
     \
     && echo "Installing Gradle" \
     && unzip gradle.zip \
     && rm gradle.zip \
     && mv "gradle-${GRADLE_VERSION}" "${GRADLE_HOME}/" \
-    && ln -s "${GRADLE_HOME}/bin/gradle" /usr/bin/gradle \
-    \
+    && ln -s "${GRADLE_HOME}/bin/gradle" /usr/bin/gradle
+
+USER gradle
+
+RUN set -o errexit -o nounset \
     && echo "Testing Gradle installation" \
     && gradle --version
+
+USER root
diff --git a/gradle_7-focal/Dockerfile b/gradle_7-focal/Dockerfile
index 23f9b2f..5b23e97 100644
--- a/gradle_7-focal/Dockerfile
+++ b/gradle_7-focal/Dockerfile
@@ -45,14 +45,19 @@ 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 download hash" \
+    && echo "Checking Gradle download hash" \
     && echo "${GRADLE_DOWNLOAD_SHA256} *gradle.zip" | sha256sum --check - \
     \
     && echo "Installing Gradle" \
     && 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
+
+USER root
diff --git a/gradle_7-jammy/Dockerfile b/gradle_7-jammy/Dockerfile
index 107c6dc..69de816 100644
--- a/gradle_7-jammy/Dockerfile
+++ b/gradle_7-jammy/Dockerfile
@@ -45,14 +45,19 @@ 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 download hash" \
+    && echo "Checking Gradle download hash" \
     && echo "${GRADLE_DOWNLOAD_SHA256} *gradle.zip" | sha256sum --check - \
     \
     && echo "Installing Gradle" \
     && 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
+
+USER root
diff --git a/gradle_7-jdk11-alpine/Dockerfile b/gradle_7-jdk11-alpine/Dockerfile
index 790172a..3603e08 100644
--- a/gradle_7-jdk11-alpine/Dockerfile
+++ b/gradle_7-jdk11-alpine/Dockerfile
@@ -38,14 +38,19 @@ 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 download hash" \
+    && echo "Checking Gradle download hash" \
     && echo "${GRADLE_DOWNLOAD_SHA256} *gradle.zip" | sha256sum -c - \
     \
     && echo "Installing Gradle" \
     && unzip gradle.zip \
     && rm gradle.zip \
     && mv "gradle-${GRADLE_VERSION}" "${GRADLE_HOME}/" \
-    && ln -s "${GRADLE_HOME}/bin/gradle" /usr/bin/gradle \
-    \
+    && ln -s "${GRADLE_HOME}/bin/gradle" /usr/bin/gradle
+
+USER gradle
+
+RUN set -o errexit -o nounset \
     && echo "Testing Gradle installation" \
     && gradle --version
+
+USER root
diff --git a/gradle_7-jdk11-focal/Dockerfile b/gradle_7-jdk11-focal/Dockerfile
index d3f54de..bdd82d7 100644
--- a/gradle_7-jdk11-focal/Dockerfile
+++ b/gradle_7-jdk11-focal/Dockerfile
@@ -45,14 +45,19 @@ 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 download hash" \
+    && echo "Checking Gradle download hash" \
     && echo "${GRADLE_DOWNLOAD_SHA256} *gradle.zip" | sha256sum --check - \
     \
     && echo "Installing Gradle" \
     && 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
+
+USER root
diff --git a/gradle_7-jdk11-jammy/Dockerfile b/gradle_7-jdk11-jammy/Dockerfile
index 8255d79..6f23235 100644
--- a/gradle_7-jdk11-jammy/Dockerfile
+++ b/gradle_7-jdk11-jammy/Dockerfile
@@ -45,14 +45,19 @@ 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 download hash" \
+    && echo "Checking Gradle download hash" \
     && echo "${GRADLE_DOWNLOAD_SHA256} *gradle.zip" | sha256sum --check - \
     \
     && echo "Installing Gradle" \
     && 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
+
+USER root
diff --git a/gradle_7-jdk8-focal/Dockerfile b/gradle_7-jdk8-focal/Dockerfile
index f8dfb7b..95a7fdc 100644
--- a/gradle_7-jdk8-focal/Dockerfile
+++ b/gradle_7-jdk8-focal/Dockerfile
@@ -45,14 +45,19 @@ 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 download hash" \
+    && echo "Checking Gradle download hash" \
     && echo "${GRADLE_DOWNLOAD_SHA256} *gradle.zip" | sha256sum --check - \
     \
     && echo "Installing Gradle" \
     && 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
+
+USER root
diff --git a/gradle_7-jdk8-jammy/Dockerfile b/gradle_7-jdk8-jammy/Dockerfile
index eab2904..6d59b2c 100644
--- a/gradle_7-jdk8-jammy/Dockerfile
+++ b/gradle_7-jdk8-jammy/Dockerfile
@@ -45,14 +45,19 @@ 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 download hash" \
+    && echo "Checking Gradle download hash" \
     && echo "${GRADLE_DOWNLOAD_SHA256} *gradle.zip" | sha256sum --check - \
     \
     && echo "Installing Gradle" \
     && 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
+
+USER root
diff --git a/gradle_alpine/Dockerfile b/gradle_alpine/Dockerfile
index d4f62bc..0e35847 100644
--- a/gradle_alpine/Dockerfile
+++ b/gradle_alpine/Dockerfile
@@ -45,7 +45,12 @@ RUN set -o errexit -o nounset \
     && unzip gradle.zip \
     && rm gradle.zip \
     && mv "gradle-${GRADLE_VERSION}" "${GRADLE_HOME}/" \
-    && ln -s "${GRADLE_HOME}/bin/gradle" /usr/bin/gradle \
-    \
+    && ln -s "${GRADLE_HOME}/bin/gradle" /usr/bin/gradle
+
+USER gradle
+
+RUN set -o errexit -o nounset \
     && echo "Testing Gradle installation" \
     && gradle --version
+
+USER root
diff --git a/gradle_focal/Dockerfile b/gradle_focal/Dockerfile
index f861fe0..602bb00 100644
--- a/gradle_focal/Dockerfile
+++ b/gradle_focal/Dockerfile
@@ -52,7 +52,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
+
+USER root
diff --git a/gradle_graal-jammy/Dockerfile b/gradle_graal-jammy/Dockerfile
index b3b8744..969d9d8 100644
--- a/gradle_graal-jammy/Dockerfile
+++ b/gradle_graal-jammy/Dockerfile
@@ -9,6 +9,7 @@ RUN set -o errexit -o nounset \
     && groupadd --system --gid 1000 gradle \
     && useradd --system --gid gradle --uid 1000 --shell /bin/bash --create-home gradle \
     && mkdir /home/gradle/.gradle \
+    && chown --recursive gradle:gradle /home/gradle \
     \
     && echo "Symlinking root Gradle cache to gradle Gradle cache" \
     && ln --symbolic /home/gradle/.gradle /root/.gradle
@@ -96,10 +97,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 --version
+
+USER root
diff --git a/gradle_jammy/Dockerfile b/gradle_jammy/Dockerfile
index 002ae40..c7ea5ce 100644
--- a/gradle_jammy/Dockerfile
+++ b/gradle_jammy/Dockerfile
@@ -52,7 +52,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
+
+USER root
diff --git a/gradle_jdk11-alpine/Dockerfile b/gradle_jdk11-alpine/Dockerfile
index 65d8a82..5aca313 100644
--- a/gradle_jdk11-alpine/Dockerfile
+++ b/gradle_jdk11-alpine/Dockerfile
@@ -45,7 +45,12 @@ RUN set -o errexit -o nounset \
     && unzip gradle.zip \
     && rm gradle.zip \
     && mv "gradle-${GRADLE_VERSION}" "${GRADLE_HOME}/" \
-    && ln -s "${GRADLE_HOME}/bin/gradle" /usr/bin/gradle \
-    \
+    && ln -s "${GRADLE_HOME}/bin/gradle" /usr/bin/gradle
+
+USER gradle
+
+RUN set -o errexit -o nounset \
     && echo "Testing Gradle installation" \
     && gradle --version
+
+USER root
diff --git a/gradle_jdk11-focal/Dockerfile b/gradle_jdk11-focal/Dockerfile
index 384b44e..1d48a13 100644
--- a/gradle_jdk11-focal/Dockerfile
+++ b/gradle_jdk11-focal/Dockerfile
@@ -52,7 +52,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
+
+USER root
diff --git a/gradle_jdk11-jammy/Dockerfile b/gradle_jdk11-jammy/Dockerfile
index 4590a8f..74f1877 100644
--- a/gradle_jdk11-jammy/Dockerfile
+++ b/gradle_jdk11-jammy/Dockerfile
@@ -52,7 +52,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
+
+USER root
diff --git a/gradle_jdk8-focal/Dockerfile b/gradle_jdk8-focal/Dockerfile
index e541163..a973450 100644
--- a/gradle_jdk8-focal/Dockerfile
+++ b/gradle_jdk8-focal/Dockerfile
@@ -52,7 +52,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
+
+USER root
diff --git a/gradle_jdk8-jammy/Dockerfile b/gradle_jdk8-jammy/Dockerfile
index f1ecba9..98e1c12 100644
--- a/gradle_jdk8-jammy/Dockerfile
+++ b/gradle_jdk8-jammy/Dockerfile
@@ -52,7 +52,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
+
+USER root

Relevant Maintainers:

@keeganwitt keeganwitt mentioned this pull request Aug 16, 2023
Closed
@yosifkit yosifkit merged commit 7bb63f6 into docker-library:master Aug 16, 2023
30 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
library/gradle
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@keeganwitt @yosifkit