From f2b60295e7e93926ed875cccf5ef581d7d7a1314 Mon Sep 17 00:00:00 2001
From: Kai <lukai@chinamobile.com>
Date: Wed, 19 Feb 2020 17:43:26 +0800
Subject: fix Logfile not generated within container

Issue-ID: DCAEGEN2-2077
Signed-off-by: Kai Lu <lukai@chinamobile.com>
Change-Id: I877fcfb3c3c2c8ef1c0dae9249e65c5dfc29132a
---
 dcae-analytics/dcae-analytics-tca-web/Dockerfile   |  7 ++-
 dcae-analytics/dcae-analytics-tca-web/logback.xml  | 52 ----------------------
 .../src/main/resources/logback.xml                 | 52 ++++++++++++++++++++++
 3 files changed, 58 insertions(+), 53 deletions(-)
 delete mode 100644 dcae-analytics/dcae-analytics-tca-web/logback.xml
 create mode 100644 dcae-analytics/dcae-analytics-tca-web/src/main/resources/logback.xml

diff --git a/dcae-analytics/dcae-analytics-tca-web/Dockerfile b/dcae-analytics/dcae-analytics-tca-web/Dockerfile
index 7e84380..b6e4778 100644
--- a/dcae-analytics/dcae-analytics-tca-web/Dockerfile
+++ b/dcae-analytics/dcae-analytics-tca-web/Dockerfile
@@ -12,8 +12,13 @@ ARG FINAL_JAR
 ARG DEPENDENCIES_DIR
 ARG DOCKER_ARTIFACT_DIR
 
+RUN mkdir -p /var/log/ONAP/dcaegen2/analytics/tca-gen2
 #Add a new user and group to allow container to be run as non-root
-RUN addgroup -S tca-gen2 && adduser -S -G tca-gen2 tca-gen2
+RUN addgroup -S tca-gen2 && adduser -S -G tca-gen2 tca-gen2; \
+    chmod a+rwx /opt; \
+    chmod a+rwx /var/log/ONAP/dcaegen2/analytics/tca-gen2; \
+    chown -R tca-gen2:tca-gen2 /opt; \
+    chown -R tca-gen2:tca-gen2 /var/log/ONAP/dcaegen2/analytics/tca-gen2
 
 #Copy dependencies and executable jar
 WORKDIR ${DOCKER_ARTIFACT_DIR}
diff --git a/dcae-analytics/dcae-analytics-tca-web/logback.xml b/dcae-analytics/dcae-analytics-tca-web/logback.xml
deleted file mode 100644
index 57348d3..0000000
--- a/dcae-analytics/dcae-analytics-tca-web/logback.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<!--
-  ~ ================================================================================
-  ~ Copyright (c) 2018 AT&T Intellectual Property. All rights reserved.
-  ~ ================================================================================
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~ ============LICENSE_END=========================================================
-  ~
-  -->
-
-<configuration>
-
-    <!-- SET ECOMP COMPONENT NAME -->
-    <property scope="context" name="componentName" value="dcae-analytics-tca"/>
-    <contextName>${componentName}</contextName>
-
-    <include resource="eelf-logback.xml"/>
-    <include resource="org/springframework/boot/logging/logback/base.xml"/>
-
-    <logger name="org.springframework" level="INFO"/>
-    <logger name="org.hibernate" level="WARN"/>
-    <logger name="springfox" level="INFO"/>
-    <logger name="org.xnio" level="INFO"/>
-    <logger name="io.undertow" level="INFO"/>
-    <logger name="org.apache" level="INFO"/>
-    <logger name="sun.rmi" level="INFO"/>
-    <logger name="org.mongodb" level="INFO"/>
-    <logger name="com.jayway" level="INFO"/>
-
-    <logger name="org.springframework.retry" level="INFO"/>
-    <logger name="org.onap.dcae.analytics" level="INFO"/>
-
-    <root level="INFO">
-        <!-- required appenders -->
-        <appender-ref ref="auditLogAppender"/>
-        <appender-ref ref="metricLogAppender"/>
-        <appender-ref ref="errorLogAppender"/>
-
-        <!-- app properties -->
-        <appender-ref ref="FILE"/>
-    </root>
-
-</configuration>
diff --git a/dcae-analytics/dcae-analytics-tca-web/src/main/resources/logback.xml b/dcae-analytics/dcae-analytics-tca-web/src/main/resources/logback.xml
new file mode 100644
index 0000000..57348d3
--- /dev/null
+++ b/dcae-analytics/dcae-analytics-tca-web/src/main/resources/logback.xml
@@ -0,0 +1,52 @@
+<!--
+  ~ ================================================================================
+  ~ Copyright (c) 2018 AT&T Intellectual Property. All rights reserved.
+  ~ ================================================================================
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~ ============LICENSE_END=========================================================
+  ~
+  -->
+
+<configuration>
+
+    <!-- SET ECOMP COMPONENT NAME -->
+    <property scope="context" name="componentName" value="dcae-analytics-tca"/>
+    <contextName>${componentName}</contextName>
+
+    <include resource="eelf-logback.xml"/>
+    <include resource="org/springframework/boot/logging/logback/base.xml"/>
+
+    <logger name="org.springframework" level="INFO"/>
+    <logger name="org.hibernate" level="WARN"/>
+    <logger name="springfox" level="INFO"/>
+    <logger name="org.xnio" level="INFO"/>
+    <logger name="io.undertow" level="INFO"/>
+    <logger name="org.apache" level="INFO"/>
+    <logger name="sun.rmi" level="INFO"/>
+    <logger name="org.mongodb" level="INFO"/>
+    <logger name="com.jayway" level="INFO"/>
+
+    <logger name="org.springframework.retry" level="INFO"/>
+    <logger name="org.onap.dcae.analytics" level="INFO"/>
+
+    <root level="INFO">
+        <!-- required appenders -->
+        <appender-ref ref="auditLogAppender"/>
+        <appender-ref ref="metricLogAppender"/>
+        <appender-ref ref="errorLogAppender"/>
+
+        <!-- app properties -->
+        <appender-ref ref="FILE"/>
+    </root>
+
+</configuration>
-- 
cgit 1.2.3-korg