summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfujinhua <fu.jinhua@zte.com.cn>2017-09-04 14:20:56 +0800
committerfujinhua <fu.jinhua@zte.com.cn>2017-09-04 14:20:56 +0800
commit346d3f843f339f829e599e08df00ca6d69580709 (patch)
treed64f1be3c7d3ebcdbfe2edb02112ac05f6c92479
parent9c76915d86fbedb50386708542c592d09bec4f39 (diff)
Add build dir to docker build script
Change-Id: Ie324dfb080d896be106aa16fead5a50418c762b6 Issue-Id: VFC-256 Signed-off-by: fujinhua <fu.jinhua@zte.com.cn>
-rwxr-xr-xlcm/docker/build_image.sh4
-rw-r--r--lcm/pom.xml47
2 files changed, 4 insertions, 47 deletions
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>