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.

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

Gradle 4.3.1 #3734

Merged
merged 1 commit into from Nov 22, 2017
Merged

Gradle 4.3.1 #3734

merged 1 commit into from Nov 22, 2017

Conversation

keeganwitt
Copy link
Contributor

No description provided.

@keeganwitt
Copy link
Contributor Author

I also added a workaround for http://bugs.java.com/view_bug.do?bug_id=JDK-8189357 (docker-library/openjdk#145) since I was tired of waiting for Oracle to fix, especially since the fix is related to http://bugs.java.com/view_bug.do?bug_id=JDK-8189131 which doesn't look like it's gonna land until 9.0.4.

@yosifkit
Copy link
Member

Diff:
diff --git a/_bashbrew-list b/_bashbrew-list
index 8d8ccfe..e6c2870 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -14,22 +14,22 @@ gradle:4.3-jre8
 gradle:4.3-jre8-alpine
 gradle:4.3-jre9
 gradle:4.3-jre-alpine
-gradle:4.3.0
-gradle:4.3.0-alpine
-gradle:4.3.0-jdk
-gradle:4.3.0-jdk7
-gradle:4.3.0-jdk7-alpine
-gradle:4.3.0-jdk8
-gradle:4.3.0-jdk8-alpine
-gradle:4.3.0-jdk9
-gradle:4.3.0-jdk-alpine
-gradle:4.3.0-jre
-gradle:4.3.0-jre7
-gradle:4.3.0-jre7-alpine
-gradle:4.3.0-jre8
-gradle:4.3.0-jre8-alpine
-gradle:4.3.0-jre9
-gradle:4.3.0-jre-alpine
+gradle:4.3.1
+gradle:4.3.1-alpine
+gradle:4.3.1-jdk
+gradle:4.3.1-jdk7
+gradle:4.3.1-jdk7-alpine
+gradle:4.3.1-jdk8
+gradle:4.3.1-jdk8-alpine
+gradle:4.3.1-jdk9
+gradle:4.3.1-jdk-alpine
+gradle:4.3.1-jre
+gradle:4.3.1-jre7
+gradle:4.3.1-jre7-alpine
+gradle:4.3.1-jre8
+gradle:4.3.1-jre8-alpine
+gradle:4.3.1-jre9
+gradle:4.3.1-jre-alpine
 gradle:alpine
 gradle:jdk
 gradle:jdk7
diff --git a/gradle_alpine/Dockerfile b/gradle_alpine/Dockerfile
index 00ef4f5..e6516d4 100644
--- a/gradle_alpine/Dockerfile
+++ b/gradle_alpine/Dockerfile
@@ -3,9 +3,9 @@ FROM openjdk:8-jdk-alpine
 CMD ["gradle"]
 
 ENV GRADLE_HOME /opt/gradle
-ENV GRADLE_VERSION 4.3
+ENV GRADLE_VERSION 4.3.1
 
-ARG GRADLE_DOWNLOAD_SHA256=8dcbf44eef92575b475dcb1ce12b5f19d38dc79e84c662670248dc8b8247654c
+ARG GRADLE_DOWNLOAD_SHA256=15ebe098ce0392a2d06d252bff24143cc88c4e963346582c8d88814758d93ac7
 RUN set -o errexit -o nounset \
 	&& echo "Installing build dependencies" \
 	&& apk add --no-cache --virtual .build-deps \
diff --git a/gradle_jdk7-alpine/Dockerfile b/gradle_jdk7-alpine/Dockerfile
index b2a7dc3..ebdcceb 100644
--- a/gradle_jdk7-alpine/Dockerfile
+++ b/gradle_jdk7-alpine/Dockerfile
@@ -3,9 +3,9 @@ FROM openjdk:7-jdk-alpine
 CMD ["gradle"]
 
 ENV GRADLE_HOME /opt/gradle
-ENV GRADLE_VERSION 4.3
+ENV GRADLE_VERSION 4.3.1
 
-ARG GRADLE_DOWNLOAD_SHA256=8dcbf44eef92575b475dcb1ce12b5f19d38dc79e84c662670248dc8b8247654c
+ARG GRADLE_DOWNLOAD_SHA256=15ebe098ce0392a2d06d252bff24143cc88c4e963346582c8d88814758d93ac7
 RUN set -o errexit -o nounset \
 	&& echo "Installing build dependencies" \
 	&& apk add --no-cache --virtual .build-deps \
diff --git a/gradle_jdk7/Dockerfile b/gradle_jdk7/Dockerfile
index 2865d75..15f6f3b 100644
--- a/gradle_jdk7/Dockerfile
+++ b/gradle_jdk7/Dockerfile
@@ -3,9 +3,9 @@ FROM openjdk:7-jdk
 CMD ["gradle"]
 
 ENV GRADLE_HOME /opt/gradle
-ENV GRADLE_VERSION 4.3
+ENV GRADLE_VERSION 4.3.1
 
-ARG GRADLE_DOWNLOAD_SHA256=8dcbf44eef92575b475dcb1ce12b5f19d38dc79e84c662670248dc8b8247654c
+ARG GRADLE_DOWNLOAD_SHA256=15ebe098ce0392a2d06d252bff24143cc88c4e963346582c8d88814758d93ac7
 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" \
diff --git a/gradle_jdk9/Dockerfile b/gradle_jdk9/Dockerfile
index 2c81638..032f3a4 100644
--- a/gradle_jdk9/Dockerfile
+++ b/gradle_jdk9/Dockerfile
@@ -3,10 +3,16 @@ FROM openjdk:9-jdk
 CMD ["gradle"]
 
 ENV GRADLE_HOME /opt/gradle
-ENV GRADLE_VERSION 4.3
+ENV GRADLE_VERSION 4.3.1
 
-ARG GRADLE_DOWNLOAD_SHA256=8dcbf44eef92575b475dcb1ce12b5f19d38dc79e84c662670248dc8b8247654c
+# cacerts from JDK 8u152
+COPY cacerts /
+
+ARG GRADLE_DOWNLOAD_SHA256=15ebe098ce0392a2d06d252bff24143cc88c4e963346582c8d88814758d93ac7
 RUN set -o errexit -o nounset \
+	&& echo "Applying fix for http://bugs.java.com/view_bug.do?bug_id=8189357" \
+	&& mv --force /cacerts etc/ssl/certs/java/cacerts \
+	\
 	&& echo "Downloading Gradle" \
 	&& wget --no-verbose --output-document=gradle.zip "https://services.gradle.org/distributions/gradle-${GRADLE_VERSION}-bin.zip" \
 	\
diff --git a/gradle_jdk9/cacerts b/gradle_jdk9/cacerts
new file mode 100644
index 0000000..6016be4
Binary files /dev/null and b/gradle_jdk9/cacerts differ
diff --git a/gradle_jre-alpine/Dockerfile b/gradle_jre-alpine/Dockerfile
index eb9fe76..97a814e 100644
--- a/gradle_jre-alpine/Dockerfile
+++ b/gradle_jre-alpine/Dockerfile
@@ -3,9 +3,9 @@ FROM openjdk:8-jre-alpine
 CMD ["gradle"]
 
 ENV GRADLE_HOME /opt/gradle
-ENV GRADLE_VERSION 4.3
+ENV GRADLE_VERSION 4.3.1
 
-ARG GRADLE_DOWNLOAD_SHA256=8dcbf44eef92575b475dcb1ce12b5f19d38dc79e84c662670248dc8b8247654c
+ARG GRADLE_DOWNLOAD_SHA256=15ebe098ce0392a2d06d252bff24143cc88c4e963346582c8d88814758d93ac7
 RUN set -o errexit -o nounset \
 	&& echo "Installing build dependencies" \
 	&& apk add --no-cache --virtual .build-deps \
diff --git a/gradle_jre/Dockerfile b/gradle_jre/Dockerfile
index ce923c5..e80269c 100644
--- a/gradle_jre/Dockerfile
+++ b/gradle_jre/Dockerfile
@@ -3,9 +3,9 @@ FROM openjdk:8-jre
 CMD ["gradle"]
 
 ENV GRADLE_HOME /opt/gradle
-ENV GRADLE_VERSION 4.3
+ENV GRADLE_VERSION 4.3.1
 
-ARG GRADLE_DOWNLOAD_SHA256=8dcbf44eef92575b475dcb1ce12b5f19d38dc79e84c662670248dc8b8247654c
+ARG GRADLE_DOWNLOAD_SHA256=15ebe098ce0392a2d06d252bff24143cc88c4e963346582c8d88814758d93ac7
 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" \
diff --git a/gradle_jre7-alpine/Dockerfile b/gradle_jre7-alpine/Dockerfile
index ecd2c8d..da88bf3 100644
--- a/gradle_jre7-alpine/Dockerfile
+++ b/gradle_jre7-alpine/Dockerfile
@@ -3,9 +3,9 @@ FROM openjdk:7-jre-alpine
 CMD ["gradle"]
 
 ENV GRADLE_HOME /opt/gradle
-ENV GRADLE_VERSION 4.3
+ENV GRADLE_VERSION 4.3.1
 
-ARG GRADLE_DOWNLOAD_SHA256=8dcbf44eef92575b475dcb1ce12b5f19d38dc79e84c662670248dc8b8247654c
+ARG GRADLE_DOWNLOAD_SHA256=15ebe098ce0392a2d06d252bff24143cc88c4e963346582c8d88814758d93ac7
 RUN set -o errexit -o nounset \
 	&& echo "Installing build dependencies" \
 	&& apk add --no-cache --virtual .build-deps \
diff --git a/gradle_jre7/Dockerfile b/gradle_jre7/Dockerfile
index 564c27d..5bf6276 100644
--- a/gradle_jre7/Dockerfile
+++ b/gradle_jre7/Dockerfile
@@ -3,9 +3,9 @@ FROM openjdk:7-jre
 CMD ["gradle"]
 
 ENV GRADLE_HOME /opt/gradle
-ENV GRADLE_VERSION 4.3
+ENV GRADLE_VERSION 4.3.1
 
-ARG GRADLE_DOWNLOAD_SHA256=8dcbf44eef92575b475dcb1ce12b5f19d38dc79e84c662670248dc8b8247654c
+ARG GRADLE_DOWNLOAD_SHA256=15ebe098ce0392a2d06d252bff24143cc88c4e963346582c8d88814758d93ac7
 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" \
diff --git a/gradle_jre9/Dockerfile b/gradle_jre9/Dockerfile
index e5d7163..76f25db 100644
--- a/gradle_jre9/Dockerfile
+++ b/gradle_jre9/Dockerfile
@@ -3,10 +3,16 @@ FROM openjdk:9-jre
 CMD ["gradle"]
 
 ENV GRADLE_HOME /opt/gradle
-ENV GRADLE_VERSION 4.3
+ENV GRADLE_VERSION 4.3.1
 
-ARG GRADLE_DOWNLOAD_SHA256=8dcbf44eef92575b475dcb1ce12b5f19d38dc79e84c662670248dc8b8247654c
+# cacerts from JDK 8u152
+COPY cacerts /
+
+ARG GRADLE_DOWNLOAD_SHA256=15ebe098ce0392a2d06d252bff24143cc88c4e963346582c8d88814758d93ac7
 RUN set -o errexit -o nounset \
+	&& echo "Applying fix for http://bugs.java.com/view_bug.do?bug_id=8189357" \
+	&& mv --force /cacerts etc/ssl/certs/java/cacerts \
+	\
 	&& echo "Downloading Gradle" \
 	&& wget --no-verbose --output-document=gradle.zip "https://services.gradle.org/distributions/gradle-${GRADLE_VERSION}-bin.zip" \
 	\
diff --git a/gradle_jre9/cacerts b/gradle_jre9/cacerts
new file mode 100644
index 0000000..6016be4
Binary files /dev/null and b/gradle_jre9/cacerts differ
diff --git a/gradle_latest/Dockerfile b/gradle_latest/Dockerfile
index de79715..6d9fb34 100644
--- a/gradle_latest/Dockerfile
+++ b/gradle_latest/Dockerfile
@@ -3,9 +3,9 @@ FROM openjdk:8-jdk
 CMD ["gradle"]
 
 ENV GRADLE_HOME /opt/gradle
-ENV GRADLE_VERSION 4.3
+ENV GRADLE_VERSION 4.3.1
 
-ARG GRADLE_DOWNLOAD_SHA256=8dcbf44eef92575b475dcb1ce12b5f19d38dc79e84c662670248dc8b8247654c
+ARG GRADLE_DOWNLOAD_SHA256=15ebe098ce0392a2d06d252bff24143cc88c4e963346582c8d88814758d93ac7
 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" \

@yosifkit
Copy link
Member

+COPY cacerts /

Can we copy directly to /etc/ssl/certs/java/cacerts?

@keeganwitt
Copy link
Contributor Author

Yea, that's a good idea.

@yosifkit
Copy link
Member

Diff:
diff --git a/_bashbrew-list b/_bashbrew-list
index 8d8ccfe..e6c2870 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -14,22 +14,22 @@ gradle:4.3-jre8
 gradle:4.3-jre8-alpine
 gradle:4.3-jre9
 gradle:4.3-jre-alpine
-gradle:4.3.0
-gradle:4.3.0-alpine
-gradle:4.3.0-jdk
-gradle:4.3.0-jdk7
-gradle:4.3.0-jdk7-alpine
-gradle:4.3.0-jdk8
-gradle:4.3.0-jdk8-alpine
-gradle:4.3.0-jdk9
-gradle:4.3.0-jdk-alpine
-gradle:4.3.0-jre
-gradle:4.3.0-jre7
-gradle:4.3.0-jre7-alpine
-gradle:4.3.0-jre8
-gradle:4.3.0-jre8-alpine
-gradle:4.3.0-jre9
-gradle:4.3.0-jre-alpine
+gradle:4.3.1
+gradle:4.3.1-alpine
+gradle:4.3.1-jdk
+gradle:4.3.1-jdk7
+gradle:4.3.1-jdk7-alpine
+gradle:4.3.1-jdk8
+gradle:4.3.1-jdk8-alpine
+gradle:4.3.1-jdk9
+gradle:4.3.1-jdk-alpine
+gradle:4.3.1-jre
+gradle:4.3.1-jre7
+gradle:4.3.1-jre7-alpine
+gradle:4.3.1-jre8
+gradle:4.3.1-jre8-alpine
+gradle:4.3.1-jre9
+gradle:4.3.1-jre-alpine
 gradle:alpine
 gradle:jdk
 gradle:jdk7
diff --git a/gradle_alpine/Dockerfile b/gradle_alpine/Dockerfile
index 00ef4f5..e6516d4 100644
--- a/gradle_alpine/Dockerfile
+++ b/gradle_alpine/Dockerfile
@@ -3,9 +3,9 @@ FROM openjdk:8-jdk-alpine
 CMD ["gradle"]
 
 ENV GRADLE_HOME /opt/gradle
-ENV GRADLE_VERSION 4.3
+ENV GRADLE_VERSION 4.3.1
 
-ARG GRADLE_DOWNLOAD_SHA256=8dcbf44eef92575b475dcb1ce12b5f19d38dc79e84c662670248dc8b8247654c
+ARG GRADLE_DOWNLOAD_SHA256=15ebe098ce0392a2d06d252bff24143cc88c4e963346582c8d88814758d93ac7
 RUN set -o errexit -o nounset \
 	&& echo "Installing build dependencies" \
 	&& apk add --no-cache --virtual .build-deps \
diff --git a/gradle_jdk7-alpine/Dockerfile b/gradle_jdk7-alpine/Dockerfile
index b2a7dc3..ebdcceb 100644
--- a/gradle_jdk7-alpine/Dockerfile
+++ b/gradle_jdk7-alpine/Dockerfile
@@ -3,9 +3,9 @@ FROM openjdk:7-jdk-alpine
 CMD ["gradle"]
 
 ENV GRADLE_HOME /opt/gradle
-ENV GRADLE_VERSION 4.3
+ENV GRADLE_VERSION 4.3.1
 
-ARG GRADLE_DOWNLOAD_SHA256=8dcbf44eef92575b475dcb1ce12b5f19d38dc79e84c662670248dc8b8247654c
+ARG GRADLE_DOWNLOAD_SHA256=15ebe098ce0392a2d06d252bff24143cc88c4e963346582c8d88814758d93ac7
 RUN set -o errexit -o nounset \
 	&& echo "Installing build dependencies" \
 	&& apk add --no-cache --virtual .build-deps \
diff --git a/gradle_jdk7/Dockerfile b/gradle_jdk7/Dockerfile
index 2865d75..15f6f3b 100644
--- a/gradle_jdk7/Dockerfile
+++ b/gradle_jdk7/Dockerfile
@@ -3,9 +3,9 @@ FROM openjdk:7-jdk
 CMD ["gradle"]
 
 ENV GRADLE_HOME /opt/gradle
-ENV GRADLE_VERSION 4.3
+ENV GRADLE_VERSION 4.3.1
 
-ARG GRADLE_DOWNLOAD_SHA256=8dcbf44eef92575b475dcb1ce12b5f19d38dc79e84c662670248dc8b8247654c
+ARG GRADLE_DOWNLOAD_SHA256=15ebe098ce0392a2d06d252bff24143cc88c4e963346582c8d88814758d93ac7
 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" \
diff --git a/gradle_jdk9/Dockerfile b/gradle_jdk9/Dockerfile
index 2c81638..5fed0fa 100644
--- a/gradle_jdk9/Dockerfile
+++ b/gradle_jdk9/Dockerfile
@@ -3,9 +3,12 @@ FROM openjdk:9-jdk
 CMD ["gradle"]
 
 ENV GRADLE_HOME /opt/gradle
-ENV GRADLE_VERSION 4.3
+ENV GRADLE_VERSION 4.3.1
 
-ARG GRADLE_DOWNLOAD_SHA256=8dcbf44eef92575b475dcb1ce12b5f19d38dc79e84c662670248dc8b8247654c
+# cacerts from JDK 8u152 to workaround http://bugs.java.com/view_bug.do?bug_id=8189357
+COPY cacerts /etc/ssl/certs/java/cacerts
+
+ARG GRADLE_DOWNLOAD_SHA256=15ebe098ce0392a2d06d252bff24143cc88c4e963346582c8d88814758d93ac7
 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" \
diff --git a/gradle_jdk9/cacerts b/gradle_jdk9/cacerts
new file mode 100644
index 0000000..6016be4
Binary files /dev/null and b/gradle_jdk9/cacerts differ
diff --git a/gradle_jre-alpine/Dockerfile b/gradle_jre-alpine/Dockerfile
index eb9fe76..97a814e 100644
--- a/gradle_jre-alpine/Dockerfile
+++ b/gradle_jre-alpine/Dockerfile
@@ -3,9 +3,9 @@ FROM openjdk:8-jre-alpine
 CMD ["gradle"]
 
 ENV GRADLE_HOME /opt/gradle
-ENV GRADLE_VERSION 4.3
+ENV GRADLE_VERSION 4.3.1
 
-ARG GRADLE_DOWNLOAD_SHA256=8dcbf44eef92575b475dcb1ce12b5f19d38dc79e84c662670248dc8b8247654c
+ARG GRADLE_DOWNLOAD_SHA256=15ebe098ce0392a2d06d252bff24143cc88c4e963346582c8d88814758d93ac7
 RUN set -o errexit -o nounset \
 	&& echo "Installing build dependencies" \
 	&& apk add --no-cache --virtual .build-deps \
diff --git a/gradle_jre/Dockerfile b/gradle_jre/Dockerfile
index ce923c5..e80269c 100644
--- a/gradle_jre/Dockerfile
+++ b/gradle_jre/Dockerfile
@@ -3,9 +3,9 @@ FROM openjdk:8-jre
 CMD ["gradle"]
 
 ENV GRADLE_HOME /opt/gradle
-ENV GRADLE_VERSION 4.3
+ENV GRADLE_VERSION 4.3.1
 
-ARG GRADLE_DOWNLOAD_SHA256=8dcbf44eef92575b475dcb1ce12b5f19d38dc79e84c662670248dc8b8247654c
+ARG GRADLE_DOWNLOAD_SHA256=15ebe098ce0392a2d06d252bff24143cc88c4e963346582c8d88814758d93ac7
 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" \
diff --git a/gradle_jre7-alpine/Dockerfile b/gradle_jre7-alpine/Dockerfile
index ecd2c8d..da88bf3 100644
--- a/gradle_jre7-alpine/Dockerfile
+++ b/gradle_jre7-alpine/Dockerfile
@@ -3,9 +3,9 @@ FROM openjdk:7-jre-alpine
 CMD ["gradle"]
 
 ENV GRADLE_HOME /opt/gradle
-ENV GRADLE_VERSION 4.3
+ENV GRADLE_VERSION 4.3.1
 
-ARG GRADLE_DOWNLOAD_SHA256=8dcbf44eef92575b475dcb1ce12b5f19d38dc79e84c662670248dc8b8247654c
+ARG GRADLE_DOWNLOAD_SHA256=15ebe098ce0392a2d06d252bff24143cc88c4e963346582c8d88814758d93ac7
 RUN set -o errexit -o nounset \
 	&& echo "Installing build dependencies" \
 	&& apk add --no-cache --virtual .build-deps \
diff --git a/gradle_jre7/Dockerfile b/gradle_jre7/Dockerfile
index 564c27d..5bf6276 100644
--- a/gradle_jre7/Dockerfile
+++ b/gradle_jre7/Dockerfile
@@ -3,9 +3,9 @@ FROM openjdk:7-jre
 CMD ["gradle"]
 
 ENV GRADLE_HOME /opt/gradle
-ENV GRADLE_VERSION 4.3
+ENV GRADLE_VERSION 4.3.1
 
-ARG GRADLE_DOWNLOAD_SHA256=8dcbf44eef92575b475dcb1ce12b5f19d38dc79e84c662670248dc8b8247654c
+ARG GRADLE_DOWNLOAD_SHA256=15ebe098ce0392a2d06d252bff24143cc88c4e963346582c8d88814758d93ac7
 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" \
diff --git a/gradle_jre9/Dockerfile b/gradle_jre9/Dockerfile
index e5d7163..1944fd9 100644
--- a/gradle_jre9/Dockerfile
+++ b/gradle_jre9/Dockerfile
@@ -3,9 +3,12 @@ FROM openjdk:9-jre
 CMD ["gradle"]
 
 ENV GRADLE_HOME /opt/gradle
-ENV GRADLE_VERSION 4.3
+ENV GRADLE_VERSION 4.3.1
 
-ARG GRADLE_DOWNLOAD_SHA256=8dcbf44eef92575b475dcb1ce12b5f19d38dc79e84c662670248dc8b8247654c
+# cacerts from JDK 8u152 to workaround http://bugs.java.com/view_bug.do?bug_id=8189357
+COPY cacerts /etc/ssl/certs/java/cacerts
+
+ARG GRADLE_DOWNLOAD_SHA256=15ebe098ce0392a2d06d252bff24143cc88c4e963346582c8d88814758d93ac7
 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" \
diff --git a/gradle_jre9/cacerts b/gradle_jre9/cacerts
new file mode 100644
index 0000000..6016be4
Binary files /dev/null and b/gradle_jre9/cacerts differ
diff --git a/gradle_latest/Dockerfile b/gradle_latest/Dockerfile
index de79715..6d9fb34 100644
--- a/gradle_latest/Dockerfile
+++ b/gradle_latest/Dockerfile
@@ -3,9 +3,9 @@ FROM openjdk:8-jdk
 CMD ["gradle"]
 
 ENV GRADLE_HOME /opt/gradle
-ENV GRADLE_VERSION 4.3
+ENV GRADLE_VERSION 4.3.1
 
-ARG GRADLE_DOWNLOAD_SHA256=8dcbf44eef92575b475dcb1ce12b5f19d38dc79e84c662670248dc8b8247654c
+ARG GRADLE_DOWNLOAD_SHA256=15ebe098ce0392a2d06d252bff24143cc88c4e963346582c8d88814758d93ac7
 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" \

Build test of #3734; 20d759b; amd64 (gradle):

$ bashbrew build gradle:4.3.1-jdk7
Building bashbrew/cache:7910d407ae02967a6f5b2c134c7f1e89f41a9205b4a4433c82313d28107af8a0 (gradle:4.3.1-jdk7)
Tagging gradle:4.3.1-jdk7
Tagging gradle:4.3-jdk7
Tagging gradle:jdk7

$ test/run.sh gradle:4.3.1-jdk7
testing gradle:4.3.1-jdk7
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build gradle:4.3.1-jre7
Building bashbrew/cache:7bc9b55deab076070686a6d3a99a56087f4c9598cb344f11108c35f527594c6c (gradle:4.3.1-jre7)
Tagging gradle:4.3.1-jre7
Tagging gradle:4.3-jre7
Tagging gradle:jre7

$ test/run.sh gradle:4.3.1-jre7
testing gradle:4.3.1-jre7
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build gradle:4.3.1-jdk7-alpine
Building bashbrew/cache:f6f980631653a37d28f273c87c4b67a68cde3c572073aee506a6b96141e5c2ce (gradle:4.3.1-jdk7-alpine)
Tagging gradle:4.3.1-jdk7-alpine
Tagging gradle:4.3-jdk7-alpine
Tagging gradle:jdk7-alpine

$ test/run.sh gradle:4.3.1-jdk7-alpine
testing gradle:4.3.1-jdk7-alpine
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build gradle:4.3.1-jre7-alpine
Building bashbrew/cache:1ff8cf51b5a9c32fde7fc409c8f533a9222e26f0b19615a0ad34c1d88eac62e0 (gradle:4.3.1-jre7-alpine)
Tagging gradle:4.3.1-jre7-alpine
Tagging gradle:4.3-jre7-alpine
Tagging gradle:jre7-alpine

$ test/run.sh gradle:4.3.1-jre7-alpine
testing gradle:4.3.1-jre7-alpine
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build gradle:4.3.1-jdk8
Building bashbrew/cache:210625fa5522b9217b3bd0b875fd1cfd24c97bfb3ba012ead13b294f8f1d4b69 (gradle:4.3.1-jdk8)
Tagging gradle:4.3.1-jdk8
Tagging gradle:4.3-jdk8
Tagging gradle:jdk8
Tagging gradle:4.3.1-jdk
Tagging gradle:4.3-jdk
Tagging gradle:jdk
Tagging gradle:4.3.1
Tagging gradle:4.3
Tagging gradle:latest

$ test/run.sh gradle:4.3.1-jdk8
testing gradle:4.3.1-jdk8
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build gradle:4.3.1-jre8
Building bashbrew/cache:69f98e812073e8025bff1917bf17c43094dca731625c5184af59946397dcd8fd (gradle:4.3.1-jre8)
Tagging gradle:4.3.1-jre8
Tagging gradle:4.3-jre8
Tagging gradle:jre8
Tagging gradle:4.3.1-jre
Tagging gradle:4.3-jre
Tagging gradle:jre

$ test/run.sh gradle:4.3.1-jre8
testing gradle:4.3.1-jre8
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build gradle:4.3.1-jdk8-alpine
Building bashbrew/cache:dc0dcec442d37f622e1ad5c357072057d524fc0ffdd1d07a042223b5a02f5eb8 (gradle:4.3.1-jdk8-alpine)
Tagging gradle:4.3.1-jdk8-alpine
Tagging gradle:4.3-jdk8-alpine
Tagging gradle:jdk8-alpine
Tagging gradle:4.3.1-jdk-alpine
Tagging gradle:4.3-jdk-alpine
Tagging gradle:jdk-alpine
Tagging gradle:4.3.1-alpine
Tagging gradle:4.3-alpine
Tagging gradle:alpine

$ test/run.sh gradle:4.3.1-jdk8-alpine
testing gradle:4.3.1-jdk8-alpine
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build gradle:4.3.1-jre8-alpine
Building bashbrew/cache:1ed20bbbd1fe701687c3554f5ef79a6a1cab80c37cc5cc55f99f8f22425244f3 (gradle:4.3.1-jre8-alpine)
Tagging gradle:4.3.1-jre8-alpine
Tagging gradle:4.3-jre8-alpine
Tagging gradle:jre8-alpine
Tagging gradle:4.3.1-jre-alpine
Tagging gradle:4.3-jre-alpine
Tagging gradle:jre-alpine

$ test/run.sh gradle:4.3.1-jre8-alpine
testing gradle:4.3.1-jre8-alpine
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build gradle:4.3.1-jdk9
Building bashbrew/cache:252578b7a0762e5b694ce2903597bb0c5bb723a678487bf920927b5def5b98f6 (gradle:4.3.1-jdk9)
Tagging gradle:4.3.1-jdk9
Tagging gradle:4.3-jdk9
Tagging gradle:jdk9

$ test/run.sh gradle:4.3.1-jdk9
testing gradle:4.3.1-jdk9
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build gradle:4.3.1-jre9
Building bashbrew/cache:c256cdd8eb614fc196e07dd984fbfba9e239b7d67ce633adc23b8b263e51c810 (gradle:4.3.1-jre9)
Tagging gradle:4.3.1-jre9
Tagging gradle:4.3-jre9
Tagging gradle:jre9

$ test/run.sh gradle:4.3.1-jre9
testing gradle:4.3.1-jre9
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed

@yosifkit yosifkit merged commit 33fbf13 into docker-library:master Nov 22, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants