FINERACT-2009: Upgrade latest framework libs

config/docker/compose/activemq.yml

@@ -22,5 +22,5 @@ services:
   activemq:
     image: symptoma/activemq:5.18.3
     ports:
-      - 6161:6161
-      - 61616:61616
+      - "6161:6161"
+      - "61616:61616"

config/docker/compose/fineract-custom.yml

@@ -0,0 +1,32 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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.
+#
+
+version: "3.8"
+
+services:
+  fineract:
+    # user: "${FINERACT_USER}:${FINERACT_GROUP}"
+    image: fineract-custom:latest
+    volumes:
+      - ${PWD}/config/docker/logback/logback-override.xml:/app/logback-override.xml
+      - ${PWD}/config/docker/aws/etc/credentials:/etc/aws/credentials:ro
+      - ${PWD}/build/fineract/logs:/var/logs/fineract:rw
+    healthcheck:
+      test: ["CMD", 'sh', '-c', 'echo -e "Checking for the availability of Fineract server deployment"; while ! nc -z "localhost" 8443; do sleep 1; printf "-"; done; echo -e " >> Fineract server has started";' ]
+      timeout: 1s
+      retries: 60

config/docker/compose/fineract.yml

@@ -20,12 +20,13 @@ version: "3.8"
 
 services:
   fineract:
+    # user: "${FINERACT_USER}:${FINERACT_GROUP}"
     image: fineract:latest
     volumes:
-      - ../aws/etc/credentials:/etc/aws/credentials
+      - ${PWD}/config/docker/logback/logback-override.xml:/app/logback-override.xml
+      - ${PWD}/config/docker/aws/etc/credentials:/etc/aws/credentials:ro
+      - ${PWD}/build/fineract/logs:/var/logs/fineract:rw
     healthcheck:
-      test: ["CMD", 'sh', '-c', 'echo -e "Checking for the availability of Fineract server deployment"; while ! nc -z "fineract-server" 8443; do sleep 1; printf "-"; done; echo -e " >> Fineract server has started";' ]
-      timeout: 10s
-      retries: 10
-    env_file:
-      - ../env/fineract-common.env
+      test: ["CMD", 'sh', '-c', 'echo -e "Checking for the availability of Fineract server deployment"; while ! nc -z "localhost" 8443; do sleep 1; printf "-"; done; echo -e " >> Fineract server has started";' ]
+      timeout: 1s
+      retries: 60

config/docker/compose/mariadb.yml

@@ -13,22 +13,20 @@
 # "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.
-#
-
 version: "3.8"
 
 services:
   mariadb:
-    image: mariadb:11.0
+    container_name: mariadb
+    image: mariadb:11.2
     volumes:
-      - ../mysql/conf.d/server_collation.cnf:/etc/mysql/conf.d/server_collation.cnf
-      - ../mysql/docker-entrypoint-initdb.d:/docker-entrypoint-initdb.d:Z,ro
+      - ${PWD}/config/docker/mysql/conf.d/server_collation.cnf:/etc/mysql/conf.d/server_collation.cnf:ro
+      - ${PWD}/config/docker/mysql/docker-entrypoint-initdb.d:/docker-entrypoint-initdb.d:Z,ro
     restart: always
     env_file:
-      - ../env/mysql.env
+      - ${PWD}/config/docker/env/mysql.env
     healthcheck:
-      test: ["CMD", "healthcheck.sh", "--su-mysql", "--connect", "--innodb_initialized"]
+      test: [ "CMD", "healthcheck.sh", "--su-mysql", "--connect", "--innodb_initialized" ]
       timeout: 10s
       retries: 10
     ports:

config/docker/compose/observability.yml

@@ -31,31 +31,35 @@ version: "3.8"
 
 services:
   loki:
+    container_name: loki
     image: grafana/loki:2.9.2
     command: -config.file=/etc/loki/local-config.yaml
     ports:
       - "3100:3100"
 
   prometheus:
+    container_name: prometheus
     image: prom/prometheus:v2.47.2
     command: '--config.file=/etc/prometheus/prometheus.yml'
     ports:
       - "9090:9090"
     volumes:
-      - ../prometheus/etc:/etc/prometheus
+      - ${PWD}/config/docker/prometheus/etc:/etc/prometheus
     logging: *default-logging
 
   grafana:
+    container_name: grafana
     image: grafana/grafana-oss:10.2.0
     ports:
       - "3000:3000"
     volumes:
-      - ../grafana/datasources:/etc/grafana/provisioning/datasources
-      - ../grafana/etc/dashboards.yml:/etc/grafana/provisioning/dashboards/dashboards.yaml
-      - ../grafana/dashboards:/var/lib/grafana/dashboards
+      - ${PWD}/config/docker/grafana/datasources:/etc/grafana/provisioning/datasources
+      - ${PWD}/config/docker/grafana/etc/dashboards.yml:/etc/grafana/provisioning/dashboards/dashboards.yaml
+      - ${PWD}/config/docker/grafana/dashboards:/var/lib/grafana/dashboards
     logging: *default-logging
 
   tempo:
