Add maven slim variants #3434
Merged
Add maven slim variants #3434
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
And ibmjava shortcuts
Diff:warning: insecure protocol git:// detected: git://github.com/carlossg/docker-maven
diff --git a/_bashbrew-arches b/_bashbrew-arches
index fc06f7a..8b47588 100644
--- a/_bashbrew-arches
+++ b/_bashbrew-arches
@@ -1,9 +1,12 @@
-maven:3-ibmjava-8 @ amd64
-maven:3-ibmjava-8-alpine @ amd64
maven:3-ibmjava-9 @ amd64
maven:3-ibmjava-9-alpine @ amd64
maven:3-jdk-7 @ amd64
maven:3-jdk-7-alpine @ amd64
+maven:3-jdk-7-slim @ amd64
maven:3-jdk-9 @ amd64
+maven:3-jdk-9-slim @ amd64
maven:alpine @ amd64
+maven:ibmjava @ amd64
+maven:ibmjava-alpine @ amd64
maven:latest @ amd64
+maven:slim @ amd64
diff --git a/_bashbrew-list b/_bashbrew-list
index 97d004d..48a48b9 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,35 +1,53 @@
maven:3
-maven:3-alpine
+maven:3-ibmjava
maven:3-ibmjava-8
maven:3-ibmjava-8-alpine
maven:3-ibmjava-9
maven:3-ibmjava-9-alpine
maven:3-jdk-7
maven:3-jdk-7-alpine
+maven:3-jdk-7-slim
maven:3-jdk-8
maven:3-jdk-8-alpine
+maven:3-jdk-8-slim
maven:3-jdk-9
+maven:3-jdk-9-slim
maven:3.5
maven:3.5-alpine
+maven:3.5-ibmjava
maven:3.5-ibmjava-8
maven:3.5-ibmjava-8-alpine
maven:3.5-ibmjava-9
maven:3.5-ibmjava-9-alpine
+maven:3.5-ibmjava-alpine
maven:3.5-jdk-7
maven:3.5-jdk-7-alpine
+maven:3.5-jdk-7-slim
maven:3.5-jdk-8
maven:3.5-jdk-8-alpine
+maven:3.5-jdk-8-slim
maven:3.5-jdk-9
+maven:3.5-jdk-9-slim
+maven:3.5-slim
maven:3.5.0
maven:3.5.0-alpine
+maven:3.5.0-ibmjava
maven:3.5.0-ibmjava-8
maven:3.5.0-ibmjava-8-alpine
maven:3.5.0-ibmjava-9
maven:3.5.0-ibmjava-9-alpine
+maven:3.5.0-ibmjava-alpine
maven:3.5.0-jdk-7
maven:3.5.0-jdk-7-alpine
+maven:3.5.0-jdk-7-slim
maven:3.5.0-jdk-8
maven:3.5.0-jdk-8-alpine
+maven:3.5.0-jdk-8-slim
maven:3.5.0-jdk-9
+maven:3.5.0-jdk-9-slim
+maven:3.5.0-slim
maven:alpine
+maven:ibmjava
+maven:ibmjava-alpine
maven:latest
+maven:slim
diff --git a/maven_3-ibmjava-9-alpine/Dockerfile b/maven_3-jdk-7-slim/Dockerfile
similarity index 87%
copy from maven_3-ibmjava-9-alpine/Dockerfile
copy to maven_3-jdk-7-slim/Dockerfile
index 7493ae4..09366b4 100644
--- a/maven_3-ibmjava-9-alpine/Dockerfile
+++ b/maven_3-jdk-7-slim/Dockerfile
@@ -1,12 +1,15 @@
-FROM ibmjava:9-sdk-alpine
-
-RUN apk add --no-cache curl tar bash
+FROM openjdk:7-jdk-slim
ARG MAVEN_VERSION=3.5.0
ARG USER_HOME_DIR="/root"
ARG SHA=beb91419245395bd69a4a6edad5ca3ec1a8b64e41457672dc687c173a495f034
ARG BASE_URL=https://apache.osuosl.org/maven/maven-3/${MAVEN_VERSION}/binaries
+RUN apt-get update && \
+ apt-get install -y \
+ curl \
+ && rm -rf /var/lib/apt/lists/*
+
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" | sha256sum -c - \
diff --git a/maven_3-ibmjava-8-alpine/mvn-entrypoint.sh b/maven_3-jdk-7-slim/mvn-entrypoint.sh
similarity index 100%
copy from maven_3-ibmjava-8-alpine/mvn-entrypoint.sh
copy to maven_3-jdk-7-slim/mvn-entrypoint.sh
diff --git a/maven_3-ibmjava-8-alpine/settings-docker.xml b/maven_3-jdk-7-slim/settings-docker.xml
similarity index 100%
copy from maven_3-ibmjava-8-alpine/settings-docker.xml
copy to maven_3-jdk-7-slim/settings-docker.xml
diff --git a/maven_3-jdk-9/Dockerfile b/maven_3-jdk-9-slim/Dockerfile
similarity index 90%
copy from maven_3-jdk-9/Dockerfile
copy to maven_3-jdk-9-slim/Dockerfile
index 3eaa491..0359bd4 100644
--- a/maven_3-jdk-9/Dockerfile
+++ b/maven_3-jdk-9-slim/Dockerfile
@@ -1,10 +1,15 @@
-FROM openjdk:9-jdk
+FROM openjdk:9-jdk-slim
ARG MAVEN_VERSION=3.5.0
ARG USER_HOME_DIR="/root"
ARG SHA=beb91419245395bd69a4a6edad5ca3ec1a8b64e41457672dc687c173a495f034
ARG BASE_URL=https://apache.osuosl.org/maven/maven-3/${MAVEN_VERSION}/binaries
+RUN apt-get update && \
+ apt-get install -y \
+ curl \
+ && rm -rf /var/lib/apt/lists/*
+
# 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
diff --git a/maven_3-ibmjava-8/mvn-entrypoint.sh b/maven_3-jdk-9-slim/mvn-entrypoint.sh
similarity index 100%
rename from maven_3-ibmjava-8/mvn-entrypoint.sh
rename to maven_3-jdk-9-slim/mvn-entrypoint.sh
diff --git a/maven_3-ibmjava-8/settings-docker.xml b/maven_3-jdk-9-slim/settings-docker.xml
similarity index 100%
rename from maven_3-ibmjava-8/settings-docker.xml
rename to maven_3-jdk-9-slim/settings-docker.xml
diff --git a/maven_3-ibmjava-8-alpine/Dockerfile b/maven_ibmjava-alpine/Dockerfile
similarity index 100%
rename from maven_3-ibmjava-8-alpine/Dockerfile
rename to maven_ibmjava-alpine/Dockerfile
diff --git a/maven_3-ibmjava-8-alpine/mvn-entrypoint.sh b/maven_ibmjava-alpine/mvn-entrypoint.sh
similarity index 100%
copy from maven_3-ibmjava-8-alpine/mvn-entrypoint.sh
copy to maven_ibmjava-alpine/mvn-entrypoint.sh
diff --git a/maven_3-ibmjava-8-alpine/settings-docker.xml b/maven_ibmjava-alpine/settings-docker.xml
similarity index 100%
copy from maven_3-ibmjava-8-alpine/settings-docker.xml
copy to maven_ibmjava-alpine/settings-docker.xml
diff --git a/maven_3-ibmjava-8/Dockerfile b/maven_ibmjava/Dockerfile
similarity index 100%
rename from maven_3-ibmjava-8/Dockerfile
rename to maven_ibmjava/Dockerfile
diff --git a/maven_3-ibmjava-8-alpine/mvn-entrypoint.sh b/maven_ibmjava/mvn-entrypoint.sh
similarity index 100%
copy from maven_3-ibmjava-8-alpine/mvn-entrypoint.sh
copy to maven_ibmjava/mvn-entrypoint.sh
diff --git a/maven_3-ibmjava-8-alpine/settings-docker.xml b/maven_ibmjava/settings-docker.xml
similarity index 100%
copy from maven_3-ibmjava-8-alpine/settings-docker.xml
copy to maven_ibmjava/settings-docker.xml
diff --git a/maven_3-ibmjava-9-alpine/Dockerfile b/maven_slim/Dockerfile
similarity index 87%
copy from maven_3-ibmjava-9-alpine/Dockerfile
copy to maven_slim/Dockerfile
index 7493ae4..fea082d 100644
--- a/maven_3-ibmjava-9-alpine/Dockerfile
+++ b/maven_slim/Dockerfile
@@ -1,12 +1,15 @@
-FROM ibmjava:9-sdk-alpine
-
-RUN apk add --no-cache curl tar bash
+FROM openjdk:8-jdk-slim
ARG MAVEN_VERSION=3.5.0
ARG USER_HOME_DIR="/root"
ARG SHA=beb91419245395bd69a4a6edad5ca3ec1a8b64e41457672dc687c173a495f034
ARG BASE_URL=https://apache.osuosl.org/maven/maven-3/${MAVEN_VERSION}/binaries
+RUN apt-get update && \
+ apt-get install -y \
+ curl \
+ && rm -rf /var/lib/apt/lists/*
+
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" | sha256sum -c - \
diff --git a/maven_3-ibmjava-8-alpine/mvn-entrypoint.sh b/maven_slim/mvn-entrypoint.sh
similarity index 100%
rename from maven_3-ibmjava-8-alpine/mvn-entrypoint.sh
rename to maven_slim/mvn-entrypoint.sh
diff --git a/maven_3-ibmjava-8-alpine/settings-docker.xml b/maven_slim/settings-docker.xml
similarity index 100%
rename from maven_3-ibmjava-8-alpine/settings-docker.xml
rename to maven_slim/settings-docker.xml |
|
LGTM Build test of #3434; f475219 ( $ bashbrew build maven:3.5.0-jdk-7-alpine
Building bashbrew/cache:d19b63f4395e344bc67ba13a30931148f3f16f0ab9a9bf47f86f7e750fc91240 (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
Building bashbrew/cache:74e9cfd28eb1f66a83cf36d9f358ca272cf69c15b05f52b9605cdd83d714431c (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-7
Using bashbrew/cache:881890716fc148fa53e5f05233b47ef90bb0c66c1d1ad57193ead70823b7af72 (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-8-alpine
Building bashbrew/cache:29bb4186a4da4dcc7a037798568a3c570d50e4dac6560ca5ff9748ef16fe1643 (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
Building bashbrew/cache:a49985094349767c0ec6042f1dcc39b6e4935cb1c3aa048eaf63200ceab94f68 (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-8
Using bashbrew/cache:8502cb91b0757dd2265b9663358bb053bb77cf97fb6d27aafcc091815293c48f (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-9-slim
Building bashbrew/cache:8e65d942cea5af95690e570f08384334460b9156f25091efaf65565d4d0d3f6f (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-jdk-9
Using bashbrew/cache:1adb8a7e13312cfc88608b996af1f7a22a8e618db9188711f18f82390b3ae807 (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-ibmjava-8-alpine
Building bashbrew/cache:85bbd712e4fa1e34b48458391ebbff53fb3497c5c21b9b989ea762e55f5b3691 (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-8
Using bashbrew/cache:59d3e2d3e2efc7744d243221c60a5a31abec027848251d73e6051c69882f8bb1 (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-9-alpine
Building bashbrew/cache:280a8c8fc4b2c4eb3e159d17360ce87ff77ddaa01b9505929b7b162e923825cd (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
$ bashbrew build maven:3.5.0-ibmjava-9
Using bashbrew/cache:494dcda36bacc297b777816886345578a8f75596857af3aa020c378c49c5a57e (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
|
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.
And ibmjava shortcuts