aboutsummaryrefslogtreecommitdiffstats
path: root/packages
diff options
context:
space:
mode:
authorramverma <ram.krishna.verma@est.tech>2019-02-07 12:02:07 +0000
committerramverma <ram.krishna.verma@est.tech>2019-02-07 12:02:07 +0000
commit48a745734533d42e2d9e7b9d04d08cbe8ee1b62c (patch)
treeebbe4fd649cce4950db81bd76501042701c3aee4 /packages
parentb5f4934afdc2601c925e83458d0e3d136c36cf1c (diff)
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>
Diffstat (limited to 'packages')
-rw-r--r--packages/policy-distribution-docker/src/main/docker/Dockerfile2
-rw-r--r--packages/policy-distribution-tarball/src/main/package/tarball/assembly.xml8
2 files changed, 1 insertions, 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
@@ -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>