summaryrefslogtreecommitdiffstats
path: root/packages
diff options
context:
space:
mode:
authorJorge Hernandez <jorge.hernandez-herrero@att.com>2019-02-28 18:08:54 -0600
committerJorge Hernandez <jorge.hernandez-herrero@att.com>2019-02-28 18:10:27 -0600
commite6fd1ffd2b693e7c7a6dbfaac8f054da7291f023 (patch)
tree56092435c999600c92eb30e8c4641ada169bcb35 /packages
parent4b6547cc4004170b9550b02355ee8091a0d765fb (diff)
Fix pdp-x docker image build problems
Change-Id: I4023e4b5474b6ebb712179d134616f723e75432d Issue-ID: POLICY-1436 Signed-off-by: Jorge Hernandez <jorge.hernandez-herrero@att.com>
Diffstat (limited to 'packages')
-rw-r--r--packages/policy-xacmlpdp-docker/pom.xml4
-rw-r--r--packages/policy-xacmlpdp-docker/src/main/docker/Dockerfile4
-rw-r--r--packages/policy-xacmlpdp-tarball/src/main/package/tarball/assembly.xml8
3 files changed, 4 insertions, 12 deletions
diff --git a/packages/policy-xacmlpdp-docker/pom.xml b/packages/policy-xacmlpdp-docker/pom.xml
index bc45b3fb..08791167 100644
--- 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 b5f8af30..df42ca75 100644
--- 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 4c76c5a9..e08be24d 100644
--- a/packages/policy-xacmlpdp-tarball/src/main/package/tarball/assembly.xml
+++ b/packages/policy-xacmlpdp-tarball/src/main/package/tarball/assembly.xml
@@ -37,14 +37,6 @@
</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>
<includes>