Merge "Remove deployment plugin"

[multicloud/k8s.git] / deployments / Dockerfile

diff --git a/deployments/Dockerfile b/deployments/Dockerfile
index d22aeb1..b3e2f06 100644 (file)
--- a/deployments/Dockerfile
+++ b/deployments/Dockerfile
@@ -7,7 +7,7 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
 
-FROM ubuntu:16.04
+FROM ubuntu:18.04
 
 ARG HTTP_PROXY=${HTTP_PROXY}
 ARG HTTPS_PROXY=${HTTPS_PROXY}
@@ -16,12 +16,6 @@ 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
 
 RUN groupadd -r onap && useradd -r -g onap onap
@@ -30,10 +24,11 @@ RUN apt-get update && apt-get install -y -qq apt-transport-https curl \
  && 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