From 48a745734533d42e2d9e7b9d04d08cbe8ee1b62c Mon Sep 17 00:00:00 2001
From: ramverma <ram.krishna.verma@est.tech>
Date: Thu, 7 Feb 2019 12:02:07 +0000
Subject: Fix docker build in policy/distribution

policyLoger.properties file was removed as part of moving to slf4j
for logging. But the assembly.xml file was still refering to it. Since
the file was not there the /bin directory was missing from the
created package. Resulting in docker builds failing.

Change-Id: Ia800c949d180d592aa0adb6cf61773b37329be48
Issue-ID: POLICY-1346
Signed-off-by: ramverma <ram.krishna.verma@est.tech>
---
 packages/policy-distribution-docker/src/main/docker/Dockerfile    | 2 +-
 .../src/main/package/tarball/assembly.xml                         | 8 --------
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/packages/policy-distribution-docker/src/main/docker/Dockerfile b/packages/policy-distribution-docker/src/main/docker/Dockerfile
index 34061856..1a55e6c7 100644
--- a/packages/policy-distribution-docker/src/main/docker/Dockerfile
+++ b/packages/policy-distribution-docker/src/main/docker/Dockerfile
@@ -28,7 +28,7 @@ RUN \
 RUN groupadd policy 
 RUN useradd --create-home --shell /bin/bash -g policy policy
 
-RUN mkdir -p ${POLICY_DISTRIBUTION_HOME} ${POLICY_LOGS} ${POLICY_HOME}/etc/ssl && \
+RUN mkdir -p ${POLICY_DISTRIBUTION_HOME} ${POLICY_LOGS} ${POLICY_HOME}/etc/ssl ${POLICY_DISTRIBUTION_HOME}/bin && \
     chown  -R policy:policy ${POLICY_HOME} ${POLICY_DISTRIBUTION_HOME} ${POLICY_LOGS}
 
 RUN mkdir /packages
diff --git a/packages/policy-distribution-tarball/src/main/package/tarball/assembly.xml b/packages/policy-distribution-tarball/src/main/package/tarball/assembly.xml
index 351fe7e3..af3d5774 100644
--- a/packages/policy-distribution-tarball/src/main/package/tarball/assembly.xml
+++ b/packages/policy-distribution-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>
-- 
cgit 1.2.3-korg