+    container_name: tempo
     image: grafana/tempo:2.2.4
     # command: [ "--target=all", "--storage.trace.backend=local", "--storage.trace.local.path=/tmp/tempo", "--auth.enabled=false" ]
     command: [ "-config.file=/etc/tempo.yml" ]
@@ -67,6 +71,6 @@ services:
       - "4318:4318"   # otlp http
       - "9411:9411"   # zipkin
     volumes:
-      - ../tempo/etc/tempo.yml:/etc/tempo.yml
+      - ${PWD}/config/docker/tempo/etc/tempo.yml:/etc/tempo.yml
       - /tmp/tempo:/tmp/tempo
     logging: *default-logging

config/docker/compose/postgresql.yml

@@ -20,12 +20,12 @@ version: "3.8"
 
 services:
   postgresql:
-    image: postgres:16.0
+    image: postgres:16.1
     volumes:
-      - ../postgresql/docker-entrypoint-initdb.d:/docker-entrypoint-initdb.d/:Z,ro
+      - ${PWD}/config/docker/postgresql/docker-entrypoint-initdb.d/01-init.sh:/docker-entrypoint-initdb.d/01-init.sh:Z,ro
     restart: always
     env_file:
-      - ../env/postgresql.env
+      - ${PWD}/config/docker/env/postgresql.env
     healthcheck:
       test: [ "CMD", "pg_isready", "-q", "-d", "postgres", "-U", "root" ]
       timeout: 10s

config/docker/env/debug.env

@@ -18,4 +18,5 @@
 #
 
 # see here for more details related to JFR: https://access.redhat.com/documentation/en-us/red_hat_build_of_openjdk/8/html/using_jdk_flight_recorder_with_red_hat_build_of_openjdk/configure-jfr-options
-JAVA_TOOL_OPTIONS="-Xmx2G -Xms2G -XX:TieredStopAtLevel=1 -XX:+UseContainerSupport -XX:+UseStringDeduplication -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5000 -XX:+UnlockDiagnosticVMOptions -XX:+DebugNonSafepoints -XX:StartFlightRecording=delay=20s,duration=60s,disk=true,name=fineract,dumponexit=true,filename=/tmp/fineract.jfr,settings=profile -Xlog:jfr=info"
+# JAVA_TOOL_OPTIONS="-Xmx2G -Xms2G -Dlogging.config=/app/logback-override.xml -XX:TieredStopAtLevel=1 -XX:+UseContainerSupport -XX:+UseStringDeduplication -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5000 -XX:+UnlockDiagnosticVMOptions -XX:+DebugNonSafepoints -XX:StartFlightRecording=delay=20s,duration=60s,disk=true,name=fineract,path-to-gc-roots=true,dumponexit=true,filename=/var/logs/fineract/fineract.jfr,settings=profile -Xlog:jfr=info"
+JAVA_TOOL_OPTIONS="-Xmx2G -Xms2G -Dlogging.config=/app/logback-override.xml -XX:TieredStopAtLevel=1 -XX:+UseContainerSupport -XX:+UseStringDeduplication -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5000 -XX:+UnlockDiagnosticVMOptions -XX:+DebugNonSafepoints -Xlog:jfr=info"

config/docker/env/fineract-common.env

@@ -18,6 +18,8 @@
 #
 
 # ... following variables are optional; "application.properties" contains reasonable defaults (same as here)
+FINERACT_USER=1000
+FINERACT_GROUP=1000
 FINERACT_HIKARI_MINIMUM_IDLE=3
 FINERACT_HIKARI_MAXIMUM_POOL_SIZE=10
 FINERACT_HIKARI_IDLE_TIMEOUT=60000
@@ -25,6 +27,8 @@ FINERACT_HIKARI_CONNECTION_TIMEOUT=20000
 FINERACT_HIKARI_TEST_QUERY=SELECT 1
 FINERACT_HIKARI_AUTO_COMMIT=true
 FINERACT_SERVER_SSL_ENABLED=true
+FINERACT_HIKARI_USERNAME=root
+FINERACT_HIKARI_PASSWORD=skdcnwauicn2ucnaecasdsajdnizucawencascdca
 FINERACT_HIKARI_DS_PROPERTIES_CACHE_PREP_STMTS=true
 FINERACT_HIKARI_DS_PROPERTIES_PREP_STMT_CACHE_SIZE=250
 FINERACT_HIKARI_DS_PROPERTIES_PREP_STMT_CACHE_SQL_LIMIT=2048
@@ -37,14 +41,19 @@ FINERACT_HIKARI_DS_PROPERTIES_ELIDE_SET_AUTO_COMMITS=true
 FINERACT_HIKARI_DS_PROPERTIES_MAINTAIN_TIME_STATS=false
 FINERACT_HIKARI_DS_PROPERTIES_LOG_SLOW_QUERIES=true
 FINERACT_HIKARI_DS_PROPERTIES_DUMP_QUERIES_IN_EXCEPTION=true
