Respin x.0.0 for v11-16 to include sbt fix [release] (#103)

CircleCI-Public · Sep 26, 2021 · ef61173 · ef61173
1 parent 66977ce
commit ef61173
Show file tree

Hide file tree

Showing 9 changed files with 62 additions and 54 deletions.
diff --git a/.build-images.sh.swp b/.build-images.sh.swp
diff --git a/11.0/Dockerfile b/11.0/Dockerfile
@@ -12,10 +12,9 @@ RUN curl -sSL -o java.tar.gz "${URL}" && \
 	sudo mkdir /usr/local/jdk-${JAVA_VERSION} && \
 	sudo tar -xzf java.tar.gz --strip-components=1 -C /usr/local/jdk-${JAVA_VERSION} && \
 	rm java.tar.gz && \
-		if [[ "$JAVA_VERSION" == *"0.0"* ]]; then \
-			sudo ln -s /usr/local/jdk-${JAVA_VERSION} /usr/local/jdk-11; \
-		fi && \
-\
+	if [[ "$JAVA_VERSION" == *"0.0"* ]]; then \
+		sudo ln -s /usr/local/jdk-${JAVA_VERSION} /usr/local/jdk-11; \
+	fi && \
 	sudo ln -s /usr/local/jdk-${JAVA_VERSION}/bin/java /usr/bin/java && \
 	sudo ln -s /usr/local/jdk-${JAVA_VERSION}/bin/javac /usr/bin/javac && \
 	sudo ln -s /usr/local/jdk-${JAVA_VERSION}/bin/javaws /usr/bin/javaws && \
@@ -28,7 +27,7 @@ RUN curl -sSL -o java.tar.gz "${URL}" && \
 	java --version || java -version && \
 	javac --version || javac -version
 
-ENV MAVEN_VERSION=3.8.1 \
+ENV MAVEN_VERSION=3.8.2 \
 	PATH=/opt/apache-maven/bin:$PATH
 RUN dl_URL="https://www.apache.org/dist/maven/maven-3/$MAVEN_VERSION/binaries/apache-maven-${MAVEN_VERSION}-bin.tar.gz" && \
 	curl -sSL --fail --retry 3 $dl_URL -o apache-maven.tar.gz && \
@@ -37,7 +36,7 @@ RUN dl_URL="https://www.apache.org/dist/maven/maven-3/$MAVEN_VERSION/binaries/ap
 	sudo ln -s /opt/apache-maven-* /opt/apache-maven && \
 	mvn --version
 
-ENV GRADLE_VERSION=7.1.1 \
+ENV GRADLE_VERSION=7.2 \
 	PATH=/opt/gradle/bin:$PATH
 RUN dl_URL="https://services.gradle.org/distributions/gradle-${GRADLE_VERSION}-bin.zip" && \
 	curl -sSL --fail --retry 3 $dl_URL -o gradle.zip && \
@@ -51,6 +50,6 @@ ENV SBT_VERSION=1.5.5 \
 RUN dl_URL="https://github.com/sbt/sbt/releases/download/v${SBT_VERSION}/sbt-${SBT_VERSION}.tgz" && \
 	curl -sSL --fail --retry 3 $dl_URL -o sbt.tar.gz && \
 	sudo tar -xzf sbt.tar.gz -C /opt/ && \
-	rm sbt.tar.gz && \
 	sudo ln -s /opt/sbt-* /opt/sbt && \
-	sbt --version
+	sbt about && \
+	rm -r sbt.tar.gz ~/project/project ~/project/target
diff --git a/12.0/Dockerfile b/12.0/Dockerfile
@@ -12,10 +12,9 @@ RUN curl -sSL -o java.tar.gz "${URL}" && \
 	sudo mkdir /usr/local/jdk-${JAVA_VERSION} && \
 	sudo tar -xzf java.tar.gz --strip-components=1 -C /usr/local/jdk-${JAVA_VERSION} && \
 	rm java.tar.gz && \
-		if [[ "$JAVA_VERSION" == *"0.0"* ]]; then \
-			sudo ln -s /usr/local/jdk-${JAVA_VERSION} /usr/local/jdk-12; \
-		fi && \
-\
+	if [[ "$JAVA_VERSION" == *"0.0"* ]]; then \
+		sudo ln -s /usr/local/jdk-${JAVA_VERSION} /usr/local/jdk-12; \
+	fi && \
 	sudo ln -s /usr/local/jdk-${JAVA_VERSION}/bin/java /usr/bin/java && \
 	sudo ln -s /usr/local/jdk-${JAVA_VERSION}/bin/javac /usr/bin/javac && \
 	sudo ln -s /usr/local/jdk-${JAVA_VERSION}/bin/javaws /usr/bin/javaws && \
@@ -28,7 +27,7 @@ RUN curl -sSL -o java.tar.gz "${URL}" && \
 	java --version || java -version && \
 	javac --version || javac -version
 
-ENV MAVEN_VERSION=3.8.1 \
+ENV MAVEN_VERSION=3.8.2 \
 	PATH=/opt/apache-maven/bin:$PATH
 RUN dl_URL="https://www.apache.org/dist/maven/maven-3/$MAVEN_VERSION/binaries/apache-maven-${MAVEN_VERSION}-bin.tar.gz" && \
 	curl -sSL --fail --retry 3 $dl_URL -o apache-maven.tar.gz && \
@@ -37,7 +36,7 @@ RUN dl_URL="https://www.apache.org/dist/maven/maven-3/$MAVEN_VERSION/binaries/ap
 	sudo ln -s /opt/apache-maven-* /opt/apache-maven && \
 	mvn --version
 
-ENV GRADLE_VERSION=7.1.1 \
+ENV GRADLE_VERSION=7.2 \
 	PATH=/opt/gradle/bin:$PATH
 RUN dl_URL="https://services.gradle.org/distributions/gradle-${GRADLE_VERSION}-bin.zip" && \
 	curl -sSL --fail --retry 3 $dl_URL -o gradle.zip && \
@@ -51,6 +50,6 @@ ENV SBT_VERSION=1.5.5 \
 RUN dl_URL="https://github.com/sbt/sbt/releases/download/v${SBT_VERSION}/sbt-${SBT_VERSION}.tgz" && \
 	curl -sSL --fail --retry 3 $dl_URL -o sbt.tar.gz && \
 	sudo tar -xzf sbt.tar.gz -C /opt/ && \
-	rm sbt.tar.gz && \
 	sudo ln -s /opt/sbt-* /opt/sbt && \
-	sbt --version
+	sbt about && \
+	rm -r sbt.tar.gz ~/project/project ~/project/target
diff --git a/13.0/Dockerfile b/13.0/Dockerfile
@@ -12,10 +12,9 @@ RUN curl -sSL -o java.tar.gz "${URL}" && \
 	sudo mkdir /usr/local/jdk-${JAVA_VERSION} && \
 	sudo tar -xzf java.tar.gz --strip-components=1 -C /usr/local/jdk-${JAVA_VERSION} && \
 	rm java.tar.gz && \
-		if [[ "$JAVA_VERSION" == *"0.0"* ]]; then \
-			sudo ln -s /usr/local/jdk-${JAVA_VERSION} /usr/local/jdk-13; \
-		fi && \
-\
+	if [[ "$JAVA_VERSION" == *"0.0"* ]]; then \
+		sudo ln -s /usr/local/jdk-${JAVA_VERSION} /usr/local/jdk-13; \
+	fi && \
 	sudo ln -s /usr/local/jdk-${JAVA_VERSION}/bin/java /usr/bin/java && \
 	sudo ln -s /usr/local/jdk-${JAVA_VERSION}/bin/javac /usr/bin/javac && \
 	sudo ln -s /usr/local/jdk-${JAVA_VERSION}/bin/javaws /usr/bin/javaws && \
@@ -28,7 +27,7 @@ RUN curl -sSL -o java.tar.gz "${URL}" && \
 	java --version || java -version && \
 	javac --version || javac -version
 
-ENV MAVEN_VERSION=3.8.1 \
+ENV MAVEN_VERSION=3.8.2 \
 	PATH=/opt/apache-maven/bin:$PATH
 RUN dl_URL="https://www.apache.org/dist/maven/maven-3/$MAVEN_VERSION/binaries/apache-maven-${MAVEN_VERSION}-bin.tar.gz" && \
 	curl -sSL --fail --retry 3 $dl_URL -o apache-maven.tar.gz && \
@@ -37,7 +36,7 @@ RUN dl_URL="https://www.apache.org/dist/maven/maven-3/$MAVEN_VERSION/binaries/ap
 	sudo ln -s /opt/apache-maven-* /opt/apache-maven && \
 	mvn --version
 
-ENV GRADLE_VERSION=7.1.1 \
+ENV GRADLE_VERSION=7.2 \
 	PATH=/opt/gradle/bin:$PATH
 RUN dl_URL="https://services.gradle.org/distributions/gradle-${GRADLE_VERSION}-bin.zip" && \
 	curl -sSL --fail --retry 3 $dl_URL -o gradle.zip && \
@@ -51,6 +50,6 @@ ENV SBT_VERSION=1.5.5 \
 RUN dl_URL="https://github.com/sbt/sbt/releases/download/v${SBT_VERSION}/sbt-${SBT_VERSION}.tgz" && \
 	curl -sSL --fail --retry 3 $dl_URL -o sbt.tar.gz && \
 	sudo tar -xzf sbt.tar.gz -C /opt/ && \
-	rm sbt.tar.gz && \
 	sudo ln -s /opt/sbt-* /opt/sbt && \
-	sbt --version
+	sbt about && \
+	rm -r sbt.tar.gz ~/project/project ~/project/target
diff --git a/14.0/Dockerfile b/14.0/Dockerfile
@@ -12,10 +12,9 @@ RUN curl -sSL -o java.tar.gz "${URL}" && \
 	sudo mkdir /usr/local/jdk-${JAVA_VERSION} && \
 	sudo tar -xzf java.tar.gz --strip-components=1 -C /usr/local/jdk-${JAVA_VERSION} && \
 	rm java.tar.gz && \
-		if [[ "$JAVA_VERSION" == *"0.0"* ]]; then \
-			sudo ln -s /usr/local/jdk-${JAVA_VERSION} /usr/local/jdk-14; \
-		fi && \
-\
+	if [[ "$JAVA_VERSION" == *"0.0"* ]]; then \
+		sudo ln -s /usr/local/jdk-${JAVA_VERSION} /usr/local/jdk-14; \
+	fi && \
 	sudo ln -s /usr/local/jdk-${JAVA_VERSION}/bin/java /usr/bin/java && \
 	sudo ln -s /usr/local/jdk-${JAVA_VERSION}/bin/javac /usr/bin/javac && \
 	sudo ln -s /usr/local/jdk-${JAVA_VERSION}/bin/javaws /usr/bin/javaws && \
@@ -28,7 +27,7 @@ RUN curl -sSL -o java.tar.gz "${URL}" && \
 	java --version || java -version && \
 	javac --version || javac -version
 
-ENV MAVEN_VERSION=3.8.1 \
+ENV MAVEN_VERSION=3.8.2 \
 	PATH=/opt/apache-maven/bin:$PATH
 RUN dl_URL="https://www.apache.org/dist/maven/maven-3/$MAVEN_VERSION/binaries/apache-maven-${MAVEN_VERSION}-bin.tar.gz" && \
 	curl -sSL --fail --retry 3 $dl_URL -o apache-maven.tar.gz && \
@@ -37,7 +36,7 @@ RUN dl_URL="https://www.apache.org/dist/maven/maven-3/$MAVEN_VERSION/binaries/ap
 	sudo ln -s /opt/apache-maven-* /opt/apache-maven && \
 	mvn --version
 
-ENV GRADLE_VERSION=7.1.1 \
+ENV GRADLE_VERSION=7.2 \
 	PATH=/opt/gradle/bin:$PATH
 RUN dl_URL="https://services.gradle.org/distributions/gradle-${GRADLE_VERSION}-bin.zip" && \
 	curl -sSL --fail --retry 3 $dl_URL -o gradle.zip && \
@@ -51,6 +50,6 @@ ENV SBT_VERSION=1.5.5 \
 RUN dl_URL="https://github.com/sbt/sbt/releases/download/v${SBT_VERSION}/sbt-${SBT_VERSION}.tgz" && \
 	curl -sSL --fail --retry 3 $dl_URL -o sbt.tar.gz && \
 	sudo tar -xzf sbt.tar.gz -C /opt/ && \
-	rm sbt.tar.gz && \
 	sudo ln -s /opt/sbt-* /opt/sbt && \
-	sbt --version
+	sbt about && \
+	rm -r sbt.tar.gz ~/project/project ~/project/target
diff --git a/15.0/Dockerfile b/15.0/Dockerfile
@@ -12,10 +12,9 @@ RUN curl -sSL -o java.tar.gz "${URL}" && \
 	sudo mkdir /usr/local/jdk-${JAVA_VERSION} && \
 	sudo tar -xzf java.tar.gz --strip-components=1 -C /usr/local/jdk-${JAVA_VERSION} && \
 	rm java.tar.gz && \
-		if [[ "$JAVA_VERSION" == *"0.0"* ]]; then \
-			sudo ln -s /usr/local/jdk-${JAVA_VERSION} /usr/local/jdk-15; \
-		fi && \
-\
+	if [[ "$JAVA_VERSION" == *"0.0"* ]]; then \
+		sudo ln -s /usr/local/jdk-${JAVA_VERSION} /usr/local/jdk-15; \
+	fi && \
 	sudo ln -s /usr/local/jdk-${JAVA_VERSION}/bin/java /usr/bin/java && \
 	sudo ln -s /usr/local/jdk-${JAVA_VERSION}/bin/javac /usr/bin/javac && \
 	sudo ln -s /usr/local/jdk-${JAVA_VERSION}/bin/javaws /usr/bin/javaws && \
@@ -28,7 +27,7 @@ RUN curl -sSL -o java.tar.gz "${URL}" && \
 	java --version || java -version && \
 	javac --version || javac -version
 
-ENV MAVEN_VERSION=3.8.1 \
+ENV MAVEN_VERSION=3.8.2 \
 	PATH=/opt/apache-maven/bin:$PATH
 RUN dl_URL="https://www.apache.org/dist/maven/maven-3/$MAVEN_VERSION/binaries/apache-maven-${MAVEN_VERSION}-bin.tar.gz" && \
 	curl -sSL --fail --retry 3 $dl_URL -o apache-maven.tar.gz && \
@@ -37,7 +36,7 @@ RUN dl_URL="https://www.apache.org/dist/maven/maven-3/$MAVEN_VERSION/binaries/ap
 	sudo ln -s /opt/apache-maven-* /opt/apache-maven && \
 	mvn --version
 
-ENV GRADLE_VERSION=7.1.1 \
+ENV GRADLE_VERSION=7.2 \
 	PATH=/opt/gradle/bin:$PATH
 RUN dl_URL="https://services.gradle.org/distributions/gradle-${GRADLE_VERSION}-bin.zip" && \
 	curl -sSL --fail --retry 3 $dl_URL -o gradle.zip && \
@@ -51,6 +50,6 @@ ENV SBT_VERSION=1.5.5 \
 RUN dl_URL="https://github.com/sbt/sbt/releases/download/v${SBT_VERSION}/sbt-${SBT_VERSION}.tgz" && \
 	curl -sSL --fail --retry 3 $dl_URL -o sbt.tar.gz && \
 	sudo tar -xzf sbt.tar.gz -C /opt/ && \
-	rm sbt.tar.gz && \
 	sudo ln -s /opt/sbt-* /opt/sbt && \
-	sbt --version
+	sbt about && \
+	rm -r sbt.tar.gz ~/project/project ~/project/target
diff --git a/16.0/Dockerfile b/16.0/Dockerfile
@@ -12,10 +12,9 @@ RUN curl -sSL -o java.tar.gz "${URL}" && \
 	sudo mkdir /usr/local/jdk-${JAVA_VERSION} && \
 	sudo tar -xzf java.tar.gz --strip-components=1 -C /usr/local/jdk-${JAVA_VERSION} && \
 	rm java.tar.gz && \
-		if [[ "$JAVA_VERSION" == *"0.0"* ]]; then \
-			sudo ln -s /usr/local/jdk-${JAVA_VERSION} /usr/local/jdk-16; \
-		fi && \
-\
+	if [[ "$JAVA_VERSION" == *"0.0"* ]]; then \
+		sudo ln -s /usr/local/jdk-${JAVA_VERSION} /usr/local/jdk-16; \
+	fi && \
 	sudo ln -s /usr/local/jdk-${JAVA_VERSION}/bin/java /usr/bin/java && \
 	sudo ln -s /usr/local/jdk-${JAVA_VERSION}/bin/javac /usr/bin/javac && \
 	sudo ln -s /usr/local/jdk-${JAVA_VERSION}/bin/javaws /usr/bin/javaws && \
@@ -28,7 +27,7 @@ RUN curl -sSL -o java.tar.gz "${URL}" && \
 	java --version || java -version && \
 	javac --version || javac -version
 
-ENV MAVEN_VERSION=3.8.1 \
+ENV MAVEN_VERSION=3.8.2 \
 	PATH=/opt/apache-maven/bin:$PATH
 RUN dl_URL="https://www.apache.org/dist/maven/maven-3/$MAVEN_VERSION/binaries/apache-maven-${MAVEN_VERSION}-bin.tar.gz" && \
 	curl -sSL --fail --retry 3 $dl_URL -o apache-maven.tar.gz && \
@@ -37,7 +36,7 @@ RUN dl_URL="https://www.apache.org/dist/maven/maven-3/$MAVEN_VERSION/binaries/ap
 	sudo ln -s /opt/apache-maven-* /opt/apache-maven && \
 	mvn --version
 
-ENV GRADLE_VERSION=7.1.1 \
+ENV GRADLE_VERSION=7.2 \
 	PATH=/opt/gradle/bin:$PATH
 RUN dl_URL="https://services.gradle.org/distributions/gradle-${GRADLE_VERSION}-bin.zip" && \
 	curl -sSL --fail --retry 3 $dl_URL -o gradle.zip && \
@@ -51,6 +50,6 @@ ENV SBT_VERSION=1.5.5 \
 RUN dl_URL="https://github.com/sbt/sbt/releases/download/v${SBT_VERSION}/sbt-${SBT_VERSION}.tgz" && \
 	curl -sSL --fail --retry 3 $dl_URL -o sbt.tar.gz && \
 	sudo tar -xzf sbt.tar.gz -C /opt/ && \
-	rm sbt.tar.gz && \
 	sudo ln -s /opt/sbt-* /opt/sbt && \
-	sbt --version
+	sbt about && \
+	rm -r sbt.tar.gz ~/project/project ~/project/target
diff --git a/Dockerfile.template b/Dockerfile.template
@@ -12,10 +12,9 @@ RUN curl -sSL -o java.tar.gz "${URL}" && \
 	sudo mkdir /usr/local/jdk-${JAVA_VERSION} && \
 	sudo tar -xzf java.tar.gz --strip-components=1 -C /usr/local/jdk-${JAVA_VERSION} && \
 	rm java.tar.gz && \
-		if [[ "$JAVA_VERSION" == *"0.0"* ]]; then \
-			sudo ln -s /usr/local/jdk-${JAVA_VERSION} /usr/local/jdk-%%VERSION_MAJOR%%; \
-		fi && \
-\
+	if [[ "$JAVA_VERSION" == *"0.0"* ]]; then \
+		sudo ln -s /usr/local/jdk-${JAVA_VERSION} /usr/local/jdk-%%VERSION_MAJOR%%; \
+	fi && \
 	sudo ln -s /usr/local/jdk-${JAVA_VERSION}/bin/java /usr/bin/java && \
 	sudo ln -s /usr/local/jdk-${JAVA_VERSION}/bin/javac /usr/bin/javac && \
 	sudo ln -s /usr/local/jdk-${JAVA_VERSION}/bin/javaws /usr/bin/javaws && \
@@ -51,6 +50,6 @@ ENV SBT_VERSION=1.5.5 \
 RUN dl_URL="https://github.com/sbt/sbt/releases/download/v${SBT_VERSION}/sbt-${SBT_VERSION}.tgz" && \
 	curl -sSL --fail --retry 3 $dl_URL -o sbt.tar.gz && \
 	sudo tar -xzf sbt.tar.gz -C /opt/ && \
-	rm sbt.tar.gz && \
 	sudo ln -s /opt/sbt-* /opt/sbt && \
-	sbt --version
+	sbt about && \
+	rm -r sbt.tar.gz ~/project/project ~/project/target
diff --git a/build-images.sh b/build-images.sh
@@ -3,3 +3,18 @@
 docker build --file 11.0/Dockerfile -t cimg/openjdk:11.0.0  -t cimg/openjdk:11.0 .
 docker build --file 11.0/node/Dockerfile -t cimg/openjdk:11.0.0-node  -t cimg/openjdk:11.0-node .
 docker build --file 11.0/browsers/Dockerfile -t cimg/openjdk:11.0.0-browsers  -t cimg/openjdk:11.0-browsers .
+docker build --file 12.0/Dockerfile -t cimg/openjdk:12.0.0  -t cimg/openjdk:12.0 .
+docker build --file 12.0/node/Dockerfile -t cimg/openjdk:12.0.0-node  -t cimg/openjdk:12.0-node .
+docker build --file 12.0/browsers/Dockerfile -t cimg/openjdk:12.0.0-browsers  -t cimg/openjdk:12.0-browsers .
+docker build --file 13.0/Dockerfile -t cimg/openjdk:13.0.0  -t cimg/openjdk:13.0 .
+docker build --file 13.0/node/Dockerfile -t cimg/openjdk:13.0.0-node  -t cimg/openjdk:13.0-node .
+docker build --file 13.0/browsers/Dockerfile -t cimg/openjdk:13.0.0-browsers  -t cimg/openjdk:13.0-browsers .
+docker build --file 14.0/Dockerfile -t cimg/openjdk:14.0.0  -t cimg/openjdk:14.0 .
+docker build --file 14.0/node/Dockerfile -t cimg/openjdk:14.0.0-node  -t cimg/openjdk:14.0-node .
+docker build --file 14.0/browsers/Dockerfile -t cimg/openjdk:14.0.0-browsers  -t cimg/openjdk:14.0-browsers .
+docker build --file 15.0/Dockerfile -t cimg/openjdk:15.0.0  -t cimg/openjdk:15.0 .
+docker build --file 15.0/node/Dockerfile -t cimg/openjdk:15.0.0-node  -t cimg/openjdk:15.0-node .
+docker build --file 15.0/browsers/Dockerfile -t cimg/openjdk:15.0.0-browsers  -t cimg/openjdk:15.0-browsers .
+docker build --file 16.0/Dockerfile -t cimg/openjdk:16.0.0  -t cimg/openjdk:16.0 .
+docker build --file 16.0/node/Dockerfile -t cimg/openjdk:16.0.0-node  -t cimg/openjdk:16.0-node .
+docker build --file 16.0/browsers/Dockerfile -t cimg/openjdk:16.0.0-browsers  -t cimg/openjdk:16.0-browsers .