Merge pull request #20 from EmanuelCR03/main

Fix Docker Compose execution for new docker group members

Author: IOhacker

install.sh

@@ -107,7 +107,9 @@ install_docker(){
 
     # Apply group change in current shell
     newgrp docker <<EONG
-echo "✅ Docker is installed and group membership applied in this session."
+echo "✅ Docker is installed and group membership applied."
+echo "⚠️ To use Docker without 'sudo', you need to log out and log back in or restart your session."
+read -p "Press Enter to continue..."
 EONG
   fi
 }
@@ -500,7 +502,12 @@ if [ "$answer" = "n" ]; then
   exit 0
 else
   echo "🐳 Starting Docker containers..."
-  docker compose up -d
+  if [[ $(uname) == "Darwin" ]]; then
+    docker compose up -d
+  else
+    sg docker -c "docker compose up -d"  
+  fi
+  
   # Check if port is listening
   echo "Waiting for server to be healthy, it might take a few minutes while we initialize the database..."
 
@@ -514,8 +521,13 @@ else
   # Tail logs of the server until it's ready
   # Start logs with timeout (will automatically stop after N seconds)
   #docker compose logs -f fineract-server &
-  docker compose logs -f fineract-server &
-  log_pid=$!
+  if [[ $(uname) == "Darwin" ]]; then
+    docker compose logs -f fineract-server &
+    log_pid=$!
+  else
+    sg docker -c "docker compose logs -f fineract-server" &
+    log_pid=$!
+  fi
 
   while [ "$(docker inspect --format='{{.State.Health.Status}}' "$container_id" 2>/dev/null)" != "healthy" ]; do
     sleep 1

mariadb/docker-compose.yml

@@ -42,7 +42,7 @@ services:
     volumes:
       - ./fineract-server/data:/data
     healthcheck:
-      test: ["CMD", 'sh', '-c', 'echo -e "Checking for the availability of Fineract server deployment"; while ! nc -z "fineract-server" ${FINERACT_PORT:-3000}; do sleep 1; printf "-"; done; echo -e " >> Fineract server has started";' ]
+      test: ["CMD", 'sh', '-c', 'echo -e "Checking for the availability of Fineract server deployment"; while ! nc -z "fineract-server" 8080; do sleep 1; printf "-"; done; echo -e " >> Fineract server has started";' ]
       timeout: 10s
       retries: 10
     ports:

postgresql/docker-compose.yml

@@ -38,7 +38,7 @@ services:
     volumes:
       - ./fineract-server/data:/data
     healthcheck:
-      test: ["CMD", 'sh', '-c', 'echo -e "Checking for the availability of Fineract server deployment"; while ! nc -z "fineract-server" ${FINERACT_PORT:-3000}; do sleep 1; printf "-"; done; echo -e " >> Fineract server has started";' ]
+      test: ["CMD", 'sh', '-c', 'echo -e "Checking for the availability of Fineract server deployment"; while ! nc -z "fineract-server" 8080; do sleep 1; printf "-"; done; echo -e " >> Fineract server has started";' ]
       timeout: 10s
       retries: 10
     ports: