[DMAAP-BC] Consolidate bus controller repos

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

diff --git a/dbc-client/src/main/resources/Dockerfile b/dbc-client/src/main/resources/Dockerfile
index 85f9426..9263e80 100644 (file)
--- a/dbc-client/src/main/resources/Dockerfile
+++ b/dbc-client/src/main/resources/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.
@@ -32,24 +33,17 @@ 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
+# Install curl & openssl
+RUN apk add --no-cache curl openssl
 
-# Install client certs for curl and openssl
-RUN apk add --no-cache openssl
-RUN mkdir -p /opt/app/osaaf/local  && \
-    mv etc/org.onap.dmaap-bc.p12 /opt/app/osaaf/local && \
-    mv etc/*.pem /opt/app/osaaf/local
-
-RUN chmod +x /opt/app/dbc-client/bin/* && \
+RUN mkdir -p /opt/app/osaaf/local && \
+    chmod +x /opt/app/dbc-client/bin/* && \
     mkdir /opt/app/dbc-client/logs
 
-VOLUME /opt/app/dbc-client/log
-
 RUN addgroup -S -g 1001 onap \
-    && adduser -S -u 1000 dbc -G onap \
-    && chown -R dbc:onap /opt/
+    && adduser -S -u 1000 onap -G onap \
+    && chown -R onap:onap /opt/
 
-USER dbc
+USER onap
 
 ENTRYPOINT ["sh", "./bin/dbc-client" ]