From ad00ebee9b2041b0d5035373e0a0c76b5a1af70c Mon Sep 17 00:00:00 2001
From: Walter Oggioni <oggioni.walter@gmail.com>
Date: Thu, 20 Feb 2025 13:39:27 +0800
Subject: [PATCH] made logback configuration file overridable in Docker image
 without changing ENTRYPOINT

---
 .../resources/net/woggioni/rbcs/cli => conf}/logback.xml  | 0
 .../net/woggioni/rbcs/cli => conf}/logging.properties     | 0
 docker/Dockerfile                                         | 3 ++-
 docker/build.gradle                                       | 5 +++--
 rbcs-cli/build.gradle                                     | 8 ++++++++
 5 files changed, 13 insertions(+), 3 deletions(-)
 rename {rbcs-cli/src/main/resources/net/woggioni/rbcs/cli => conf}/logback.xml (100%)
 rename {rbcs-cli/src/main/resources/net/woggioni/rbcs/cli => conf}/logging.properties (100%)

diff --git a/rbcs-cli/src/main/resources/net/woggioni/rbcs/cli/logback.xml b/conf/logback.xml
similarity index 100%
rename from rbcs-cli/src/main/resources/net/woggioni/rbcs/cli/logback.xml
rename to conf/logback.xml
diff --git a/rbcs-cli/src/main/resources/net/woggioni/rbcs/cli/logging.properties b/conf/logging.properties
similarity index 100%
rename from rbcs-cli/src/main/resources/net/woggioni/rbcs/cli/logging.properties
rename to conf/logging.properties
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 3d512fb..3bbbbfd 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -13,4 +13,5 @@ RUN mkdir plugins
 WORKDIR /home/luser/plugins
 RUN --mount=type=bind,source=.,target=/build/distributions tar -xf /build/distributions/rbcs-server-memcache*.tar
 WORKDIR /home/luser
-ENTRYPOINT ["java", "-XX:+UseSerialGC", "-XX:GCTimeRatio=24", "-jar", "/home/luser/rbcs.jar", "server"]
+ADD logback.xml .
+ENTRYPOINT ["java", "-Dlogback.configurationFile=logback.xml", "-XX:+UseSerialGC", "-XX:GCTimeRatio=24", "-jar", "/home/luser/rbcs.jar", "server"]
diff --git a/docker/build.gradle b/docker/build.gradle
index 826c1b9..4b23bce 100644
--- a/docker/build.gradle
+++ b/docker/build.gradle
@@ -30,6 +30,9 @@ Provider<Copy> prepareDockerBuild = tasks.register('prepareDockerBuild', Copy) {
     into project.layout.buildDirectory.file('docker')
     from(configurations.docker)
     from(file('Dockerfile'))
+    from(rootProject.file('conf')) {
+        include 'logback.xml'
+    }
 }
 
 Provider<DockerBuildImage> dockerBuild = tasks.register('dockerBuildImage', DockerBuildImage) {
@@ -63,5 +66,3 @@ Provider<DockerPushImage> dockerPush = tasks.register('dockerPushImage', DockerP
     }
     images = [dockerTag.flatMap{ it.tag }, dockerTagMemcache.flatMap{ it.tag }]
 }
-
-
diff --git a/rbcs-cli/build.gradle b/rbcs-cli/build.gradle
index ef25c5f..8c0e917 100644
--- a/rbcs-cli/build.gradle
+++ b/rbcs-cli/build.gradle
@@ -85,6 +85,14 @@ tasks.named(JlinkPlugin.JLINK_TASK_NAME, JlinkTask) {
     mainModule = 'net.woggioni.rbcs.cli'
 }
 
+tasks.named(JavaPlugin.PROCESS_RESOURCES_TASK_NAME, ProcessResources) {
+    from(rootProject.file('conf')) {
+        into('net/woggioni/rbcs/cli')
+        include 'logback.xml'
+        include 'logging.properties'
+    }
+}
+
 artifacts {
     release(envelopeJarTaskProvider)
 }