From: fujinhua <fu.jinhua@zte.com.cn>
Date: Mon, 4 Sep 2017 06:20:56 +0000 (+0800)
Subject: Add build dir to docker build script
X-Git-Tag: v1.0.0~30
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=vfc%2Fgvnfm%2Fvnflcm.git;a=commitdiff_plain;h=346d3f843f339f829e599e08df00ca6d69580709

Add build dir to docker build script

Change-Id: Ie324dfb080d896be106aa16fead5a50418c762b6
Issue-Id: VFC-256
Signed-off-by: fujinhua <fu.jinhua@zte.com.cn>
---

diff --git a/lcm/docker/build_image.sh b/lcm/docker/build_image.sh
index 947803dc..52ed777b 100755
--- a/lcm/docker/build_image.sh
+++ b/lcm/docker/build_image.sh
@@ -1,4 +1,8 @@
 #!/bin/bash
+DIRNAME=`dirname $0`
+DOCKER_BUILD_DIR=`cd $DIRNAME/; pwd`
+echo "DOCKER_BUILD_DIR=${DOCKER_BUILD_DIR}"
+cd ${DOCKER_BUILD_DIR}
 
 BUILD_ARGS="--no-cache"
 ORG="onap"
diff --git a/lcm/pom.xml b/lcm/pom.xml
index 4f025d56..7aba16f1 100644
--- a/lcm/pom.xml
+++ b/lcm/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/vfc/vnflcm</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>