From fa2807e923d8612f107567b653038c169311c5d5 Mon Sep 17 00:00:00 2001
From: marsafyyy <mokhallid72@gmail.com>
Date: Thu, 16 May 2024 17:50:40 +0300
Subject: [PATCH] Updated docker file - containers now have the logs inside
 them

---
 .idea/compiler.xml                            | 6 ++++--
 .idea/encodings.xml                           | 1 +
 services/jobs/cassandra-config/cassandra.yaml | 8 ++++----
 services/payments/dockerfile                  | 5 ++++-
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 67890140..a2d709a9 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -11,10 +11,11 @@
         <outputRelativeToContentRoot value="true" />
         <module name="shared" />
         <module name="controller" />
-        <module name="contracts" />
-        <module name="users" />
         <module name="jobs" />
         <module name="payments" />
+        <module name="contracts" />
+        <module name="webserver" />
+        <module name="users" />
       </profile>
     </annotationProcessing>
   </component>
@@ -25,6 +26,7 @@
       <module name="jobs" options="-parameters" />
       <module name="payments" options="-parameters" />
       <module name="users" options="-parameters" />
+      <module name="webserver" options="-parameters" />
     </option>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index 58dfc1b4..05cc42ad 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -7,5 +7,6 @@
     <file url="file://$PROJECT_DIR$/services/jobs/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/services/payments/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/services/users/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/webserver/src/main/java" charset="UTF-8" />
   </component>
 </project>
\ No newline at end of file
diff --git a/services/jobs/cassandra-config/cassandra.yaml b/services/jobs/cassandra-config/cassandra.yaml
index 4a5239b4..a61bc9ca 100644
--- a/services/jobs/cassandra-config/cassandra.yaml
+++ b/services/jobs/cassandra-config/cassandra.yaml
@@ -463,7 +463,7 @@ seed_provider:
     parameters:
       # seeds is actually a comma-delimited list of addresses.
       # Ex: "<ip1>,<ip2>,<ip3>"
-      - seeds: "10.0.24.3"
+      - seeds: "10.0.7.3"
 
 # For workloads with more data than can fit in memory, Cassandra's
 # bottleneck will be reads that need to fetch data from
@@ -663,7 +663,7 @@ ssl_storage_port: 7001
 #
 # Setting listen_address to 0.0.0.0 is always wrong.
 #
-listen_address: 10.0.24.3
+listen_address: 10.0.7.3
 
 # Set listen_address OR listen_interface, not both. Interfaces must correspond
 # to a single address, IP aliasing is not supported.
@@ -677,7 +677,7 @@ listen_address: 10.0.24.3
 
 # Address to broadcast to other Cassandra nodes
 # Leaving this blank will set it to the same value as listen_address
-broadcast_address: 10.0.24.3
+broadcast_address: 10.0.7.3
 
 # When using multiple physical network interfaces, set this
 # to true to listen on broadcast_address in addition to
@@ -763,7 +763,7 @@ rpc_address: 0.0.0.0
 # be set to 0.0.0.0. If left blank, this will be set to the value of
 # rpc_address. If rpc_address is set to 0.0.0.0, broadcast_rpc_address must
 # be set.
-broadcast_rpc_address: 10.0.24.3
+broadcast_rpc_address: 10.0.7.3
 
 # enable or disable keepalive on rpc/native connections
 rpc_keepalive: true
diff --git a/services/payments/dockerfile b/services/payments/dockerfile
index 9a2c5840..7a8aae01 100644
--- a/services/payments/dockerfile
+++ b/services/payments/dockerfile
@@ -1,5 +1,8 @@
 FROM eclipse-temurin:21-jre-alpine
+RUN mkdir -p /logs
+RUN chmod -R 777 /logs
 VOLUME /tmp
 ARG JAR_FILE=target/*.jar
 COPY ${JAR_FILE} payments.jar
-ENTRYPOINT ["sh", "-c", "java ${JAVA_OPTS} -jar /payments.jar ${0} ${@}"]
\ No newline at end of file
+COPY src/main/resources/log4j2.xml /log4j2.xml
+ENTRYPOINT ["sh", "-c", "java ${JAVA_OPTS} -Dlog4j.configurationFile=/log4j2.xml -jar /payments.jar ${0} ${@}"]
\ No newline at end of file