From dc22d1e6cbd254471ae44e4f69dc602a22e3a556 Mon Sep 17 00:00:00 2001
From: kithmina1999 <kithgaming99@gmail.com>
Date: Fri, 6 Jun 2025 15:12:06 +0530
Subject: [PATCH 1/2] fix(db): improve database initialization script and
 docker setup

- Rename init.sh to 00_init.sh for better ordering
- Format docker-compose command for better readability
- Add comprehensive database initialization script with backup restoration
- Implement proper migration handling with schema_migrations table
---
 docker-compose.yml                            | 23 +++++++++++--------
 .../database/{init.sh => 00_init.sh}          |  0
 2 files changed, 14 insertions(+), 9 deletions(-)
 rename worklenz-backend/database/{init.sh => 00_init.sh} (100%)

diff --git a/docker-compose.yml b/docker-compose.yml
index 8c539ae1..ac6987ae 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -101,21 +101,26 @@ services:
         target: /docker-entrypoint-initdb.d/migrations
         consistency: cached
       - type: bind
-        source: ./worklenz-backend/database/init.sh
+        source: ./worklenz-backend/database/00_init.sh
         target: /docker-entrypoint-initdb.d/00_init.sh
         consistency: cached
       - 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 '\''
-        dos2unix "{}" 2>/dev/null || true
-        chmod +x "{}"
-      '\'' \; && exec docker-entrypoint.sh postgres '
+      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 '\'' 
+          dos2unix "{}" 2>/dev/null || true
+          chmod +x "{}"
+        '\'' \;
+        exec docker-entrypoint.sh postgres
+      '
+
   db-backup:
     image: postgres:15
     container_name: worklenz_db_backup
diff --git a/worklenz-backend/database/init.sh b/worklenz-backend/database/00_init.sh
similarity index 100%
rename from worklenz-backend/database/init.sh
rename to worklenz-backend/database/00_init.sh

From 0987fb14b263b29b5ceb1b7f4a8c6400c53f6353 Mon Sep 17 00:00:00 2001
From: kithmina1999 <kithgaming99@gmail.com>
Date: Fri, 6 Jun 2025 15:34:18 +0530
Subject: [PATCH 2/2] refactor(docker): improve command formatting and fix
 shell script issues

- Fix shell script syntax in db service command by using proper quoting and loop structure
- Clean up indentation and formatting in both db and db-backup services
- Ensure consistent command structure while maintaining the same functionality
---
 docker-compose.yml | 43 ++++++++++++++++++++++++-------------------
 1 file changed, 24 insertions(+), 19 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index ac6987ae..fe936e16 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -107,19 +107,24 @@ 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 '\'' 
-          dos2unix "{}" 2>/dev/null || true
-          chmod +x "{}"
-        '\'' \;
-        exec docker-entrypoint.sh postgres
-      '
+    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 file; do
+              dos2unix \"$file\" 2>/dev/null || true
+              chmod +x \"$file\"
+            done
+          ' sh {} +
+
+          exec docker-entrypoint.sh postgres
+        "
+
 
   db-backup:
     image: postgres:15
@@ -135,12 +140,12 @@ services:
       - ./pg_backups:/pg_backups #host dir for backups files
     #setup bassh loop to backup data evey 24h
     command: >
-      bash -c "while true; do
-                sleep 86400;
-                PGPASSWORD=$$POSTGRES_PASSWORD pg_dump -h worklenz_db -U $$POSTGRES_USER -d $$POSTGRES_DB \
-              > /pg_backups/worklenz_db_$(date +%Y-%m-%d_%H-%M-%S).sql;
-              find /pg_backups -type f -name '*.sql' -mtime +30 -delete;
-      done"
+          bash -c "while true; do
+            sleep 86400;
+            PGPASSWORD=$$POSTGRES_PASSWORD pg_dump -h worklenz_db -U $$POSTGRES_USER -d $$POSTGRES_DB \
+            > /pg_backups/worklenz_db_\$(date +%Y-%m-%d_%H-%M-%S).sql;
+            find /pg_backups -type f -name '*.sql' -mtime +30 -delete;
+          done"
     restart: unless-stopped
     networks:
       - worklenz