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