summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorxinhuili <lxinhui@vmware.com>2017-09-11 03:15:09 +0000
committerGerrit Code Review <gerrit@onap.org>2017-09-11 03:15:09 +0000
commit0cc1fbffa4c74b917dd0f1548a1c6fca6b47afb6 (patch)
treec61ea63ae2bd899844e9afbd83a08e412ccaa07c
parentbce887641f3a8217f472e8bd20e0a4d59b90496a (diff)
parentb1940de09a25868555ef61c401e454dc35b6b2d5 (diff)
Merge "Update build_image.sh"
-rw-r--r--multivimbroker/docker/build-image.sh32
-rw-r--r--multivimbroker/pom.xml47
2 files changed, 29 insertions, 50 deletions
diff --git a/multivimbroker/docker/build-image.sh b/multivimbroker/docker/build-image.sh
index b6f4dd4..73a8db6 100644
--- a/multivimbroker/docker/build-image.sh
+++ b/multivimbroker/docker/build-image.sh
@@ -1,6 +1,32 @@
#!/bin/bash
+DIRNAME=`dirname $0`
+DOCKER_BUILD_DIR=`cd $DIRNAME/; pwd`
+echo "DOCKER_BUILD_DIR=${DOCKER_BUILD_DIR}"
+cd ${DOCKER_BUILD_DIR}
-IMAGE="multicloud-framework"
-VERSION="latest"
+BUILD_ARGS="--no-cache"
+ORG="onap"
+VERSION="1.0.0-SNAPSHOT"
+PROJECT="multicloud"
+IMAGE="framework"
+DOCKER_REPOSITORY="nexus3.onap.org:10003"
+IMAGE_NAME="${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/${IMAGE}"
-docker build -t ${IMAGE}:${VERSION} . \ No newline at end of file
+if [ $HTTP_PROXY ]; then
+ BUILD_ARGS+=" --build-arg HTTP_PROXY=${HTTP_PROXY}"
+fi
+if [ $HTTPS_PROXY ]; then
+ BUILD_ARGS+=" --build-arg HTTPS_PROXY=${HTTPS_PROXY}"
+fi
+
+function build_image {
+ docker build ${BUILD_ARGS} -t ${IMAGE_NAME}:${VERSION} -t ${IMAGE_NAME}:latest .
+}
+
+function push_image {
+ docker push ${IMAGE_NAME}:${VERSION}
+ docker push ${IMAGE_NAME}:latest
+}
+
+build_image
+push_image \ No newline at end of file
diff --git a/multivimbroker/pom.xml b/multivimbroker/pom.xml
index 8affa09..560b1b1 100644
--- a/multivimbroker/pom.xml
+++ b/multivimbroker/pom.xml
@@ -49,51 +49,4 @@
</plugin>
</plugins>
</build>
- <profiles>
- <profile>
- <id>docker</id>
- <build>
- <plugins>
- <plugin>
- <groupId>io.fabric8</groupId>
- <artifactId>docker-maven-plugin</artifactId>
- <version>0.16.5</version>
- <inherited>false</inherited>
- <configuration>
- <images>
- <image>
- <name>onap/multicloud/multicloud-framework</name>
- <build>
- <cleanup>try</cleanup>
- <dockerFileDir>${basedir}/docker/</dockerFileDir>
- <dockerFile>${basedir}/docker/Dockerfile</dockerFile>
- <tags>
- <tag>${project.version}-STAGING-latest</tag>
- </tags>
- </build>
- </image>
- </images>
- </configuration>
- <executions>
- <execution>
- <id>generate-images</id>
- <phase>package</phase>
- <goals>
- <goal>build</goal>
- </goals>
- </execution>
- <execution>
- <id>push-images</id>
- <phase>deploy</phase>
- <goals>
- <goal>build</goal>
- <goal>push</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project> \ No newline at end of file