From: Liang Ding <liang.ding@intel.com>
Date: Thu, 5 Sep 2019 18:20:20 +0000 (-0700)
Subject: Fix copy-resource issue of artifactbroker
X-Git-Tag: 1.4.1~4
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=multicloud%2Fframework.git;a=commitdiff_plain;h=refs%2Fchanges%2F77%2F95077%2F3

Fix copy-resource issue of artifactbroker

  - Change to install phase to make avail of artifacts
  - change binaryfilter for zip files
  - Build docker image with local artifact

Change-Id: Icf975056e4afeb0708385828189e96f660f86e03
Issue-ID: MULTICLOUD-806
Signed-off-by: Liang Ding <liang.ding@intel.com>
---

diff --git a/artifactbroker/docker/Dockerfile b/artifactbroker/docker/Dockerfile
index 8006e29..2e3f111 100644
--- a/artifactbroker/docker/Dockerfile
+++ b/artifactbroker/docker/Dockerfile
@@ -25,7 +25,7 @@ RUN mkdir -p ${ARTIFACT_DISTRIBUTION_HOME} ${ARTIFACT_LOGS} ${ARTIFACT_HOME}/etc
     chown  -R onap:onap ${ARTIFACT_HOME} ${ARTIFACT_DISTRIBUTION_HOME} ${ARTIFACT_LOGS}
 
 WORKDIR ${ARTIFACT_DISTRIBUTION_HOME}
-RUN wget -O multicloud-framework-artifactbroker-package-1.4.0-SNAPSHOT.zip "https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.multicloud.framework&a=multicloud-framework-artifactbroker-package&e=zip&v=1.4.0-SNAPSHOT" && \
+COPY ./multicloud-framework-artifactbroker-*.zip /opt/multicloud-framework-artifactbroker.zip && \
     unzip -q -o -B multicloud-framework-artifactbroker-package-1.4.0-SNAPSHOT.zip && \
     rm -f multicloud-framework-artifactbroker-package-1.4.0-SNAPSHOT.zip
 COPY artifact-dist.sh  bin/.
diff --git a/artifactbroker/pom.xml b/artifactbroker/pom.xml
index 7f2229d..f689997 100644
--- a/artifactbroker/pom.xml
+++ b/artifactbroker/pom.xml
@@ -238,17 +238,30 @@
                         <executions>
                             <execution>
                                 <id>copy-resources</id>
-                                <phase>validate</phase>
+                                <phase>install</phase>
                                 <goals>
                                     <goal>copy-resources</goal>
                                 </goals>
                                 <configuration>
+                                    <overwrite>true</overwrite>
+                                    <nonFilteredFileExtensions>
+                                        <nonFilteredFileExtension>zip</nonFilteredFileExtension>
+                                        <nonFilteredFileExtension>jar</nonFilteredFileExtension>
+                                    </nonFilteredFileExtensions>
                                     <outputDirectory>${project.basedir}/docker_target</outputDirectory>
                                     <resources>
                                         <resource>
                                             <directory>${project.basedir}/docker</directory>
                                             <filtering>true</filtering>
                                         </resource>
+                                        <resource>
+                                            <directory>${project.basedir}/target</directory>
+                                            <filtering>true</filtering>
+                                            <includes>
+                                                 <include>*.zip</include>
+                                                 <include>*.jar</include>
+                                            </includes>
+                                        </resource>
                                     </resources>
                                 </configuration>
                             </execution>