You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@fineract.apache.org by ar...@apache.org on 2023/07/07 21:03:51 UTC
[fineract] branch develop updated (f412ee752 -> 9c3393394)
This is an automated email from the ASF dual-hosted git repository.
arnold pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/fineract.git
from f412ee752 Integration test fix
new b146b582a Update mariadb Docker tag to v11
new 9c3393394 Changed mariadb healthcheck
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.github/workflows/build-docker-mariadb.yml | 2 +-
.github/workflows/build-mariadb.yml | 4 ++--
custom/docker/docker-compose.yml | 2 +-
docker-compose.yml | 4 ++--
4 files changed, 6 insertions(+), 6 deletions(-)
[fineract] 01/02: Update mariadb Docker tag to v11
Posted by ar...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
arnold pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/fineract.git
commit b146b582aa19316fd63179a6839a0895e43c6946
Author: Renovate <bo...@renovateapp.com>
AuthorDate: Mon Jul 3 06:40:40 2023 +0000
Update mariadb Docker tag to v11
---
.github/workflows/build-mariadb.yml | 2 +-
custom/docker/docker-compose.yml | 2 +-
docker-compose.yml | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/build-mariadb.yml b/.github/workflows/build-mariadb.yml
index 7f41d6c74..b85e0d3ad 100644
--- a/.github/workflows/build-mariadb.yml
+++ b/.github/workflows/build-mariadb.yml
@@ -10,7 +10,7 @@ jobs:
services:
mariad:
- image: mariadb:10.11
+ image: mariadb:11.0
ports:
- 3306:3306
env:
diff --git a/custom/docker/docker-compose.yml b/custom/docker/docker-compose.yml
index b45ffe3ec..adc1180e3 100644
--- a/custom/docker/docker-compose.yml
+++ b/custom/docker/docker-compose.yml
@@ -21,7 +21,7 @@ version: '3.7'
services:
# Backend service
fineractmysql:
- image: mariadb:10.11
+ image: mariadb:11.0
volumes:
- ../../fineract-db/server_collation.cnf:/etc/mysql/conf.d/server_collation.cnf
- ../../fineract-db/docker:/docker-entrypoint-initdb.d:Z,ro
diff --git a/docker-compose.yml b/docker-compose.yml
index aee49a027..a2ee368a1 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -21,7 +21,7 @@ version: '3.7'
services:
# Backend service
fineractmysql:
- image: mariadb:10.11
+ image: mariadb:11.0
volumes:
- ./fineract-db/server_collation.cnf:/etc/mysql/conf.d/server_collation.cnf
- ./fineract-db/docker:/docker-entrypoint-initdb.d:Z,ro
[fineract] 02/02: Changed mariadb healthcheck
Posted by ar...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
arnold pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/fineract.git
commit 9c3393394efa3876db85eb10a4905160a4dc821a
Author: Arnold Galovics <ga...@gmail.com>
AuthorDate: Fri Jul 7 14:39:03 2023 +0200
Changed mariadb healthcheck
---
.github/workflows/build-docker-mariadb.yml | 2 +-
.github/workflows/build-mariadb.yml | 2 +-
docker-compose.yml | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/build-docker-mariadb.yml b/.github/workflows/build-docker-mariadb.yml
index dc5cf4c64..641007c79 100644
--- a/.github/workflows/build-docker-mariadb.yml
+++ b/.github/workflows/build-docker-mariadb.yml
@@ -24,7 +24,7 @@ jobs:
- name: Start the stack
run: docker-compose up -d
- name: Wait for stack to come up
- run: sleep 120
+ run: sleep 300
- name: Check health
run: curl -f -k --retry 10 --retry-connrefused --connect-timeout 30 --retry-delay 30 https://localhost:8443/fineract-provider/actuator/health
- name: Check info
diff --git a/.github/workflows/build-mariadb.yml b/.github/workflows/build-mariadb.yml
index b85e0d3ad..bb74ea49b 100644
--- a/.github/workflows/build-mariadb.yml
+++ b/.github/workflows/build-mariadb.yml
@@ -15,7 +15,7 @@ jobs:
- 3306:3306
env:
MARIADB_ROOT_PASSWORD: mysql
- options: --health-cmd="mysqladmin ping" --health-interval=5s --health-timeout=2s --health-retries=3
+ options: --health-cmd="healthcheck.sh --su-mysql --connect --innodb_initialized" --health-interval=5s --health-timeout=2s --health-retries=3
mock-oauth2-server:
image: ghcr.io/navikt/mock-oauth2-server:0.5.9
diff --git a/docker-compose.yml b/docker-compose.yml
index a2ee368a1..dd2e3fe66 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -29,7 +29,7 @@ services:
environment:
MYSQL_ROOT_PASSWORD: skdcnwauicn2ucnaecasdsajdnizucawencascdca
healthcheck:
- test: ["CMD", "mysqladmin" ,"ping", "-h", "localhost", "--password=skdcnwauicn2ucnaecasdsajdnizucawencascdca" ]
+ test: ["CMD", "healthcheck.sh", "--su-mysql", "--connect", "--innodb_initialized"]
timeout: 10s
retries: 10
ports: