Skip to content

Comments

Gradle 5.2#5400

Merged
yosifkit merged 2 commits intodocker-library:masterfrom
keeganwitt:gradle
Feb 6, 2019
Merged

Gradle 5.2#5400
yosifkit merged 2 commits intodocker-library:masterfrom
keeganwitt:gradle

Conversation

@keeganwitt
Copy link
Contributor

No description provided.

@yosifkit
Copy link
Member

yosifkit commented Feb 5, 2019

Same /opt issue as #5397 (comment)

@yosifkit
Copy link
Member

yosifkit commented Feb 6, 2019

Diff:
diff --git a/_bashbrew-list b/_bashbrew-list
index ff2f34a..7b6d8ab 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,41 +1,41 @@
-gradle:5.1
-gradle:5.1-alpine
-gradle:5.1-jdk
-gradle:5.1-jdk8
-gradle:5.1-jdk8-alpine
-gradle:5.1-jdk8-slim
-gradle:5.1-jdk11
-gradle:5.1-jdk11-slim
-gradle:5.1-jdk-alpine
-gradle:5.1-jdk-slim
-gradle:5.1-jre
-gradle:5.1-jre8
-gradle:5.1-jre8-alpine
-gradle:5.1-jre8-slim
-gradle:5.1-jre11
-gradle:5.1-jre11-slim
-gradle:5.1-jre-alpine
-gradle:5.1-jre-slim
-gradle:5.1-slim
-gradle:5.1.1
-gradle:5.1.1-alpine
-gradle:5.1.1-jdk
-gradle:5.1.1-jdk8
-gradle:5.1.1-jdk8-alpine
-gradle:5.1.1-jdk8-slim
-gradle:5.1.1-jdk11
-gradle:5.1.1-jdk11-slim
-gradle:5.1.1-jdk-alpine
-gradle:5.1.1-jdk-slim
-gradle:5.1.1-jre
-gradle:5.1.1-jre8
-gradle:5.1.1-jre8-alpine
-gradle:5.1.1-jre8-slim
-gradle:5.1.1-jre11
-gradle:5.1.1-jre11-slim
-gradle:5.1.1-jre-alpine
-gradle:5.1.1-jre-slim
-gradle:5.1.1-slim
+gradle:5.2
+gradle:5.2-alpine
+gradle:5.2-jdk
+gradle:5.2-jdk8
+gradle:5.2-jdk8-alpine
+gradle:5.2-jdk8-slim
+gradle:5.2-jdk11
+gradle:5.2-jdk11-slim
+gradle:5.2-jdk-alpine
+gradle:5.2-jdk-slim
+gradle:5.2-jre
+gradle:5.2-jre8
+gradle:5.2-jre8-alpine
+gradle:5.2-jre8-slim
+gradle:5.2-jre11
+gradle:5.2-jre11-slim
+gradle:5.2-jre-alpine
+gradle:5.2-jre-slim
+gradle:5.2-slim
+gradle:5.2.0
+gradle:5.2.0-alpine
+gradle:5.2.0-jdk
+gradle:5.2.0-jdk8
+gradle:5.2.0-jdk8-alpine
+gradle:5.2.0-jdk8-slim
+gradle:5.2.0-jdk11
+gradle:5.2.0-jdk11-slim
+gradle:5.2.0-jdk-alpine
+gradle:5.2.0-jdk-slim
+gradle:5.2.0-jre
+gradle:5.2.0-jre8
+gradle:5.2.0-jre8-alpine
+gradle:5.2.0-jre8-slim
+gradle:5.2.0-jre11
+gradle:5.2.0-jre11-slim
+gradle:5.2.0-jre-alpine
+gradle:5.2.0-jre-slim
+gradle:5.2.0-slim
 gradle:alpine
 gradle:jdk
 gradle:jdk8
diff --git a/gradle_alpine/Dockerfile b/gradle_alpine/Dockerfile
index f3d9e12..5cb3c4f 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 5.1.1
+ENV GRADLE_VERSION 5.2
 
-ARG GRADLE_DOWNLOAD_SHA256=4953323605c5d7b89e97d0dc7779e275bccedefcdac090aec123375eae0cc798
+ARG GRADLE_DOWNLOAD_SHA256=ff322863250159595e93b5a4d17a6f0d21c59a1a0497c1e1cf1d53826485503f
 RUN set -o errexit -o nounset \
     && echo "Downloading Gradle" \
     && wget -qO gradle.zip "https://services.gradle.org/distributions/gradle-${GRADLE_VERSION}-bin.zip" \
@@ -16,7 +16,7 @@ RUN set -o errexit -o nounset \
     && echo "Installing Gradle" \
     && unzip gradle.zip \
     && rm gradle.zip \
-    && mkdir /opt \
+    && mkdir -p /opt \
     && mv "gradle-${GRADLE_VERSION}" "${GRADLE_HOME}/" \
     && ln -s "${GRADLE_HOME}/bin/gradle" /usr/bin/gradle \
     \
diff --git a/gradle_jdk11-slim/Dockerfile b/gradle_jdk11-slim/Dockerfile
index f8ee683..d895a13 100644
--- a/gradle_jdk11-slim/Dockerfile
+++ b/gradle_jdk11-slim/Dockerfile
@@ -3,7 +3,7 @@ FROM openjdk:11-jdk-slim
 CMD ["gradle"]
 
 ENV GRADLE_HOME /opt/gradle
-ENV GRADLE_VERSION 5.1.1
+ENV GRADLE_VERSION 5.2
 
 RUN apt-get update && \
     apt-get install -y --no-install-recommends \
@@ -11,7 +11,7 @@ RUN apt-get update && \
         wget && \
     rm -rf /var/lib/apt/lists/*
 
-ARG GRADLE_DOWNLOAD_SHA256=4953323605c5d7b89e97d0dc7779e275bccedefcdac090aec123375eae0cc798
+ARG GRADLE_DOWNLOAD_SHA256=ff322863250159595e93b5a4d17a6f0d21c59a1a0497c1e1cf1d53826485503f
 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_jdk11/Dockerfile b/gradle_jdk11/Dockerfile
index 6278878..bc1d67e 100644
--- a/gradle_jdk11/Dockerfile
+++ b/gradle_jdk11/Dockerfile
@@ -3,9 +3,9 @@ FROM openjdk:11-jdk
 CMD ["gradle"]
 
 ENV GRADLE_HOME /opt/gradle
-ENV GRADLE_VERSION 5.1.1
+ENV GRADLE_VERSION 5.2
 
-ARG GRADLE_DOWNLOAD_SHA256=4953323605c5d7b89e97d0dc7779e275bccedefcdac090aec123375eae0cc798
+ARG GRADLE_DOWNLOAD_SHA256=ff322863250159595e93b5a4d17a6f0d21c59a1a0497c1e1cf1d53826485503f
 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_jre-alpine/Dockerfile b/gradle_jre-alpine/Dockerfile
index dc1f3eb..267ec1c 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 5.1.1
+ENV GRADLE_VERSION 5.2
 
-ARG GRADLE_DOWNLOAD_SHA256=4953323605c5d7b89e97d0dc7779e275bccedefcdac090aec123375eae0cc798
+ARG GRADLE_DOWNLOAD_SHA256=ff322863250159595e93b5a4d17a6f0d21c59a1a0497c1e1cf1d53826485503f
 RUN set -o errexit -o nounset \
     && echo "Downloading Gradle" \
     && wget -qO gradle.zip "https://services.gradle.org/distributions/gradle-${GRADLE_VERSION}-bin.zip" \
@@ -16,7 +16,7 @@ RUN set -o errexit -o nounset \
     && echo "Installing Gradle" \
     && unzip gradle.zip \
     && rm gradle.zip \
-    && mkdir /opt \
+    && mkdir -p /opt \
     && mv "gradle-${GRADLE_VERSION}" "${GRADLE_HOME}/" \
     && ln -s "${GRADLE_HOME}/bin/gradle" /usr/bin/gradle \
     \
diff --git a/gradle_jre-slim/Dockerfile b/gradle_jre-slim/Dockerfile
index 0d9d05e..dfbec16 100644
--- a/gradle_jre-slim/Dockerfile
+++ b/gradle_jre-slim/Dockerfile
@@ -3,7 +3,7 @@ FROM openjdk:8-jre-slim
 CMD ["gradle"]
 
 ENV GRADLE_HOME /opt/gradle
-ENV GRADLE_VERSION 5.1.1
+ENV GRADLE_VERSION 5.2
 
 RUN apt-get update && \
     apt-get install -y --no-install-recommends \
@@ -11,7 +11,7 @@ RUN apt-get update && \
         wget && \
     rm -rf /var/lib/apt/lists/*
 
-ARG GRADLE_DOWNLOAD_SHA256=4953323605c5d7b89e97d0dc7779e275bccedefcdac090aec123375eae0cc798
+ARG GRADLE_DOWNLOAD_SHA256=ff322863250159595e93b5a4d17a6f0d21c59a1a0497c1e1cf1d53826485503f
 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_jre/Dockerfile b/gradle_jre/Dockerfile
index a0819b2..36a0fe3 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 5.1.1
+ENV GRADLE_VERSION 5.2
 
-ARG GRADLE_DOWNLOAD_SHA256=4953323605c5d7b89e97d0dc7779e275bccedefcdac090aec123375eae0cc798
+ARG GRADLE_DOWNLOAD_SHA256=ff322863250159595e93b5a4d17a6f0d21c59a1a0497c1e1cf1d53826485503f
 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_jre11-slim/Dockerfile b/gradle_jre11-slim/Dockerfile
index d5a66ac..6b9d82e 100644
--- a/gradle_jre11-slim/Dockerfile
+++ b/gradle_jre11-slim/Dockerfile
@@ -3,7 +3,7 @@ FROM openjdk:11-jre-slim
 CMD ["gradle"]
 
 ENV GRADLE_HOME /opt/gradle
-ENV GRADLE_VERSION 5.1.1
+ENV GRADLE_VERSION 5.2
 
 RUN apt-get update && \
     apt-get install -y --no-install-recommends \
@@ -11,7 +11,7 @@ RUN apt-get update && \
         wget && \
     rm -rf /var/lib/apt/lists/*
 
-ARG GRADLE_DOWNLOAD_SHA256=4953323605c5d7b89e97d0dc7779e275bccedefcdac090aec123375eae0cc798
+ARG GRADLE_DOWNLOAD_SHA256=ff322863250159595e93b5a4d17a6f0d21c59a1a0497c1e1cf1d53826485503f
 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_jre11/Dockerfile b/gradle_jre11/Dockerfile
index 9e67494..ff59976 100644
--- a/gradle_jre11/Dockerfile
+++ b/gradle_jre11/Dockerfile
@@ -3,9 +3,9 @@ FROM openjdk:11-jre
 CMD ["gradle"]
 
 ENV GRADLE_HOME /opt/gradle
-ENV GRADLE_VERSION 5.1.1
+ENV GRADLE_VERSION 5.2
 
-ARG GRADLE_DOWNLOAD_SHA256=4953323605c5d7b89e97d0dc7779e275bccedefcdac090aec123375eae0cc798
+ARG GRADLE_DOWNLOAD_SHA256=ff322863250159595e93b5a4d17a6f0d21c59a1a0497c1e1cf1d53826485503f
 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_latest/Dockerfile b/gradle_latest/Dockerfile
index 294e031..3f53c3e 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 5.1.1
+ENV GRADLE_VERSION 5.2
 
-ARG GRADLE_DOWNLOAD_SHA256=4953323605c5d7b89e97d0dc7779e275bccedefcdac090aec123375eae0cc798
+ARG GRADLE_DOWNLOAD_SHA256=ff322863250159595e93b5a4d17a6f0d21c59a1a0497c1e1cf1d53826485503f
 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_slim/Dockerfile b/gradle_slim/Dockerfile
index 29887b5..d33d75d 100644
--- a/gradle_slim/Dockerfile
+++ b/gradle_slim/Dockerfile
@@ -3,7 +3,7 @@ FROM openjdk:8-jdk-slim
 CMD ["gradle"]
 
 ENV GRADLE_HOME /opt/gradle
-ENV GRADLE_VERSION 5.1.1
+ENV GRADLE_VERSION 5.2
 
 RUN apt-get update && \
     apt-get install -y --no-install-recommends \
@@ -11,7 +11,7 @@ RUN apt-get update && \
         wget && \
     rm -rf /var/lib/apt/lists/*
 
-ARG GRADLE_DOWNLOAD_SHA256=4953323605c5d7b89e97d0dc7779e275bccedefcdac090aec123375eae0cc798
+ARG GRADLE_DOWNLOAD_SHA256=ff322863250159595e93b5a4d17a6f0d21c59a1a0497c1e1cf1d53826485503f
 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 #5400; bda8896; amd64 (gradle):

$ bashbrew build gradle:5.2.0-jdk8
Building bashbrew/cache:f5ed410e91fc6372b88647aa28680dd9ec2a99bee6f98d11bd0a2562a36aaaa1 (gradle:5.2.0-jdk8)
Tagging gradle:5.2.0-jdk8
Tagging gradle:5.2-jdk8
Tagging gradle:jdk8
Tagging gradle:5.2.0-jdk
Tagging gradle:5.2-jdk
Tagging gradle:jdk
Tagging gradle:5.2.0
Tagging gradle:5.2
Tagging gradle:latest

$ test/run.sh gradle:5.2.0-jdk8
testing gradle:5.2.0-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:5.2.0-jre8
Building bashbrew/cache:08a3ae043456f7da7c2fe920c540c21015516a16c7bd3f21af941a1cd80a9996 (gradle:5.2.0-jre8)
Tagging gradle:5.2.0-jre8
Tagging gradle:5.2-jre8
Tagging gradle:jre8
Tagging gradle:5.2.0-jre
Tagging gradle:5.2-jre
Tagging gradle:jre

$ test/run.sh gradle:5.2.0-jre8
testing gradle:5.2.0-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:5.2.0-jdk8-alpine
Building bashbrew/cache:302860ab5d43e0a060313d39c4254345cf470a3a0874f751e9e1c386d8c871fe (gradle:5.2.0-jdk8-alpine)
Tagging gradle:5.2.0-jdk8-alpine
Tagging gradle:5.2-jdk8-alpine
Tagging gradle:jdk8-alpine
Tagging gradle:5.2.0-jdk-alpine
Tagging gradle:5.2-jdk-alpine
Tagging gradle:jdk-alpine
Tagging gradle:5.2.0-alpine
Tagging gradle:5.2-alpine
Tagging gradle:alpine

$ test/run.sh gradle:5.2.0-jdk8-alpine
testing gradle:5.2.0-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:5.2.0-jdk8-slim
Building bashbrew/cache:6c3456a7c700eb786ae20c28678a5c399b4ce059906ad745b0a712183de610f4 (gradle:5.2.0-jdk8-slim)
Tagging gradle:5.2.0-jdk8-slim
Tagging gradle:5.2-jdk8-slim
Tagging gradle:jdk8-slim
Tagging gradle:5.2.0-jdk-slim
Tagging gradle:5.2-jdk-slim
Tagging gradle:jdk-slim
Tagging gradle:5.2.0-slim
Tagging gradle:5.2-slim
Tagging gradle:slim

$ test/run.sh gradle:5.2.0-jdk8-slim
testing gradle:5.2.0-jdk8-slim
	'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:5.2.0-jre8-alpine
Building bashbrew/cache:f4d1c40d6f865aa90edc307851f9ad5df7f8cb033548b5be8e442e60cbc96b51 (gradle:5.2.0-jre8-alpine)
Tagging gradle:5.2.0-jre8-alpine
Tagging gradle:5.2-jre8-alpine
Tagging gradle:jre8-alpine
Tagging gradle:5.2.0-jre-alpine
Tagging gradle:5.2-jre-alpine
Tagging gradle:jre-alpine

$ test/run.sh gradle:5.2.0-jre8-alpine
testing gradle:5.2.0-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:5.2.0-jre8-slim
Building bashbrew/cache:2a08d61d12fb831e388a6bd30800143fe06100dcef5c6c9dd1811f77444fde34 (gradle:5.2.0-jre8-slim)
Tagging gradle:5.2.0-jre8-slim
Tagging gradle:5.2-jre8-slim
Tagging gradle:jre8-slim
Tagging gradle:5.2.0-jre-slim
Tagging gradle:5.2-jre-slim
Tagging gradle:jre-slim

$ test/run.sh gradle:5.2.0-jre8-slim
testing gradle:5.2.0-jre8-slim
	'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:5.2.0-jdk11
Building bashbrew/cache:f62cec97a06632aadcc9262250a6fbd26057e5ea5e0df84fc68bc2c92726d680 (gradle:5.2.0-jdk11)
Tagging gradle:5.2.0-jdk11
Tagging gradle:5.2-jdk11
Tagging gradle:jdk11

$ test/run.sh gradle:5.2.0-jdk11
testing gradle:5.2.0-jdk11
	'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:5.2.0-jdk11-slim
Building bashbrew/cache:c1759cb5e058efea481eaed9b4c58c047cc140eda4788c52b97274b4a135bf95 (gradle:5.2.0-jdk11-slim)
Tagging gradle:5.2.0-jdk11-slim
Tagging gradle:5.2-jdk11-slim
Tagging gradle:jdk11-slim

$ test/run.sh gradle:5.2.0-jdk11-slim
testing gradle:5.2.0-jdk11-slim
	'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:5.2.0-jre11
Building bashbrew/cache:db64382bf4b38ed05f6b5ac0da19e6e987504dbfe613b344ca4d20c4cad36a55 (gradle:5.2.0-jre11)
Tagging gradle:5.2.0-jre11
Tagging gradle:5.2-jre11
Tagging gradle:jre11

$ test/run.sh gradle:5.2.0-jre11
testing gradle:5.2.0-jre11
	'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:5.2.0-jre11-slim
Building bashbrew/cache:497dea09134825a88ab556c9f11ad4a47d446873c1d8894815de19d6d15a9fb8 (gradle:5.2.0-jre11-slim)
Tagging gradle:5.2.0-jre11-slim
Tagging gradle:5.2-jre11-slim
Tagging gradle:jre11-slim

$ test/run.sh gradle:5.2.0-jre11-slim
testing gradle:5.2.0-jre11-slim
	'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 0353b27 into docker-library:master Feb 6, 2019
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.

3 participants