aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimoney, Daniel (dt5972) <dtimoney@att.com>2017-04-25 12:40:01 +0000
committerTimoney, Daniel (dt5972) <dtimoney@att.com>2017-04-25 12:40:11 +0000
commit15323bede7688939ba20d72d03110c0fc6806bce (patch)
tree1154be2f375610cc55d955517644b8ddf0605326
parent687146e4c55b019970e4e642d572ebb3285486ca (diff)
[DOCKER] Fix dgbuilder
Fix dgbuilder docker container build Change-Id: I0601bcd807a7d79a01788fb2d021554f013e43ea Signed-off-by: Timoney, Daniel (dt5972) <dtimoney@att.com> Former-commit-id: b93e5937498c01c8b1969104a5045d75d9985895
-rw-r--r--dgbuilder/src/assembly/assemble_zip.xml2
-rw-r--r--installation/dgbuilder/pom.xml16
2 files changed, 16 insertions, 2 deletions
diff --git a/dgbuilder/src/assembly/assemble_zip.xml b/dgbuilder/src/assembly/assemble_zip.xml
index 7bf22d22..8b65f500 100644
--- a/dgbuilder/src/assembly/assemble_zip.xml
+++ b/dgbuilder/src/assembly/assemble_zip.xml
@@ -3,7 +3,7 @@
openECOMP : SDN-C
================================================================================
Copyright (C) 2017 AT&T Intellectual Property. All rights
- reserved.
+ reserved.
================================================================================
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
diff --git a/installation/dgbuilder/pom.xml b/installation/dgbuilder/pom.xml
index 953e309e..f3940b17 100644
--- a/installation/dgbuilder/pom.xml
+++ b/installation/dgbuilder/pom.xml
@@ -84,7 +84,7 @@
<executions>
<execution>
<id>generate-images</id>
- <phase>generate-sources</phase>
+ <phase>package</phase>
<goals>
<goal>build</goal>
</goals>
@@ -132,6 +132,20 @@
<version>1.5.0</version>
<executions>
<execution>
+ <id>Make-stage-dir</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>exec</goal>
+ </goals>
+ <configuration>
+ <executable>/bin/mkdir</executable>
+ <arguments>
+ <argument>-p</argument>
+ <argument>${basedir}/target/docker-stage/opt/openecomp/sdnc</argument>
+ </arguments>
+ </configuration>
+ </execution>
+ <execution>
<id>Unzip dgbuilder</id>
<phase>generate-sources</phase>
<goals>