From 3774ab8ef02069d259cda0228c00b1702c5238cc Mon Sep 17 00:00:00 2001
From: Walter Oggioni <oggioni.walter@gmail.com>
Date: Tue, 10 Jun 2025 16:34:16 +0800
Subject: [PATCH] updated Netty to 4.2.2

---
 docker/Dockerfile                                | 16 ++++++++++++----
 gradle.properties                                |  2 +-
 gradle/wrapper/gradle-wrapper.properties         |  2 +-
 gradlew                                          |  3 +--
 .../net/woggioni/rbcs/cli/impl/RbcsCommand.kt    |  2 +-
 5 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 3db02d1..d59451d 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -16,11 +16,19 @@ WORKDIR /home/luser
 ADD logback.xml .
 ENTRYPOINT ["java", "-Dlogback.configurationFile=logback.xml", "-XX:MaxRAMPercentage=70", "-XX:GCTimeRatio=24", "-XX:+UseZGC", "-XX:+ZGenerational", "-jar", "/home/luser/rbcs.jar"]
 
+FROM busybox:musl AS base-native
+RUN mkdir -p /var/lib/rbcs /etc/rbcs
+RUN adduser -D -u 1000 rbcs -h /var/lib/rbcs
+
 FROM scratch AS release-native
-ADD rbcs-cli.upx /rbcs/rbcs-cli
-ENV RBCS_CONFIGURATION_DIR="/rbcs"
-WORKDIR /rbcs
-ENTRYPOINT ["/rbcs/rbcs-cli", "-XX:MaximumHeapSizePercent=70"]
+COPY --from=base-native /etc/passwd /etc/passwd
+COPY --from=base-native /etc/rbcs /etc/rbcs
+COPY --from=base-native /var/lib/rbcs /var/lib/rbcs
+ADD rbcs-cli.upx /usr/bin/rbcs-cli
+ENV RBCS_CONFIGURATION_DIR="/etc/rbcs"
+USER rbcs
+WORKDIR /var/lib/rbcs
+ENTRYPOINT ["/usr/bin/rbcs-cli", "-XX:MaximumHeapSizePercent=70"]
 
 FROM debian:12-slim AS release-jlink
 RUN mkdir -p /usr/share/java/rbcs
diff --git a/gradle.properties b/gradle.properties
index 629d03a..c830075 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,7 +4,7 @@ org.gradle.caching=true
 
 rbcs.version = 0.3.0-SNAPSHOT
 
-lys.version = 2025.05.07
+lys.version = 2025.06.10
 
 gitea.maven.url = https://gitea.woggioni.net/api/packages/woggioni/maven
 docker.registry.url=gitea.woggioni.net
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index cea7a79..ff23a68 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
index f5feea6..f3b75f3 100755
--- a/gradlew
+++ b/gradlew
@@ -86,8 +86,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
-' "$PWD" ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
diff --git a/rbcs-cli/src/main/kotlin/net/woggioni/rbcs/cli/impl/RbcsCommand.kt b/rbcs-cli/src/main/kotlin/net/woggioni/rbcs/cli/impl/RbcsCommand.kt
index 201f7af..d8d800a 100644
--- a/rbcs-cli/src/main/kotlin/net/woggioni/rbcs/cli/impl/RbcsCommand.kt
+++ b/rbcs-cli/src/main/kotlin/net/woggioni/rbcs/cli/impl/RbcsCommand.kt
@@ -12,7 +12,7 @@ abstract class RbcsCommand : Runnable {
         private set
 
     protected fun findConfigurationFile(app: Application, fileName : String): Path {
-        val confDir = app.computeConfigurationDirectory()
+        val confDir = app.computeConfigurationDirectory(false)
         val configurationFile = confDir.resolve(fileName)
         return configurationFile
     }