New base image for Java 11

[dmaap/buscontroller.git] / dmaap-bc / src / main / resources / Dockerfile

diff --git a/dmaap-bc/src/main/resources/Dockerfile b/dmaap-bc/src/main/resources/Dockerfile
index f900fed..3cb15cd 100644 (file)
--- a/dmaap-bc/src/main/resources/Dockerfile
+++ b/dmaap-bc/src/main/resources/Dockerfile
@@ -18,7 +18,7 @@
 #  limitations under the License.
 #  ============LICENSE_END====================================================
 #
-FROM openjdk:8-jre-alpine
+FROM openjdk:11.0.5-jre-slim
 
 MAINTAINER DMAAP Team
 
@@ -26,19 +26,29 @@ COPY /opt /opt
 
 WORKDIR /opt/app/dmaapbc
 
+RUN apt-get update && \
+    apt-get install -y \
+       curl \
+       jq \
+       openssl \
+       net-tools \
+       wget \
+       bash
+
 # Install AAF CA certificate
-RUN apk update && apk add ca-certificates && rm -rf /var/cache/apk/*
+RUN apt install ca-certificates 
 RUN mkdir -p /usr/local/share/ca-certificates && \
     mv misc/aaf-ca.crt /usr/local/share/ca-certificates/aaf-ca.crt
 RUN update-ca-certificates
 
-# Install curl
-RUN apk add --no-cache curl
+
+#prepare certificate location for cadi
+RUN mkdir -p /opt/app/osaaf && \
+    ln -s /opt/app/dmaapbc/etc /opt/app/osaaf/local
 
 RUN mv etc/org.onap.dmaap-bc.jks etc/keystore && \
     chmod 600 etc/keystore && \
     chmod 600 etc/org.onap.dmaap-bc.trust.jks && \
-    chmod +x misc/cert-client-init.sh && \
     chmod +x bin/* && \
     mkdir logs && \
     mkdir www && \
@@ -47,4 +57,10 @@ RUN mv etc/org.onap.dmaap-bc.jks etc/keystore && \
 
 VOLUME /opt/app/dmaapbc/log
 
+RUN addgroup -S -g 1001 onap \
+    && adduser -S -u 1000 dbc -G onap \
+    && chown -R dbc:onap /opt/
+
+USER dbc
+
 ENTRYPOINT ["sh", "./bin/dmaapbc", "deploy"]