Fix pdp-x docker image build problems

Change-Id: I4023e4b5474b6ebb712179d134616f723e75432d
Issue-ID: POLICY-1436
Signed-off-by: Jorge Hernandez <jorge.hernandez-herrero@att.com>

diff --git a/packages/policy-xacmlpdp-docker/pom.xml b/packages/policy-xacmlpdp-docker/pom.xml
index bc45b3f..0879116 100644 (file)
--- a/packages/policy-xacmlpdp-docker/pom.xml
+++ b/packages/policy-xacmlpdp-docker/pom.xml
@@ -107,7 +107,7 @@
                                         <dependencySets>
                                             <dependencySet>
                                                 <includes>
-                                                    <include>org.onap.policy.xacmlpdp:policy-xacmlpdp-tarball</include>
+                                                    <include>org.onap.policy.xacml-pdp:policy-xacmlpdp-tarball</include>
                                                 </includes>
                                                 <outputDirectory>/lib</outputDirectory>
                                                 <outputFileNameMapping>policy-xacmlpdp.tar.gz</outputFileNameMapping>
@@ -148,7 +148,7 @@
                             <goal>push</goal>
                         </goals>
                         <configuration>
-                            <image>onap/policy-xacmp-pdp</image>
+                            <image>onap/policy-xacml-pdp</image>
                         </configuration>
                     </execution>
                 </executions>

diff --git a/packages/policy-xacmlpdp-docker/src/main/docker/Dockerfile b/packages/policy-xacmlpdp-docker/src/main/docker/Dockerfile
index b5f8af3..df42ca7 100644 (file)
--- a/packages/policy-xacmlpdp-docker/src/main/docker/Dockerfile
+++ b/packages/policy-xacmlpdp-docker/src/main/docker/Dockerfile
@@ -33,8 +33,8 @@ RUN mkdir -p ${POLICY_PDPX_HOME} ${POLICY_LOGS} ${POLICY_HOME}/etc/ssl ${POLICY_
 
 RUN mkdir /packages
 COPY /maven/* /packages
-RUN tar xvfz /packages/policy-xacml-pdp.tar.gz --directory ${POLICY_PDPX_HOME}
-RUN rm /packages/policy-xacml-pdp.tar.gz
+RUN tar xvfz /packages/policy-xacmlpdp.tar.gz --directory ${POLICY_PDPX_HOME}
+RUN rm /packages/policy-xacmlpdp.tar.gz
 
 WORKDIR ${POLICY_PDPX_HOME}
 COPY policy-pdpx.sh  bin/.

diff --git a/packages/policy-xacmlpdp-tarball/src/main/package/tarball/assembly.xml b/packages/policy-xacmlpdp-tarball/src/main/package/tarball/assembly.xml
index 4c76c5a..e08be24 100644 (file)
--- a/packages/policy-xacmlpdp-tarball/src/main/package/tarball/assembly.xml
+++ b/packages/policy-xacmlpdp-tarball/src/main/package/tarball/assembly.xml
@@ -36,14 +36,6 @@
         </dependencySet>
     </dependencySets>
     <fileSets>
-        <fileSet>
-            <directory>${project.basedir}/src/main/resources</directory>
-            <includes>
-                <include>policyLogger.properties</include>
-            </includes>
-            <outputDirectory>/bin/config</outputDirectory>
-            <lineEnding>unix</lineEnding>
-        </fileSet>
         <fileSet>
             <directory>${project.basedir}/src/main/resources/etc
             </directory>