commit 30a131e644eadbf58d4cd0688fb8ecb7d3a519b6
author Liang Ding <liang.ding@intel.com> Thu Sep 05 22:37:40 2019 -0700
committer Liang Ding <liang.ding@intel.com> Thu Sep 05 22:44:08 2019 -0700
tree dca679eabbe260f1dd7f4e500c625590680034ab
parent 78920e6afaf4b888e4e38fdf78dd24602656ea19

Fix copy-resource issue of artifactbroker

  -- fix docker generation issue

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

artifactbroker/docker/Dockerfile

diff --git a/artifactbroker/docker/Dockerfile b/artifactbroker/docker/Dockerfile
index 2e3f111..364acb9 100644
--- a/artifactbroker/docker/Dockerfile
+++ b/artifactbroker/docker/Dockerfile
@@ -25,9 +25,9 @@
     chown  -R onap:onap ${ARTIFACT_HOME} ${ARTIFACT_DISTRIBUTION_HOME} ${ARTIFACT_LOGS}
 
 WORKDIR ${ARTIFACT_DISTRIBUTION_HOME}
-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 ./multicloud-framework-artifactbroker-*.zip multicloud-framework-artifactbroker.zip
+RUN unzip -q -o -B multicloud-framework-artifactbroker.zip && \
+    rm -f multicloud-framework-artifactbroker.zip
 COPY artifact-dist.sh  bin/.
 #RUN tar xvfz /packages/policy-distribution.tar.gz --directory ${ARTIFACT_DISTRIBUTION_HOME}
 #RUN rm /packages/policy-distribution.tar.gz

artifactbroker/pom.xml

diff --git a/artifactbroker/pom.xml b/artifactbroker/pom.xml
index f689997..66cb5da 100644
--- a/artifactbroker/pom.xml
+++ b/artifactbroker/pom.xml
@@ -255,7 +255,7 @@
                                             <filtering>true</filtering>
                                         </resource>
                                         <resource>
-                                            <directory>${project.basedir}/target</directory>
+                                            <directory>${project.basedir}/packages/target</directory>
                                             <filtering>true</filtering>
                                             <includes>
                                                  <include>*.zip</include>