Maven jdk-13, jdk-13-alpine, amazoncorretto-8 #5271
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Remove jdk-10 and jdk-10-slim
Diff:diff --git a/_bashbrew-arches b/_bashbrew-arches
index 8f9ecd2..157ddc1 100644
--- a/_bashbrew-arches
+++ b/_bashbrew-arches
@@ -1,3 +1,4 @@
+maven:3-amazoncorretto-8 @ amd64
maven:3-ibmjava-8 @ amd64
maven:3-ibmjava-8 @ i386
maven:3-ibmjava-8 @ ppc64le
@@ -30,22 +31,10 @@ maven:3-jdk-8-slim @ arm64v8
maven:3-jdk-8-slim @ i386
maven:3-jdk-8-slim @ ppc64le
maven:3-jdk-8-slim @ s390x
-maven:3-jdk-10 @ amd64
-maven:3-jdk-10 @ arm32v5
-maven:3-jdk-10 @ arm32v7
-maven:3-jdk-10 @ arm64v8
-maven:3-jdk-10 @ i386
-maven:3-jdk-10 @ ppc64le
-maven:3-jdk-10 @ s390x
-maven:3-jdk-10-slim @ amd64
-maven:3-jdk-10-slim @ arm32v5
-maven:3-jdk-10-slim @ arm32v7
-maven:3-jdk-10-slim @ arm64v8
-maven:3-jdk-10-slim @ i386
-maven:3-jdk-10-slim @ ppc64le
-maven:3-jdk-10-slim @ s390x
maven:3-jdk-12 @ amd64
maven:3-jdk-12-alpine @ amd64
+maven:3-jdk-13 @ amd64
+maven:3-jdk-13-alpine @ amd64
maven:alpine @ amd64
maven:alpine @ arm32v6
maven:alpine @ arm64v8
diff --git a/_bashbrew-list b/_bashbrew-list
index 5c17449..6ab0ae6 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,4 +1,5 @@
maven:3
+maven:3-amazoncorretto-8
maven:3-ibmjava-8
maven:3-ibmjava-8-alpine
maven:3-jdk-7
@@ -7,14 +8,15 @@ maven:3-jdk-7-slim
maven:3-jdk-8
maven:3-jdk-8-alpine
maven:3-jdk-8-slim
-maven:3-jdk-10
-maven:3-jdk-10-slim
maven:3-jdk-11
maven:3-jdk-11-slim
maven:3-jdk-12
maven:3-jdk-12-alpine
+maven:3-jdk-13
+maven:3-jdk-13-alpine
maven:3.6
maven:3.6-alpine
+maven:3.6-amazoncorretto-8
maven:3.6-ibmjava
maven:3.6-ibmjava-8
maven:3.6-ibmjava-8-alpine
@@ -25,15 +27,16 @@ maven:3.6-jdk-7-slim
maven:3.6-jdk-8
maven:3.6-jdk-8-alpine
maven:3.6-jdk-8-slim
-maven:3.6-jdk-10
-maven:3.6-jdk-10-slim
maven:3.6-jdk-11
maven:3.6-jdk-11-slim
maven:3.6-jdk-12
maven:3.6-jdk-12-alpine
+maven:3.6-jdk-13
+maven:3.6-jdk-13-alpine
maven:3.6-slim
maven:3.6.0
maven:3.6.0-alpine
+maven:3.6.0-amazoncorretto-8
maven:3.6.0-ibmjava
maven:3.6.0-ibmjava-8
maven:3.6.0-ibmjava-8-alpine
@@ -44,12 +47,12 @@ maven:3.6.0-jdk-7-slim
maven:3.6.0-jdk-8
maven:3.6.0-jdk-8-alpine
maven:3.6.0-jdk-8-slim
-maven:3.6.0-jdk-10
-maven:3.6.0-jdk-10-slim
maven:3.6.0-jdk-11
maven:3.6.0-jdk-11-slim
maven:3.6.0-jdk-12
maven:3.6.0-jdk-12-alpine
+maven:3.6.0-jdk-13
+maven:3.6.0-jdk-13-alpine
maven:3.6.0-slim
maven:alpine
maven:ibmjava-alpine
diff --git a/maven_3-jdk-12/Dockerfile b/maven_3-amazoncorretto-8/Dockerfile
similarity index 94%
copy from maven_3-jdk-12/Dockerfile
copy to maven_3-amazoncorretto-8/Dockerfile
index 38bf35d..6538c11 100644
--- a/maven_3-jdk-12/Dockerfile
+++ b/maven_3-amazoncorretto-8/Dockerfile
@@ -1,10 +1,12 @@
-FROM openjdk:12-jdk
+FROM amazoncorretto:8
ARG MAVEN_VERSION=3.6.0
ARG USER_HOME_DIR="/root"
ARG SHA=fae9c12b570c3ba18116a4e26ea524b29f7279c17cbaadc3326ca72927368924d9131d11b9e851b8dc9162228b6fdea955446be41207a5cfc61283dd8a561d2f
ARG BASE_URL=https://apache.osuosl.org/maven/maven-3/${MAVEN_VERSION}/binaries
+RUN yum install -y tar which
+
RUN mkdir -p /usr/share/maven /usr/share/maven/ref \
&& curl -fsSL -o /tmp/apache-maven.tar.gz ${BASE_URL}/apache-maven-${MAVEN_VERSION}-bin.tar.gz \
&& echo "${SHA} /tmp/apache-maven.tar.gz" | sha512sum -c - \
diff --git a/maven_3-jdk-10-slim/mvn-entrypoint.sh b/maven_3-amazoncorretto-8/mvn-entrypoint.sh
similarity index 100%
rename from maven_3-jdk-10-slim/mvn-entrypoint.sh
rename to maven_3-amazoncorretto-8/mvn-entrypoint.sh
diff --git a/maven_3-jdk-10-slim/settings-docker.xml b/maven_3-amazoncorretto-8/settings-docker.xml
similarity index 100%
rename from maven_3-jdk-10-slim/settings-docker.xml
rename to maven_3-amazoncorretto-8/settings-docker.xml
diff --git a/maven_3-jdk-10-slim/Dockerfile b/maven_3-jdk-10-slim/Dockerfile
deleted file mode 100644
index 1576cf7..0000000
diff --git a/maven_3-jdk-10/Dockerfile b/maven_3-jdk-10/Dockerfile
deleted file mode 100644
index a2ff7e3..0000000
diff --git a/maven_3-jdk-7-alpine/Dockerfile b/maven_3-jdk-13-alpine/Dockerfile
similarity index 97%
copy from maven_3-jdk-7-alpine/Dockerfile
copy to maven_3-jdk-13-alpine/Dockerfile
index b267f16..53fb922 100644
--- a/maven_3-jdk-7-alpine/Dockerfile
+++ b/maven_3-jdk-13-alpine/Dockerfile
@@ -1,4 +1,4 @@
-FROM openjdk:7-jdk-alpine
+FROM openjdk:13-jdk-alpine
RUN apk add --no-cache curl tar bash procps
diff --git a/maven_3-jdk-10/mvn-entrypoint.sh b/maven_3-jdk-13-alpine/mvn-entrypoint.sh
similarity index 100%
rename from maven_3-jdk-10/mvn-entrypoint.sh
rename to maven_3-jdk-13-alpine/mvn-entrypoint.sh
diff --git a/maven_3-jdk-10/settings-docker.xml b/maven_3-jdk-13-alpine/settings-docker.xml
similarity index 100%
rename from maven_3-jdk-10/settings-docker.xml
rename to maven_3-jdk-13-alpine/settings-docker.xml
diff --git a/maven_3-jdk-12/Dockerfile b/maven_3-jdk-13/Dockerfile
similarity index 97%
copy from maven_3-jdk-12/Dockerfile
copy to maven_3-jdk-13/Dockerfile
index 38bf35d..afdb46e 100644
--- a/maven_3-jdk-12/Dockerfile
+++ b/maven_3-jdk-13/Dockerfile
@@ -1,4 +1,4 @@
-FROM openjdk:12-jdk
+FROM openjdk:13-jdk
ARG MAVEN_VERSION=3.6.0
ARG USER_HOME_DIR="/root"
diff --git a/maven_3-ibmjava-8/mvn-entrypoint.sh b/maven_3-jdk-13/mvn-entrypoint.sh
similarity index 100%
copy from maven_3-ibmjava-8/mvn-entrypoint.sh
copy to maven_3-jdk-13/mvn-entrypoint.sh
diff --git a/maven_3-ibmjava-8/settings-docker.xml b/maven_3-jdk-13/settings-docker.xml
similarity index 100%
copy from maven_3-ibmjava-8/settings-docker.xml
copy to maven_3-jdk-13/settings-docker.xml |
|
Build test of #5271; 50bfbe0; $ bashbrew build maven:3.6.0-jdk-11-slim
Using bashbrew/cache:a1c1db3e43681bb84abf13ade1f319b99ad20e3d1c816aab88c348f47607ca9c (maven:3.6.0-jdk-11-slim)
Tagging maven:3.6.0-jdk-11-slim
Tagging maven:3.6.0-slim
Tagging maven:3.6-jdk-11-slim
Tagging maven:3.6-slim
Tagging maven:3-jdk-11-slim
Tagging maven:slim
$ test/run.sh maven:3.6.0-jdk-11-slim
testing maven:3.6.0-jdk-11-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 maven:3.6.0-jdk-11
Using bashbrew/cache:eeba846d51a59d25be4822a99049dc65e472e31241454d69cc8c87d508fa2b82 (maven:3.6.0-jdk-11)
Tagging maven:3.6.0-jdk-11
Tagging maven:3.6.0
Tagging maven:3.6-jdk-11
Tagging maven:3.6
Tagging maven:3-jdk-11
Tagging maven:3
Tagging maven:latest
$ test/run.sh maven:3.6.0-jdk-11
testing maven:3.6.0-jdk-11
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
$ bashbrew build maven:3.6.0-jdk-12-alpine
Using bashbrew/cache:c27b2603d32f0fc781e7b708857ffd3278064ce8af8f9ffa0ae01326fff32746 (maven:3.6.0-jdk-12-alpine)
Tagging maven:3.6.0-jdk-12-alpine
Tagging maven:3.6-jdk-12-alpine
Tagging maven:3-jdk-12-alpine
$ test/run.sh maven:3.6.0-jdk-12-alpine
testing maven:3.6.0-jdk-12-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 maven:3.6.0-jdk-12
Building bashbrew/cache:7f837fffa4775ce6adcb1f10b9e4c7d7325748193d6c79293cc555521a8decf7 (maven:3.6.0-jdk-12)
Tagging maven:3.6.0-jdk-12
Tagging maven:3.6-jdk-12
Tagging maven:3-jdk-12
$ test/run.sh maven:3.6.0-jdk-12
testing maven:3.6.0-jdk-12
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
$ bashbrew build maven:3.6.0-jdk-13-alpine
Building bashbrew/cache:361a9958bfb97a0f06c6f8e96cff058b61263d1d0e5b2720d5851b4a235087e7 (maven:3.6.0-jdk-13-alpine)
Tagging maven:3.6.0-jdk-13-alpine
Tagging maven:3.6-jdk-13-alpine
Tagging maven:3-jdk-13-alpine
$ test/run.sh maven:3.6.0-jdk-13-alpine
testing maven:3.6.0-jdk-13-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 maven:3.6.0-jdk-13
Building bashbrew/cache:3de36c9dbeeb0823c14d5812e038f78a2a78adea584aedf8c0b524393d122828 (maven:3.6.0-jdk-13)
Tagging maven:3.6.0-jdk-13
Tagging maven:3.6-jdk-13
Tagging maven:3-jdk-13
$ test/run.sh maven:3.6.0-jdk-13
testing maven:3.6.0-jdk-13
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
$ bashbrew build maven:3.6.0-jdk-7-alpine
Using bashbrew/cache:f9d67b2fa7f5c672ad42e325d669c9554ab1ff69db1f01b91d77dc017e5d235c (maven:3.6.0-jdk-7-alpine)
Tagging maven:3.6.0-jdk-7-alpine
Tagging maven:3.6-jdk-7-alpine
Tagging maven:3-jdk-7-alpine
$ test/run.sh maven:3.6.0-jdk-7-alpine
testing maven:3.6.0-jdk-7-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 maven:3.6.0-jdk-7-slim
Using bashbrew/cache:f6230ee413e01d56eac49f1fb1aeea4025c9716677dc28dbe551e75b1007a046 (maven:3.6.0-jdk-7-slim)
Tagging maven:3.6.0-jdk-7-slim
Tagging maven:3.6-jdk-7-slim
Tagging maven:3-jdk-7-slim
$ test/run.sh maven:3.6.0-jdk-7-slim
testing maven:3.6.0-jdk-7-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 maven:3.6.0-jdk-7
Using bashbrew/cache:6de0ec794f806c313cad1287ffd2ab1d6ea4760772da340e46421257270c55cc (maven:3.6.0-jdk-7)
Tagging maven:3.6.0-jdk-7
Tagging maven:3.6-jdk-7
Tagging maven:3-jdk-7
$ test/run.sh maven:3.6.0-jdk-7
testing maven:3.6.0-jdk-7
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
$ bashbrew build maven:3.6.0-jdk-8-alpine
Using bashbrew/cache:a4d7cf04edd98d9f2028ce283f9ed6f937838f902af7a9318757ffbac30f4154 (maven:3.6.0-jdk-8-alpine)
Tagging maven:3.6.0-jdk-8-alpine
Tagging maven:3.6.0-alpine
Tagging maven:3.6-jdk-8-alpine
Tagging maven:3.6-alpine
Tagging maven:3-jdk-8-alpine
Tagging maven:alpine
$ test/run.sh maven:3.6.0-jdk-8-alpine
testing maven:3.6.0-jdk-8-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 maven:3.6.0-jdk-8-slim
Using bashbrew/cache:dc62a5d0d3feb265cf6dc0458b18e8950692d3fc4c6f58c9d5e662e60134a7dd (maven:3.6.0-jdk-8-slim)
Tagging maven:3.6.0-jdk-8-slim
Tagging maven:3.6-jdk-8-slim
Tagging maven:3-jdk-8-slim
$ test/run.sh maven:3.6.0-jdk-8-slim
testing maven:3.6.0-jdk-8-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 maven:3.6.0-jdk-8
Using bashbrew/cache:e4f439a37c3e165587a2f05ad4834182048d0e4be7653635db96c0fff4a56f71 (maven:3.6.0-jdk-8)
Tagging maven:3.6.0-jdk-8
Tagging maven:3.6-jdk-8
Tagging maven:3-jdk-8
$ test/run.sh maven:3.6.0-jdk-8
testing maven:3.6.0-jdk-8
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
$ bashbrew build maven:3.6.0-ibmjava-8-alpine
Using bashbrew/cache:0c29b6dbe59c6133e620e20a48b43a7810ca35a3bf8b723e42c9d67beec8b2d9 (maven:3.6.0-ibmjava-8-alpine)
Tagging maven:3.6.0-ibmjava-8-alpine
Tagging maven:3.6.0-ibmjava-alpine
Tagging maven:3.6-ibmjava-8-alpine
Tagging maven:3.6-ibmjava-alpine
Tagging maven:3-ibmjava-8-alpine
Tagging maven:ibmjava-alpine
$ test/run.sh maven:3.6.0-ibmjava-8-alpine
testing maven:3.6.0-ibmjava-8-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 maven:3.6.0-ibmjava-8
Using bashbrew/cache:404543cb70d98f01cd8980feff00535689a81adc2d949f3649081f02b6dc9e09 (maven:3.6.0-ibmjava-8)
Tagging maven:3.6.0-ibmjava-8
Tagging maven:3.6.0-ibmjava
Tagging maven:3.6-ibmjava-8
Tagging maven:3.6-ibmjava
Tagging maven:3-ibmjava-8
$ test/run.sh maven:3.6.0-ibmjava-8
testing maven:3.6.0-ibmjava-8
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
$ bashbrew build maven:3.6.0-amazoncorretto-8
Building bashbrew/cache:3abbce49fa8542bd0452b7f4c742214e5d5ec1b0904b2665a9506d7d1f2fd551 (maven:3.6.0-amazoncorretto-8)
Tagging maven:3.6.0-amazoncorretto-8
Tagging maven:3.6-amazoncorretto-8
Tagging maven:3-amazoncorretto-8
$ test/run.sh maven:3.6.0-amazoncorretto-8
testing maven:3.6.0-amazoncorretto-8
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...warning: garbage password detected for 'root': '*LOCK*'
passed
'override-cmd' [4/4]...passed
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Remove jdk-10 and jdk-10-slim