[DMAAP-BC] Consolidate bus controller repos

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

diff --git a/dmaap-bc/src/main/resources/Dockerfile b/dmaap-bc/src/main/resources/docker/Dockerfile
similarity index 67%
rename from dmaap-bc/src/main/resources/Dockerfile
rename to dmaap-bc/src/main/resources/docker/Dockerfile
index 0f9e6a6..a801896 100644 (file)
--- a/dmaap-bc/src/main/resources/Dockerfile
+++ b/dmaap-bc/src/main/resources/docker/Dockerfile
@@ -4,6 +4,7 @@
 #  ===========================================================================
 #  Copyright © 2017 AT&T Intellectual Property. All rights reserved.
 #  Modifications Copyright (C) 2018 Nokia. All rights reserved.
+#  Modifications Copyright (C) 2021 Nordix Foundation.
 #  ===========================================================================
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
@@ -17,40 +18,24 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 #  ============LICENSE_END====================================================
-#
-FROM library/maven:3.6-jdk-11
 
-MAINTAINER DMAAP Team
+FROM nexus3.onap.org:10001/onap/integration-java11:8.0.0
 
-COPY /opt /opt
+MAINTAINER DMAAP Team
 
 WORKDIR /opt/app/dmaapbc
 
-RUN apt-get update && \
-    apt-get install -y \
-       curl \
-       jq \
-       openssl \
-       net-tools \
-       wget \
-       procps \
-       bash
-
-#prepare certificate location for cadi
-RUN mkdir -p /opt/app/osaaf 
+COPY /opt /opt
+USER root
+RUN apk add --no-cache curl jq net-tools wget procps \
 
-RUN chmod +x bin/* && \
+&&  mkdir -p /opt/app/osaaf && \
+    chmod +x bin/* && \
     mkdir logs && \
-    mkdir www && \
     mkdir doc && \
-    mkdir config
-
-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/
+    mkdir config && \
+    chown -R onap:onap /opt/
 
-USER dbc
+USER onap
 
-ENTRYPOINT ["sh", "./bin/dmaapbc", "deploy"]
+ENTRYPOINT ["sh", "bin/dmaapbc", "deploy"]