Merge pull request #330 from OmentaElvis/fix/docker-compose

fix(docker): Update docker-compose.yml to fix broken postgress and MinIO initialization.

Author: chamikaJ

docker-compose.yml

@@ -55,24 +55,9 @@ services:
     depends_on:
       - minio
     restart: on-failure
-    entrypoint: >
-      /bin/sh -c '
-        echo "Waiting for MinIO to start...";
-        sleep 15;
-        for i in 1 2 3 4 5; do
-          echo "Attempt $i to connect to MinIO...";
-          if /usr/bin/mc alias set myminio http://minio:9000 minioadmin minioadmin; then
-            echo "Successfully connected to MinIO!";
-            /usr/bin/mc mb --ignore-existing myminio/worklenz-bucket;
-            /usr/bin/mc policy set public myminio/worklenz-bucket;
-            exit 0;
-          fi
-          echo "Connection failed, retrying in 5 seconds...";
-          sleep 5;
-        done;
-        echo "Failed to connect to MinIO after 5 attempts";
-        exit 1;
-            '
+    entrypoint: ["/bin/sh", "/scripts/createbuckets-entrypoint.sh"]
+    volumes:
+      - ./docker/createbuckets-entrypoint.sh:/scripts/createbuckets-entrypoint.sh:ro
     networks:
       - worklenz
   db:
@@ -91,11 +76,13 @@ services:
       interval: 10s
       timeout: 5s
       retries: 5
+      start_period: 30s
     restart: unless-stopped
     networks:
       - worklenz
     volumes:
       - worklenz_postgres_data:/var/lib/postgresql/data
+      - ./docker/db-init-wrapper.sh:/usr/local/bin/db-init-wrapper.sh:ro
       - type: bind
         source: ./worklenz-backend/database/sql
         target: /docker-entrypoint-initdb.d/sql
@@ -111,23 +98,7 @@ services:
       - type: bind
         source: ./pg_backups
         target: /docker-entrypoint-initdb.d/pg_backups
-    command: >
-        bash -c '
-          if command -v apt-get >/dev/null 2>&1; then
-            apt-get update && apt-get install -y dos2unix
-          elif command -v apk >/dev/null 2>&1; then
-            apk add --no-cache dos2unix
-          fi
-
-          find /docker-entrypoint-initdb.d -type f -name "*.sh" -exec sh -c '"'"'
-            for f; do
-              dos2unix "$f" 2>/dev/null || true
-              chmod +x "$f"
-            done
-          '"'"' sh {} +
-
-          exec docker-entrypoint.sh postgres
-        '
+    command: ["/usr/local/bin/db-init-wrapper.sh"]
   db-backup:
     image: postgres:15
     container_name: worklenz_db_backup

docker/createbuckets-entrypoint.sh

@@ -0,0 +1,22 @@
+#!/bin/sh
+set -e
+
+echo "Waiting for MinIO to start..."
+sleep 15
+
+for i in 1 2 3 4 5; do
+  echo "Attempt $i to connect to MinIO..."
+  if /usr/bin/mc alias set myminio http://minio:9000 minioadmin minioadmin; then
+    echo "Successfully connected to MinIO!"
+    /usr/bin/mc mb --ignore-existing myminio/worklenz-bucket
+    /usr/bin/mc policy set public myminio/worklenz-bucket
+    exit 0
+  fi
+
+  echo "Connection failed, retrying in 5 seconds..."
+  sleep 5
+done
+
+echo "Failed to connect to MinIO after 5 attempts"
+exit 1
+

docker/db-init-wrapper.sh

@@ -0,0 +1,21 @@
+#!/bin/sh
+set -e
+
+# Install dos2unix if possible
+if command -v apt-get >/dev/null 2>&1; then
+  apt-get update && apt-get install -y dos2unix
+elif command -v apk >/dev/null 2>&1; then
+  apk add --no-cache dos2unix
+fi
+
+# Normalize and chmod all .sh files
+for f in /docker-entrypoint-initdb.d/*.sh; do
+  if [ -f "$f" ]; then
+    dos2unix "$f" 2>/dev/null || true
+    chmod +x "$f"
+  fi
+done
+
+# hand control to the real entrypoint
+exec docker-entrypoint.sh postgres
+