diff options
| author |   Bin Yang <bin.yang@windriver.com> | 2019-04-12 05:28:08 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-04-12 05:28:08 +0000 |
| commit | 6528a64e397075f73c4e5e2af560589d48d7f4d8 (patch) | |
| tree | ffae5869a062d94ca3e85c5c8aeb965e788d619f | |
| parent | 2024bb59b1d4ec20300304aed3a69132b9c082bc (diff) | |
| parent | b2966d1891f8633d7e55392f9fcd735be4982313 (diff) | |
Merge "Use alpine for MultiCloud FCAPS plugin"
| -rw-r--r-- | fcaps/docker/Dockerfile | 12 | ||||
| -rw-r--r-- | fcaps/run.sh | 4 |
2 files changed, 7 insertions, 9 deletions
diff --git a/fcaps/docker/Dockerfile b/fcaps/docker/Dockerfile index d3c37502..015c795a 100644 --- a/fcaps/docker/Dockerfile +++ b/fcaps/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM python:2-slim +FROM python:2-alpine ARG HTTP_PROXY=${HTTP_PROXY} ARG HTTPS_PROXY=${HTTPS_PROXY} @@ -16,20 +16,18 @@ ENV AAI_PASSWORD "AAI" EXPOSE 9011 -RUN groupadd -r onap && useradd -r -g onap onap +RUN addgroup -S onap && adduser -S -G onap onap # COPY ./ /opt/fcaps/ -RUN apt-get update && \ - apt-get install -y memcached wget unzip gcc libssl-dev && \ - apt-get install -y unzip && \ +RUN apk update && \ + apk add uwsgi memcached wget unzip gcc make libc-dev libffi-dev openssl-dev && \ cd /opt/ && \ wget -O multicloud-openstack-fcaps.zip "https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.multicloud.openstack&a=multicloud-openstack-fcaps&e=zip&v=1.3.0-SNAPSHOT" && \ unzip -q -o -B multicloud-openstack-fcaps.zip && \ chmod +x /opt/fcaps/*.sh && \ rm -f multicloud-openstack-fcaps.zip && \ pip install -r /opt/fcaps/requirements.txt && \ - apt-get --purge remove -y wget unzip gcc libssl-dev && \ - apt-get -y autoremove && \ + apk del -y wget unzip gcc make libc-dev libffi-dev openssl-dev && \ mkdir -p /var/log/onap/multicloud/fcaps && \ chown onap:onap /var/log/onap -R && \ chown onap:onap /opt/fcaps -R diff --git a/fcaps/run.sh b/fcaps/run.sh index 0c1cd87d..b5e1a61f 100644 --- a/fcaps/run.sh +++ b/fcaps/run.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # Copyright (c) 2017-2019 Wind River Systems, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -21,7 +21,7 @@ export PYTHONPATH=lib/share nohup celery -A fcaps worker --concurrency=1 --loglevel=info & #nohup python manage.py runserver 0.0.0.0:9011 2>&1 & -if [ ${SSL_ENABLED} = "true" ]; then +if [ "${SSL_ENABLED}" == "true" ]; then nohup uwsgi --https :9001,fcaps/pub/ssl/cert/cert.crt,fcaps/pub/ssl/cert/cert.key,HIGH --module fcaps.wsgi --master --enable-threads --processes 4 & else nohup uwsgi --http :9011 --module fcaps.wsgi --master --enable-threads --processes 4 & |