X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=dmaap-bc%2Fsrc%2Fmain%2Fresources%2FDockerfile;h=64bd689e440edf50d6a4356454fcc24dbbbb710f;hb=de1681ed5d3884d7c62ce3dd530c552b5dff11d9;hp=16820e1555e481822dec7228e32eb461e7fb8689;hpb=aa3cc0e7cd53265e8c82b56caf2f409ed5612e80;p=dmaap%2Fbuscontroller.git

diff --git a/dmaap-bc/src/main/resources/Dockerfile b/dmaap-bc/src/main/resources/Dockerfile
index 16820e1..64bd689 100644
--- 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 library/maven:3.6-jdk-11
 
 MAINTAINER DMAAP Team
 
@@ -26,10 +26,30 @@ COPY /opt /opt
 
 WORKDIR /opt/app/dmaapbc
 
-RUN mv etc/dbc-api.jks etc/keystore && \
+RUN apt-get update && \
+    apt-get install -y \
+       curl \
+       jq \
+       openssl \
+       net-tools \
+       wget \
+       procps \
+       bash
+
+# Install AAF CA certificate
+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
+
+
+#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 && \
@@ -38,4 +58,10 @@ RUN mv etc/dbc-api.jks etc/keystore && \
 
 VOLUME /opt/app/dmaapbc/log
 
+RUN addgroup --system -gid 1001 onap \
+    && adduser --ingroup onap --system --disabled-password --no-create-home --uid 1000 dbc \
+    && chown -R dbc:onap /opt/
+
+USER dbc
+
 ENTRYPOINT ["sh", "./bin/dmaapbc", "deploy"]