From 756f9052b5f6d578a05345d1ca723da1fdbba4ff Mon Sep 17 00:00:00 2001
From: ske087 <scheianuionut@gmail.com>
Date: Fri, 18 Jul 2025 15:40:57 -0400
Subject: [PATCH] Fix Docker deployment issues and add fresh database support

- Fix: Add missing 'click' import to app.py to resolve startup error
- Fix: Update docker-compose.yml volume mappings to use correct persistent storage paths (/opt/digi-s)
- Improve: Enhanced entrypoint.sh for better database initialization
- Update: Configuration files for improved deployment

This resolves the Docker container startup issues and ensures proper persistent storage.
---
 .gitignore         | 0
 app.py             | 1 +
 docker-compose.yml | 4 ++--
 entrypoint.sh      | 4 ++++
 requirements.txt   | 0
 5 files changed, 7 insertions(+), 2 deletions(-)
 mode change 100644 => 100755 .gitignore
 mode change 100644 => 100755 app.py
 mode change 100644 => 100755 docker-compose.yml
 mode change 100644 => 100755 entrypoint.sh
 mode change 100644 => 100755 requirements.txt

diff --git a/.gitignore b/.gitignore
old mode 100644
new mode 100755
diff --git a/app.py b/app.py
old mode 100644
new mode 100755
index 89eed42..678a977
--- a/app.py
+++ b/app.py
@@ -1,4 +1,5 @@
 import os
+import click
 from flask import Flask, render_template, request, redirect, url_for, session, flash, jsonify, send_from_directory
 from flask_migrate import Migrate
 import subprocess
diff --git a/docker-compose.yml b/docker-compose.yml
old mode 100644
new mode 100755
index d4cee92..7df0c97
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -11,6 +11,6 @@ services:
       - ADMIN_PASSWORD=Initial01!
       - SECRET_KEY=Ma_Duc_Dupa_Merele_Lui_Ana
     volumes:
-      - /home/pi/Desktop/digi-server/db:/app/instance
-      - /home/pi/Desktop/digi-server/static:/app/static/uploads
+      - /opt/digi-s/instance:/app/instance
+      - /opt/digi-s/static/uploads:/app/static/uploads
     restart: unless-stopped
diff --git a/entrypoint.sh b/entrypoint.sh
old mode 100644
new mode 100755
index 9739953..cd6b7b1
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -9,6 +9,10 @@ mkdir -p instance
 if [ ! -f instance/dashboard.db ]; then
     echo "No database found, initializing..."
     
+    # Remove and recreate migrations directory to ensure clean state
+    rm -rf migrations
+    mkdir -p migrations
+    
     # Initialize the database
     flask db init
     flask db migrate -m "Initial migration"
diff --git a/requirements.txt b/requirements.txt
old mode 100644
new mode 100755