From c763387cf77eef9e5a9def4b46d6260dd5aa1766 Mon Sep 17 00:00:00 2001 From: Ethan Lynn Date: Mon, 28 Aug 2017 16:45:26 +0800 Subject: [PATCH 1/1] Add Dockerfile for MultiCloud Framework Change-Id: If3eea09eada26d2a51347642fd8cd1e1e96228a2 issue-id: MULTICLOUD-73 Signed-off-by: Ethan Lynn --- multivimbroker/docker/Dockerfile | 23 +++++++++ multivimbroker/docker/build-image.sh | 6 +++ multivimbroker/pom.xml | 93 +++++++++++++++++++++++++++--------- multivimbroker/run.sh | 28 ++++++----- 4 files changed, 116 insertions(+), 34 deletions(-) create mode 100644 multivimbroker/docker/Dockerfile create mode 100644 multivimbroker/docker/build-image.sh diff --git a/multivimbroker/docker/Dockerfile b/multivimbroker/docker/Dockerfile new file mode 100644 index 0000000..4cd71c0 --- /dev/null +++ b/multivimbroker/docker/Dockerfile @@ -0,0 +1,23 @@ +FROM python:2 + +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_SCHEMA_VERSION "v11" +ENV AAI_USERNAME "AAI" +ENV AAI_PASSWORD "AAI" + +EXPOSE 9001 + +# COPY ./ /opt/multivimbroker/ +RUN apt-get update && \ + apt-get install -y unzip && \ + cd /opt/ && \ + wget -O multicloud-framework.zip "https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.multicloud.framework&a=multicloud-framework&e=zip&v=LATEST" && \ + unzip -q -o -B multicloud-framework.zip && \ + rm -f multicloud-framework.zip && \ + pip install -r /opt/multivimbroker/requirements.txt + +WORKDIR /opt/multivimbroker +CMD /bin/sh -c /opt/multivimbroker/run.sh \ No newline at end of file diff --git a/multivimbroker/docker/build-image.sh b/multivimbroker/docker/build-image.sh new file mode 100644 index 0000000..b6f4dd4 --- /dev/null +++ b/multivimbroker/docker/build-image.sh @@ -0,0 +1,6 @@ +#!/bin/bash + +IMAGE="multicloud-framework" +VERSION="latest" + +docker build -t ${IMAGE}:${VERSION} . \ No newline at end of file diff --git a/multivimbroker/pom.xml b/multivimbroker/pom.xml index 57a49fc..8affa09 100644 --- a/multivimbroker/pom.xml +++ b/multivimbroker/pom.xml @@ -11,7 +11,9 @@ distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. --> - + org.onap.oparent oparent @@ -26,25 +28,72 @@ multicloud/framework multivim broker - - - maven-assembly-plugin - - false - - assembly.xml - - - - - make-assembly - package - - single - - - - - + + + maven-assembly-plugin + + false + + assembly.xml + + + + + make-assembly + package + + single + + + + + - + + + docker + + + + io.fabric8 + docker-maven-plugin + 0.16.5 + false + + + + onap/multicloud/multicloud-framework + + try + ${basedir}/docker/ + ${basedir}/docker/Dockerfile + + ${project.version}-STAGING-latest + + + + + + + + generate-images + package + + build + + + + push-images + deploy + + build + push + + + + + + + + + \ No newline at end of file diff --git a/multivimbroker/run.sh b/multivimbroker/run.sh index 3fb6e80..48b8476 100755 --- a/multivimbroker/run.sh +++ b/multivimbroker/run.sh @@ -1,13 +1,17 @@ #!/bin/bash -# Copyright (c) 2017 Wind River Systems, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at: -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -nohup python manage.py runserver 127.0.0.1:9001 > /dev/null & + +sed -i "s/MSB_SERVICE_IP =.*/MSB_SERVICE_IP = \"${MSB_ADDR}\"/g" multivimbroker/pub/config/config.py +sed -i "s/MSB_SERVICE_PORT =.*/MSB_SERVICE_PORT = \"${MSB_PORT}\"/g" multivimbroker/pub/config/config.py +sed -i "s/AAI_ADDR =.*/AAI_ADDR = \"${AAI_ADDR}\"/g" multivimbroker/pub/config/config.py +sed -i "s/AAI_PORT =.*/AAI_PORT = \"${AAI_PORT}\"/g" multivimbroker/pub/config/config.py +sed -i "s/AAI_SCHEMA_VERSION =.*/AAI_SCHEMA_VERSION = \"${AAI_SCHEMA_VERSION}\"/g" multivimbroker/pub/config/config.py +sed -i "s/AAI_USERNAME =.*/AAI_USERNAME = \"${AAI_USERNAME}\"/g" multivimbroker/pub/config/config.py +sed -i "s/AAI_PASSWORD =.*/AAI_PASSWORD = \"${AAI_PASSWORD}\"/g" multivimbroker/pub/config/config.py + +nohup python manage.py runserver 0.0.0.0:9001 2>&1 & + +while [ ! -f logs/runtime_multivimbroker.log ]; do + sleep 1 +done + +tail -F logs/runtime_multivimbroker.log -- 2.16.6