summaryrefslogtreecommitdiffstats
path: root/auth/docker
diff options
context:
space:
mode:
Diffstat (limited to 'auth/docker')
-rw-r--r--auth/docker/Dockerfile.base9
-rw-r--r--auth/docker/dclean.sh1
2 files changed, 7 insertions, 3 deletions
diff --git a/auth/docker/Dockerfile.base b/auth/docker/Dockerfile.base
index 4ba4dfab..523d63f0 100644
--- a/auth/docker/Dockerfile.base
+++ b/auth/docker/Dockerfile.base
@@ -18,15 +18,18 @@
# ============LICENSE_END====================================================
#
# Use dbuild.sh input parameter to set registry
-#FROM ${REGISTRY}/openjdk:11.0.5-jre-slim
-FROM ${REGISTRY}/openjdk:8-jdk-alpine
+#FROM ${REGISTRY}/openjdk:11-jre-slim
+#FROM ${REGISTRY}/openjdk:8-jdk-alpine
+FROM ${REGISTRY}/alpine
#FROM openjdk:12-jdk-alpine
#FROM openjdk:13-jdk-alpine
MAINTAINER AAF Team, AT&T 2018
LABEL description="aaf_base"
-RUN apk add --no-cache bash &&\
+ENV JAVA_HOME /usr/lib/jvm/java-11-openjdk
+RUN apk --no-cache add openjdk11 &&\
+ apk add --no-cache bash &&\
apk add --no-cache openssl &&\
apk add --no-cache curl &&\
if [ -n "${DUSER}" ]; then addgroup ${DUSER} && adduser ${DUSER} -G ${DUSER} -D -s /bin/bash; fi
diff --git a/auth/docker/dclean.sh b/auth/docker/dclean.sh
index 0e974aa6..f27cc4ec 100644
--- a/auth/docker/dclean.sh
+++ b/auth/docker/dclean.sh
@@ -36,4 +36,5 @@ for AAF_COMPONENT in ${AAF_COMPONENTS}; do
$DOCKER image rm $DOCKER_REPOSITORY/$ORG/$PROJECT/aaf_$AAF_COMPONENT:latest
fi
done
+
echo "Y" | $DOCKER image prune