Merge "Add fake_cloud user guide docs"

diff --git a/multivimbroker/docker/Dockerfile b/multivimbroker/docker/Dockerfile
index 4cd71c0..84ed035 100644 (file)
--- a/multivimbroker/docker/Dockerfile
+++ b/multivimbroker/docker/Dockerfile
@@ -14,7 +14,7 @@ EXPOSE 9001
 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" && \
+    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=LATEST" && \
     unzip -q -o -B multicloud-framework.zip && \
     rm -f multicloud-framework.zip && \
     pip install -r /opt/multivimbroker/requirements.txt

diff --git a/multivimbroker/docker/build_image.sh b/multivimbroker/docker/build_image.sh
index 73a8db6..5ff0adf 100644 (file)
--- a/multivimbroker/docker/build_image.sh
+++ b/multivimbroker/docker/build_image.sh
@@ -7,6 +7,7 @@ cd ${DOCKER_BUILD_DIR}
 BUILD_ARGS="--no-cache"
 ORG="onap"
 VERSION="1.0.0-SNAPSHOT"
+STAGING_VERSION="1.0.0-STAGING"
 PROJECT="multicloud"
 IMAGE="framework"
 DOCKER_REPOSITORY="nexus3.onap.org:10003"
@@ -20,11 +21,12 @@ if [ $HTTPS_PROXY ]; then
 fi
 
 function build_image {
-    docker build ${BUILD_ARGS} -t ${IMAGE_NAME}:${VERSION} -t ${IMAGE_NAME}:latest .
+    docker build ${BUILD_ARGS} -t ${IMAGE_NAME}:${VERSION} -t ${IMAGE_NAME}:latest -t ${IMAGE_NAME}:${STAGING_VERSION} .
 }
 
 function push_image {
     docker push ${IMAGE_NAME}:${VERSION}
+    docker push ${IMAGE_NAME}:${STAGING_VERSION}
     docker push ${IMAGE_NAME}:latest
 }
 

diff --git a/multivimbroker/pom.xml b/multivimbroker/pom.xml
index cd80d6c..ac66441 100644 (file)
--- a/multivimbroker/pom.xml
+++ b/multivimbroker/pom.xml
@@ -15,17 +15,16 @@
     xmlns="http://maven.apache.org/POM/4.0.0" 
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <groupId>org.onap.oparent</groupId>
-        <artifactId>oparent</artifactId>
+        <groupId>org.onap.multicloud.framework</groupId>
+        <artifactId>multicloud-framework</artifactId>
         <version>1.0.0-SNAPSHOT</version>
-        <relativePath>../oparent</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <groupId>org.onap.multicloud.framework</groupId>
-    <artifactId>multicloud-framework</artifactId>
+    <groupId>org.onap.multicloud.framework.broker</groupId>
+    <artifactId>multicloud-framework-broker</artifactId>
     <version>1.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
-    <name>multicloud-framework</name>
+    <name>multicloud-framework-broker</name>
     <description>multivim broker</description>
     <build>
         <plugins>