aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPamela Dragosh <pdragosh@research.att.com>2018-03-07 17:08:22 +0000
committerGerrit Code Review <gerrit@onap.org>2018-03-07 17:08:22 +0000
commiteefb77c4343190c7dff60f5ab506454dbd702b32 (patch)
tree7b612d7ba236c7fe024ee253f51d4f865f7f82fb
parent45980fe83716dd804d9b1ce115088d096454f6d3 (diff)
parent842fdfce58b6879217e1242596698509b06540a9 (diff)
Merge "Copy files for docker image in packages/docker/pom"
-rw-r--r--docker_build.sh3
-rw-r--r--docker_merge.sh3
-rw-r--r--docker_verify.sh3
-rw-r--r--packages/docker/pom.xml51
4 files changed, 49 insertions, 11 deletions
diff --git a/docker_build.sh b/docker_build.sh
index 1548eade7..d7794bf90 100644
--- a/docker_build.sh
+++ b/docker_build.sh
@@ -42,9 +42,6 @@ fi
echo $MVN_MAJMIN_VERSION
echo "Building $IMAGE"
-mkdir -p packages/docker/target/$IMAGE
-cp packages/docker/src/main/docker/* packages/docker/target/$IMAGE
-cp packages/install/target/install-$MVN_VERSION.zip packages/docker/target/$IMAGE/install.zip
#
# This is the local latest tagged image. The Dockerfile's need this to build images
diff --git a/docker_merge.sh b/docker_merge.sh
index c87dacea6..c8bde37e3 100644
--- a/docker_merge.sh
+++ b/docker_merge.sh
@@ -42,9 +42,6 @@ fi
echo $MVN_MAJMIN_VERSION
echo "Building $IMAGE"
-mkdir -p packages/docker/target/$IMAGE
-cp packages/docker/src/main/docker/* packages/docker/target/$IMAGE
-cp packages/install/target/install-$MVN_VERSION.zip packages/docker/target/$IMAGE/install.zip
#
# This is the local latest tagged image. The Dockerfile's need this to build images
diff --git a/docker_verify.sh b/docker_verify.sh
index a6dd00a13..dc405138f 100644
--- a/docker_verify.sh
+++ b/docker_verify.sh
@@ -45,9 +45,6 @@ fi
echo $MVN_MAJMIN_VERSION
echo "Building $IMAGE"
-mkdir -p packages/docker/target/$IMAGE
-cp packages/docker/src/main/docker/* packages/docker/target/$IMAGE
-cp packages/install/target/install-$MVN_VERSION.zip packages/docker/target/$IMAGE/install.zip
#
# This is the local latest tagged image. The Dockerfile's need this to build images
diff --git a/packages/docker/pom.xml b/packages/docker/pom.xml
index 02b1d871b..68b4d9266 100644
--- a/packages/docker/pom.xml
+++ b/packages/docker/pom.xml
@@ -29,9 +29,7 @@
<version>1.2.0-SNAPSHOT</version>
</parent>
- <groupId>org.onap.policy.engine</groupId>
<artifactId>docker</artifactId>
- <version>1.2.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Policy Engine - Docker build</name>
<description>ONAP Policy Docker Build</description>
@@ -42,6 +40,55 @@
<build>
<plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-pe-zip</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${project.build.directory}/policy-pe</outputDirectory>
+ <overWriteReleases>false</overWriteReleases>
+ <overWriteSnapshots>true</overWriteSnapshots>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.onap.policy.engine</groupId>
+ <artifactId>install</artifactId>
+ <version>${project.version}</version>
+ <type>zip</type>
+ <destFileName>install.zip</destFileName>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>3.0.2</version>
+ <executions>
+ <execution>
+ <id>copy-resources</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${project.build.directory}/policy-pe</outputDirectory>
+ <resources>
+ <resource>
+ <directory>src/main/docker</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>