diff options
| author |   Xiaohua Zhang <xiaohua.zhang@windriver.com> | 2019-04-12 08:47:03 +0000 |
|---|---|---|
| committer | Xiaohua Zhang <xiaohua.zhang@windriver.com> | 2019-04-12 08:47:03 +0000 |
| commit | 2faa774836fc4e2bc7a85091a8c832c2bc5415d2 (patch) | |
| tree | 373ec9094a2a6509aa52909f7b97bc20be190e1f | |
| parent | 76cb15908ebfab78034aff381ba5c867b5491c05 (diff) | |
Rebase to alpine
Change-Id: Icd0a0026dd8562f2eb4679f3d595932a2bb56161
Issue-ID: MULTICLOUD-505
Signed-off-by: Xiaohua Zhang <xiaohua.zhang@windriver.com>
| -rw-r--r-- | multivimbroker/docker/Dockerfile | 11 | ||||
| -rwxr-xr-x | multivimbroker/run.sh | 4 | ||||
| -rwxr-xr-x | multivimbroker/stop.sh | 2 |
3 files changed, 8 insertions, 9 deletions
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 @@ ENV AAI_PASSWORD "AAI" 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 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 @@ then 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 & 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. # |