aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--policy-jdk/alpine/src/main/docker/Dockerfile16
-rw-r--r--policy-jre/alpine/src/main/docker/Dockerfile6
2 files changed, 11 insertions, 11 deletions
diff --git a/policy-jdk/alpine/src/main/docker/Dockerfile b/policy-jdk/alpine/src/main/docker/Dockerfile
index 9e1b841a..76dc97e9 100644
--- a/policy-jdk/alpine/src/main/docker/Dockerfile
+++ b/policy-jdk/alpine/src/main/docker/Dockerfile
@@ -23,7 +23,7 @@
# $JAVA_HOME is set to /usr/lib/jvm/java-11-openjdk
# more details at https://hub.docker.com/_/openjdk
-FROM alpine:3.11.3
+FROM alpine:3.12.0
LABEL maintainer="Policy Team"
@@ -45,13 +45,15 @@ RUN apk update \
procps \
unzip \
wget \
- zip
-
-RUN apk add --no-cache \
- maven
-
-RUN apk add --no-cache \
+ zip \
openjdk11 \
+ && curl --fail --silent --show-error --retry 3 \
+ --output /tmp/apache-maven-3.6.3-bin.tar.gz \
+ https://downloads.apache.org/maven/maven-3/3.6.3/binaries/apache-maven-3.6.3-bin.tar.gz \
+ && tar zxC /usr/share </tmp/apache-maven-3.6.3-bin.tar.gz \
+ && chown -R root:root /usr/share/apache-maven-3.6.3 \
+ && ln -s /usr/share/apache-maven-3.6.3/bin/mvn /usr/bin/mvn \
+ && rm -f /tmp/apache-maven-3.6.3-bin.tar.gz \
&& addgroup -S policy \
&& adduser -S --shell /bin/bash -G policy policy \
&& mkdir -p ${POLICY_HOME}/ \
diff --git a/policy-jre/alpine/src/main/docker/Dockerfile b/policy-jre/alpine/src/main/docker/Dockerfile
index 5d986f1c..8fd97105 100644
--- a/policy-jre/alpine/src/main/docker/Dockerfile
+++ b/policy-jre/alpine/src/main/docker/Dockerfile
@@ -23,7 +23,7 @@
# $JAVA_HOME is set to /usr/lib/jvm/java-11-openjdk
# more details at https://hub.docker.com/_/openjdk
-FROM alpine:3.11.3
+FROM alpine:3.12.0
LABEL maintainer="Policy Team"
@@ -45,9 +45,7 @@ RUN apk update \
procps \
unzip \
wget \
- zip
-
-RUN apk add --no-cache \
+ zip \
openjdk11-jre \
&& addgroup -S policy \
&& adduser -S --shell /bin/bash -G policy policy \