Merge "Add kubevirt to list of EMCO deployed addons"

[multicloud/k8s.git] / deployments / Dockerfile

diff --git a/deployments/Dockerfile b/deployments/Dockerfile
index 961f676..842345c 100644 (file)
--- a/deployments/Dockerfile
+++ b/deployments/Dockerfile
@@ -16,24 +16,15 @@ ENV http_proxy $HTTP_PROXY
 ENV https_proxy $HTTPS_PROXY
 ENV no_proxy $NO_PROXY
 
-ENV CSAR_DIR "/opt/csar"
-ENV KUBE_CONFIG_DIR "/opt/kubeconfig"
-ENV DATABASE_TYPE "consul"
-ENV DATABASE_IP "127.0.0.1"
-ENV OVN_CENTRAL_ADDRESS "127.0.0.1:6641"
-
-EXPOSE 8081
+EXPOSE 9015
 
 RUN groupadd -r onap && useradd -r -g onap onap
-RUN apt-get update && apt-get install -y -qq apt-transport-https curl \
- && echo "deb https://packages.wand.net.nz xenial main" > /etc/apt/sources.list.d/wand.list \
- && curl https://packages.wand.net.nz/keyring.gpg -o /etc/apt/trusted.gpg.d/wand.gpg \
- && apt-get update && apt install -y -qq ovn-common
-
-WORKDIR /opt/multicloud/k8s
-ADD ./k8plugin ./
-ADD ./*.so ./
-RUN chown onap:onap /opt/multicloud/k8s -R
+
+WORKDIR /opt/multicloud/k8splugin
+RUN chown onap:onap /opt/multicloud/k8splugin -R
+
+ADD --chown=onap ./k8plugin ./
+ADD --chown=onap ./*.so ./plugins/
 
 USER onap