X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=azure%2Fdocker%2FDockerfile;h=9fd35daca309db05c52142d62e816ed51a41c75b;hb=658602b4808bd093b75adb6a151982a7b44c7f0a;hp=70924e3790b2dbb0ac705efab519d0e5e74891a7;hpb=9abc9c644a96e74612a995b7194c69167317a6ae;p=multicloud%2Fazure.git

diff --git a/azure/docker/Dockerfile b/azure/docker/Dockerfile
index 70924e3..9fd35da 100644
--- a/azure/docker/Dockerfile
+++ b/azure/docker/Dockerfile
@@ -10,7 +10,7 @@ ENV AAI_PASSWORD "AAI"
 ENV MR_ADDR "127.0.0.1"
 ENV MR_PORT "3904"
 
-EXPOSE 9004
+EXPOSE 9008
 
 RUN apt-get update && \
     apt-get install -y unzip && \
@@ -18,6 +18,7 @@ RUN apt-get update && \
     apt-get install -y wget
 RUN apt-get install -y python-dev gcc libffi-dev libssl-dev make
 
+RUN groupadd -r onap && useradd -r -g onap onap
 # ARIA orchestrator addition
 RUN pip install -U pip setuptools
 COPY /aria/ /tmp/
@@ -27,20 +28,33 @@ RUN pip install .
 WORKDIR /tmp/aria-extension-cloudify
 RUN pip install .
 
+WORKDIR /tmp/aria-rest-server/src/main/python/aria-rest
+RUN pip install .
+
 RUN pip install --force-reinstall  pip==9.0.1
 WORKDIR /tmp
-ADD docker/cloudify_azure_plugin-1.4.2-py27-none-linux_x86_64.wgn /tmp/
+
+RUN git clone -b 1.4.2 https://github.com/cloudify-incubator/cloudify-azure-plugin
+
+RUN sed -i "s/utils.get_resource_config(_ctx=ipc)/{'properties': utils.get_resource_config(_ctx=ipc)}/g" cloudify-azure-plugin/cloudify_azure/resources/network/ipconfiguration.py
+
+RUN wagon create ./cloudify-azure-plugin
+
 RUN aria plugins install cloudify_azure_plugin-1.4.2-py27-none-linux_x86_64.wgn
 RUN rm cloudify_azure_plugin-1.4.2-py27-none-linux_x86_64.wgn
+#RUN rm -rf cloudify-azure-plugin
 
 
 RUN  cd /opt/ && \
     wget -q -O multicloud-azure.zip 'https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.multicloud.azure&a=multicloud-azure&v=LATEST&e=zip' && \
     unzip multicloud-azure.zip && \
     rm -rf multicloud-azure.zip && \
-    pip install -r multicloud_azure/requirements.txt
+    pip install -r multicloud_azure/requirements.txt && \
+    chown onap:onap /opt/multicloud_azure -R
 
+RUN mkdir /home/onap && chown onap:onap /home/onap -R
 
 WORKDIR /opt
 RUN chmod +x multicloud_azure/docker/*.sh && chmod +x multicloud_azure/*.sh
+USER onap
 ENTRYPOINT multicloud_azure/docker/docker-entrypoint.sh