Update Maven with multiple architectures! #3445
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
Diff:diff --git a/_bashbrew-arches b/_bashbrew-arches
index 8b47588..20d961b 100644
--- a/_bashbrew-arches
+++ b/_bashbrew-arches
@@ -1,12 +1,54 @@
maven:3-ibmjava-9 @ amd64
+maven:3-ibmjava-9 @ i386
+maven:3-ibmjava-9 @ ppc64le
+maven:3-ibmjava-9 @ s390x
maven:3-ibmjava-9-alpine @ amd64
maven:3-jdk-7 @ amd64
+maven:3-jdk-7 @ arm32v5
+maven:3-jdk-7 @ arm32v7
+maven:3-jdk-7 @ arm64v8
+maven:3-jdk-7 @ i386
+maven:3-jdk-7 @ ppc64le
+maven:3-jdk-7 @ s390x
maven:3-jdk-7-alpine @ amd64
maven:3-jdk-7-slim @ amd64
+maven:3-jdk-7-slim @ arm32v5
+maven:3-jdk-7-slim @ arm32v7
+maven:3-jdk-7-slim @ arm64v8
+maven:3-jdk-7-slim @ i386
+maven:3-jdk-7-slim @ ppc64le
+maven:3-jdk-7-slim @ s390x
maven:3-jdk-9 @ amd64
+maven:3-jdk-9 @ arm32v5
+maven:3-jdk-9 @ arm32v7
+maven:3-jdk-9 @ arm64v8
+maven:3-jdk-9 @ i386
+maven:3-jdk-9 @ ppc64le
+maven:3-jdk-9 @ s390x
maven:3-jdk-9-slim @ amd64
+maven:3-jdk-9-slim @ arm32v5
+maven:3-jdk-9-slim @ arm32v7
+maven:3-jdk-9-slim @ arm64v8
+maven:3-jdk-9-slim @ i386
+maven:3-jdk-9-slim @ ppc64le
+maven:3-jdk-9-slim @ s390x
maven:alpine @ amd64
maven:ibmjava @ amd64
+maven:ibmjava @ i386
+maven:ibmjava @ ppc64le
+maven:ibmjava @ s390x
maven:ibmjava-alpine @ amd64
maven:latest @ amd64
+maven:latest @ arm32v5
+maven:latest @ arm32v7
+maven:latest @ arm64v8
+maven:latest @ i386
+maven:latest @ ppc64le
+maven:latest @ s390x
maven:slim @ amd64
+maven:slim @ arm32v5
+maven:slim @ arm32v7
+maven:slim @ arm64v8
+maven:slim @ i386
+maven:slim @ ppc64le
+maven:slim @ s390x
diff --git a/maven_3-jdk-9-slim/Dockerfile b/maven_3-jdk-9-slim/Dockerfile
index 0359bd4..3a77ff0 100644
--- a/maven_3-jdk-9-slim/Dockerfile
+++ b/maven_3-jdk-9-slim/Dockerfile
@@ -13,7 +13,7 @@ RUN apt-get update && \
# Maven fails with 'Can't read cryptographic policy directory: unlimited'
# because it looks for $JAVA_HOME/conf/security/policy/unlimited but it is in
# /etc/java-9-openjdk/security/policy/unlimited
-RUN ln -s /etc/java-9-openjdk /usr/lib/jvm/java-9-openjdk-amd64/conf
+RUN ln -s /etc/java-9-openjdk /usr/lib/jvm/java-9-openjdk-$(dpkg --print-architecture)/conf
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 \
diff --git a/maven_3-jdk-9/Dockerfile b/maven_3-jdk-9/Dockerfile
index 3eaa491..16e2b79 100644
--- a/maven_3-jdk-9/Dockerfile
+++ b/maven_3-jdk-9/Dockerfile
@@ -8,7 +8,7 @@ ARG BASE_URL=https://apache.osuosl.org/maven/maven-3/${MAVEN_VERSION}/binaries
# Maven fails with 'Can't read cryptographic policy directory: unlimited'
# because it looks for $JAVA_HOME/conf/security/policy/unlimited but it is in
# /etc/java-9-openjdk/security/policy/unlimited
-RUN ln -s /etc/java-9-openjdk /usr/lib/jvm/java-9-openjdk-amd64/conf
+RUN ln -s /etc/java-9-openjdk /usr/lib/jvm/java-9-openjdk-$(dpkg --print-architecture)/conf
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 \ |
|
Build test of #3445; 8a77f35 ( $ bashbrew build maven:3.5.0-jdk-7
Using bashbrew/cache:845750db62045debef6e87810302473f9fc960604229acc5a9ba3786d188040c (maven:3.5.0-jdk-7)
Tagging maven:3.5.0-jdk-7
Tagging maven:3.5-jdk-7
Tagging maven:3-jdk-7
$ test/run.sh maven:3.5.0-jdk-7
testing maven:3.5.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.5.0-jdk-7-alpine
Using bashbrew/cache:fa1951aae28e9ec2ec1985a91eb99bf6681af02fc4a958e88707d57ee86615a1 (maven:3.5.0-jdk-7-alpine)
Tagging maven:3.5.0-jdk-7-alpine
Tagging maven:3.5-jdk-7-alpine
Tagging maven:3-jdk-7-alpine
$ test/run.sh maven:3.5.0-jdk-7-alpine
testing maven:3.5.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.5.0-jdk-7-slim
Using bashbrew/cache:7fbe6b350ff2fc014bc8f99c2051e8e39d1a61570b1aa2519526c140297964b2 (maven:3.5.0-jdk-7-slim)
Tagging maven:3.5.0-jdk-7-slim
Tagging maven:3.5-jdk-7-slim
Tagging maven:3-jdk-7-slim
$ test/run.sh maven:3.5.0-jdk-7-slim
testing maven:3.5.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.5.0-jdk-8
Using bashbrew/cache:b846ee7a28b4535cf040233333298b7ba597824945e790bfb786ec818e05be75 (maven:3.5.0-jdk-8)
Tagging maven:3.5.0-jdk-8
Tagging maven:3.5.0
Tagging maven:3.5-jdk-8
Tagging maven:3.5
Tagging maven:3-jdk-8
Tagging maven:3
Tagging maven:latest
$ test/run.sh maven:3.5.0-jdk-8
testing maven:3.5.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.5.0-jdk-8-alpine
Using bashbrew/cache:a5b1c09fb47d78fa0183448d78a8c97b71ab8a8f7ed52d8d7fc0f8c30a7ecf72 (maven:3.5.0-jdk-8-alpine)
Tagging maven:3.5.0-jdk-8-alpine
Tagging maven:3.5.0-alpine
Tagging maven:3.5-jdk-8-alpine
Tagging maven:3.5-alpine
Tagging maven:3-jdk-8-alpine
Tagging maven:alpine
$ test/run.sh maven:3.5.0-jdk-8-alpine
testing maven:3.5.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.5.0-jdk-8-slim
Using bashbrew/cache:43385f52ae99f91119faf2841598bb6cce5a1afa401db14518b5ab99ab501093 (maven:3.5.0-jdk-8-slim)
Tagging maven:3.5.0-jdk-8-slim
Tagging maven:3.5.0-slim
Tagging maven:3.5-jdk-8-slim
Tagging maven:3.5-slim
Tagging maven:3-jdk-8-slim
Tagging maven:slim
$ test/run.sh maven:3.5.0-jdk-8-slim
testing maven:3.5.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.5.0-jdk-9
Building bashbrew/cache:1d90308ca700e6ef755cd38c993cd9abd207aa401bb7fb4e7ac1bccf537ae6e8 (maven:3.5.0-jdk-9)
Tagging maven:3.5.0-jdk-9
Tagging maven:3.5-jdk-9
Tagging maven:3-jdk-9
$ test/run.sh maven:3.5.0-jdk-9
testing maven:3.5.0-jdk-9
'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.5.0-jdk-9-slim
Using bashbrew/cache:445e87b420096ba3c34969b33aeae17cc5933fa9649060b7c0e7ceb953b385c0 (maven:3.5.0-jdk-9-slim)
Tagging maven:3.5.0-jdk-9-slim
Tagging maven:3.5-jdk-9-slim
Tagging maven:3-jdk-9-slim
$ test/run.sh maven:3.5.0-jdk-9-slim
testing maven:3.5.0-jdk-9-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.5.0-ibmjava-8
Building bashbrew/cache:7d8c5b9bd861bada1b7cd8227694197722f5e3d65138f686fc3bebb2026ffb72 (maven:3.5.0-ibmjava-8)
Tagging maven:3.5.0-ibmjava-8
Tagging maven:3.5.0-ibmjava
Tagging maven:3.5-ibmjava-8
Tagging maven:3.5-ibmjava
Tagging maven:3-ibmjava-8
Tagging maven:3-ibmjava
Tagging maven:ibmjava
$ test/run.sh maven:3.5.0-ibmjava-8
testing maven:3.5.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.5.0-ibmjava-8-alpine
Building bashbrew/cache:c2b57c9b20e800911fb3485fe5d35315c01abe074321f509f274b52b68c88d7a (maven:3.5.0-ibmjava-8-alpine)
Tagging maven:3.5.0-ibmjava-8-alpine
Tagging maven:3.5.0-ibmjava-alpine
Tagging maven:3.5-ibmjava-8-alpine
Tagging maven:3.5-ibmjava-alpine
Tagging maven:3-ibmjava-8-alpine
Tagging maven:ibmjava-alpine
$ test/run.sh maven:3.5.0-ibmjava-8-alpine
testing maven:3.5.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.5.0-ibmjava-9
Building bashbrew/cache:4f42639053dc5431a9f126e4458542259641644bfae882ec38ffb9187dcda22a (maven:3.5.0-ibmjava-9)
Tagging maven:3.5.0-ibmjava-9
Tagging maven:3.5-ibmjava-9
Tagging maven:3-ibmjava-9
$ test/run.sh maven:3.5.0-ibmjava-9
testing maven:3.5.0-ibmjava-9
'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.5.0-ibmjava-9-alpine
Building bashbrew/cache:d109141562a183810aeab9a45157fd887f76339d56630edbcbdba3a75cd939c3 (maven:3.5.0-ibmjava-9-alpine)
Tagging maven:3.5.0-ibmjava-9-alpine
Tagging maven:3.5-ibmjava-9-alpine
Tagging maven:3-ibmjava-9-alpine
$ test/run.sh maven:3.5.0-ibmjava-9-alpine
testing maven:3.5.0-ibmjava-9-alpine
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
|
|
@tianon trying to add a new version of maven I'm getting Using 8u121-jre-alpine because latest alpine jdks have a bug https://github.com/carlossg/docker-maven/blob/master/jdk-8-alpine/Dockerfile#L1 what would be the best way to proceed? |
|
Created PR for 3.5.2 #3649 |
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.
See carlossg/docker-maven#47 and carlossg/docker-maven#49! 馃帀
cc @carlossg