commit e3e4aaf2140c94fe0811c40186df2f860a2346d7
author Bin Yang <bin.yang@windriver.com> Mon Apr 15 08:43:41 2019 +0000
committer Gerrit Code Review <gerrit@onap.org> Mon Apr 15 08:43:41 2019 +0000
tree 8e6c3c0f5e4e8b61147d726f41f457e933354e3b
parent 2faa774836fc4e2bc7a85091a8c832c2bc5415d2
parent dc1321b4c135242c67e94f5af57d0e39866ce2d8

Merge "add testcase to improve test coverage"

multivimbroker/docker/Dockerfile

diff --git a/multivimbroker/docker/Dockerfile b/multivimbroker/docker/Dockerfile
index aaac4ea..e8dbf44 100644
--- a/multivimbroker/docker/Dockerfile
+++ b/multivimbroker/docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:2-slim
+FROM python:2-alpine
 
 ENV MSB_ADDR "127.0.0.1"
 ENV MSB_PORT "80"
@@ -10,19 +10,18 @@
 
 EXPOSE 9001
 
-RUN groupadd -r onap && useradd -r -g onap onap
+RUN addgroup -S onap && adduser -S -G onap onap
 
 # COPY ./ /opt/multivimbroker/
-RUN apt-get update && \
-    apt-get install -y wget unzip gcc libssl-dev && \
+RUN apk update && \
+    apk add uwsgi wget unzip gcc make libc-dev libffi-dev openssl-dev && \
     cd /opt/ && \
     wget -O multicloud-framework.zip "https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.multicloud.framework.broker&a=multicloud-framework-broker&e=zip&v=1.3.0-SNAPSHOT" && \
     unzip -q -o -B multicloud-framework.zip && \
     rm -f multicloud-framework.zip && \
     pip install -r /opt/multivimbroker/requirements.txt && \
     pip install -r /opt/multivimbroker/uwsgi-requirements.txt && \
-    apt-get --purge remove -y wget unzip gcc libssl-dev && \
-    apt-get -y autoremove && \
+    apk del wget unzip gcc make libc-dev libffi-dev openssl-dev && \
     mkdir -p /var/log/onap/multicloud/multivimbroker && \
     chown onap:onap /var/log/onap -R && \
     chown onap:onap /opt/multivimbroker -R

multivimbroker/run.sh

diff --git a/multivimbroker/run.sh b/multivimbroker/run.sh
index ced766f..f75f7c4 100755
--- a/multivimbroker/run.sh
+++ b/multivimbroker/run.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 # Copyright (c) 2017-2018 VMware, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -31,7 +31,7 @@
     python multivimbroker/scripts/api.py
 else
     # nohup python manage.py runserver 0.0.0.0:9001 2>&1 &
-    if [ ${SSL_ENABLED} = "true" ]; then
+    if [ "${SSL_ENABLED}" = "true" ]; then
         nohup uwsgi --https :9001,multivimbroker/pub/ssl/cert/cert.crt,multivimbroker/pub/ssl/cert/cert.key,HIGH -t 120 --module multivimbroker.wsgi --master --processes 4 &
     else
         nohup uwsgi --http :9001 -t 120 --module multivimbroker.wsgi --master --processes 4 &

multivimbroker/stop.sh

diff --git a/multivimbroker/stop.sh b/multivimbroker/stop.sh
index ba0a2c8..09c3954 100755
--- a/multivimbroker/stop.sh
+++ b/multivimbroker/stop.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 # Copyright (c) 2017 Wind River Systems, Inc.
 # Copyright (c) 2017-2018 VMware, Inc.
 #