+# NOTE: env vars prefixed "FINERACT_DEFAULT_TENANTDB_*" are used to create the default tenant database
 FINERACT_DEFAULT_TENANTDB_CONN_PARAMS=
 FINERACT_DEFAULT_TENANTDB_TIMEZONE=Asia/Kolkata
 FINERACT_DEFAULT_TENANTDB_IDENTIFIER=default
 FINERACT_DEFAULT_TENANTDB_NAME=fineract_default
 FINERACT_DEFAULT_TENANTDB_DESCRIPTION=Default Demo Tenant
+FINERACT_DEFAULT_TENANTDB_HOSTNAME=db
+FINERACT_DEFAULT_TENANTDB_PWD=skdcnwauicn2ucnaecasdsajdnizucawencascdca
+FINERACT_DEFAULT_MASTER_PASSWORD=fineract
 FINERACT_MANAGEMENT_ENDPOINT_WEB_EXPOSURE_INCLUDE=health,info,prometheus
 FINERACT_MANAGEMENT_METRICS_TAGS_APPLICATION=fineract
 FINERACT_REMOTE_JOB_MESSAGE_HANDLER_SPRING_EVENTS_ENABLED=false
+FINERACT_INSECURE_HTTP_CLIENT=true
 SPRING_PROFILES_ACTIVE=test,diagnostics
 OTEL_SERVICE_NAME=fineract
 JAVA_TOOL_OPTIONS="-Xmx1G -XX:TieredStopAtLevel=1 -XX:+UseContainerSupport -XX:+UseStringDeduplication"

config/docker/env/fineract-mariadb.env

@@ -20,10 +20,6 @@
 # NOTE: env vars prefixed "FINERACT_HIKARI_*" are used to configure the database connection pool
 FINERACT_HIKARI_DRIVER_SOURCE_CLASS_NAME=org.mariadb.jdbc.Driver
 FINERACT_HIKARI_JDBC_URL=jdbc:mariadb://db:3306/fineract_tenants
-FINERACT_HIKARI_USERNAME=root
-FINERACT_HIKARI_PASSWORD=skdcnwauicn2ucnaecasdsajdnizucawencascdca
 # NOTE: env vars prefixed "FINERACT_DEFAULT_TENANTDB_*" are used to create the default tenant database
-FINERACT_DEFAULT_TENANTDB_HOSTNAME=db
 FINERACT_DEFAULT_TENANTDB_PORT=3306
 FINERACT_DEFAULT_TENANTDB_UID=root
-FINERACT_DEFAULT_TENANTDB_PWD=skdcnwauicn2ucnaecasdsajdnizucawencascdca

config/docker/env/fineract-postgresql.env

@@ -23,7 +23,5 @@ FINERACT_HIKARI_JDBC_URL=jdbc:postgresql://db:5432/fineract_tenants
 FINERACT_HIKARI_USERNAME=postgres
 FINERACT_HIKARI_PASSWORD=skdcnwauicn2ucnaecasdsajdnizucawencascdca
 # NOTE: env vars prefixed "FINERACT_DEFAULT_TENANTDB_*" are used to create the default tenant database
-FINERACT_DEFAULT_TENANTDB_HOSTNAME=db
 FINERACT_DEFAULT_TENANTDB_PORT=5432
 FINERACT_DEFAULT_TENANTDB_UID=postgres
-FINERACT_DEFAULT_TENANTDB_PWD=skdcnwauicn2ucnaecasdsajdnizucawencascdca

config/docker/env/fineract-worker.env

@@ -21,3 +21,4 @@ FINERACT_NODE_ID=2
 FINERACT_MODE_BATCH_MANAGER_ENABLED=false
 FINERACT_MODE_BATCH_WORKER_ENABLED=true
 OTEL_SERVICE_NAME=fineract-worker
+FINERACT_LIQUIBASE_ENABLED=false

config/docker/logback/logback-override.xml

@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements. See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership. The ASF licenses this file
+    to you 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.
+
+-->
+<configuration>
+    <!--
+    <include resource="org/springframework/boot/logging/logback/defaults.xml" />
+    <include resource="org/springframework/boot/logging/logback/file-appender.xml" />
+    <include resource="org/springframework/boot/logging/logback/console-appender.xml" />
+    -->
+
+    <contextListener class="ch.qos.logback.classic.jul.LevelChangePropagator">
+        <resetJUL>false</resetJUL>
+    </contextListener>
+
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <withJansi>false</withJansi>
+        <encoder>
+            <pattern>%green(%d{yyyy-MM-dd HH:mm:ss.SSS}) [%thread] %highlight(%-5level) %cyan(%logger{36}) - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>/var/logs/fineract/fineract.log</file>
+        <append>true</append>
+        <prudent>true</prudent>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>/var/logs/fineract/fineract.%d{yyyy-MM-dd}.log</fileNamePattern>
+            <maxHistory>2</maxHistory>
+            <totalSizeCap>100MB</totalSizeCap>
+        </rollingPolicy>
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+            <charset>UTF-8</charset>
+        </encoder>
+    </appender>
+
+    <logger name="org.springframework.transaction" level="INFO" />
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT" />
+        <appender-ref ref="FILE"/>
+    </root>
+</configuration>