From ce4644f69838660c02afba6f6393e9705cddee40 Mon Sep 17 00:00:00 2001
From: Haibin Huang <haibin.huang@intel.com>
Date: Mon, 2 Sep 2019 19:29:34 +0800
Subject: Fix vagrant docker issue

Issue-ID: MULTICLOUD-798
Signed-off-by: Haibin Huang <haibin.huang@intel.com>
Change-Id: I37822b04c8336acb4c04ab36d130b0302b7f0aaf
---
 pike/vagrant/test/Dockerfile         | 33 ++++++++++++++++++++++++---------
 pike/vagrant/test/test_multicloud.sh |  2 +-
 2 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/pike/vagrant/test/Dockerfile b/pike/vagrant/test/Dockerfile
index aad0f9ff..292cb26e 100644
--- a/pike/vagrant/test/Dockerfile
+++ b/pike/vagrant/test/Dockerfile
@@ -12,28 +12,43 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM python:2
+FROM python:3-slim
+
+ARG HTTP_PROXY=${HTTP_PROXY}
+ARG HTTPS_PROXY=${HTTPS_PROXY}
+
+ENV http_proxy $HTTP_PROXY
+ENV https_proxy $HTTPS_PROXY
 
 ENV MSB_ADDR "127.0.0.1"
 ENV MSB_PORT "80"
 ENV AAI_ADDR "aai.api.simpledemo.openecomp.org"
 ENV AAI_PORT "8443"
+ENV AAI_SERVICE_URL ""
 ENV AAI_SCHEMA_VERSION "v13"
 ENV AAI_USERNAME "AAI"
 ENV AAI_PASSWORD "AAI"
 
 EXPOSE 9007
 
-COPY multicloud-openstack-pike.zip /opt
+RUN groupadd -r onap && useradd -r -g onap onap
+
+COPY ./multicloud-openstack-pike-*.zip /opt/multicloud-openstack-pike.zip
 RUN apt-get update && \
-    apt-get install -y vim memcached unzip && \
+    apt-get install -y memcached wget unzip gcc libssl-dev && \
     cd /opt/ && \
-    unzip -q -o -B multicloud-openstack-pike.zip && \
-    chmod +x /opt/pike/*.sh && \
-    rm -f multicloud-openstack-pike.zip && \
-    pip install -r /opt/pike/requirements.txt
+    unzip -q -o -B /opt/multicloud-openstack-pike.zip -d /opt/ && \
+    rm -f /opt/multicloud-openstack-pike.zip && \
+    pip3 install -r /opt/pike/requirements.txt && \
+    pip3 install -r /opt/pike/uwsgi-requirements.txt && \
+    apt-get --purge remove -y wget unzip gcc libssl-dev && \
+    mkdir -p /var/log/onap/multicloud/openstack/pike && \
+    chown onap:onap /var/log/onap -R && \
+    apt-get -y autoremove && \
+    chown onap:onap /opt/pike -R
 
-ADD extsys.py /opt/pike/lib/share/common/msapi/extsys.py
+RUN mkdir -p /var/log/onap/multicloud/openstack/pike/
 
+USER onap
 WORKDIR /opt/pike
-CMD /bin/sh -c /opt/pike/run.sh
+CMD /bin/sh -c "/opt/pike/run.sh"
diff --git a/pike/vagrant/test/test_multicloud.sh b/pike/vagrant/test/test_multicloud.sh
index c18e317d..b496b1ad 100644
--- a/pike/vagrant/test/test_multicloud.sh
+++ b/pike/vagrant/test/test_multicloud.sh
@@ -25,7 +25,7 @@ cp oparent/settings.xml $HOME/.m2
 git clone /openstack
 cd openstack
 mvn clean install
-cp pike/target/multicloud-openstack-pike*.zip pike/vagrant/test/multicloud-openstack-pike.zip
+cp pike/target/multicloud-openstack-pike*.zip pike/vagrant/test/
 
 cd pike/vagrant/test
 sudo docker build -t multicloud-pike-test:latest .
-- 
cgit 1.2.3-korg