fix migration... again...

docker-compose.yml

@@ -7,8 +7,10 @@ networks:
 services:
   web:
     build:
-      context: https://git.kobeamerijckx.com/Kobe/docupulse.git
+      context: .
       dockerfile: Dockerfile
+      # context: https://git.kobeamerijckx.com/Kobe/docupulse.git
+      # dockerfile: Dockerfile
     ports:
       - "${PORT:-10335}:5000"
     environment:

migrations/versions/fix_updated_at_trigger.py

@@ -0,0 +1,45 @@
+"""fix updated_at trigger
+
+Revision ID: fix_updated_at_trigger
+Revises: add_status_details
+Create Date: 2024-03-19 12:00:00.000000
+
+"""
+from alembic import op
+import sqlalchemy as sa
+from sqlalchemy import text
+
+# revision identifiers, used by Alembic.
+revision = 'fix_updated_at_trigger'
+down_revision = 'add_status_details'
+branch_labels = None
+depends_on = None
+
+def upgrade():
+    # Drop the existing trigger if it exists
+    op.execute("DROP TRIGGER IF EXISTS update_instances_updated_at ON instances")
+    op.execute("DROP FUNCTION IF EXISTS update_updated_at_column()")
+    
+    # Create the trigger function
+    op.execute("""
+        CREATE OR REPLACE FUNCTION update_updated_at_column()
+        RETURNS TRIGGER AS $$
+        BEGIN
+            NEW.updated_at = CURRENT_TIMESTAMP;
+            RETURN NEW;
+        END;
+        $$ language 'plpgsql';
+    """)
+    
+    # Create the trigger
+    op.execute("""
+        CREATE TRIGGER update_instances_updated_at
+            BEFORE UPDATE ON instances
+            FOR EACH ROW
+            EXECUTE FUNCTION update_updated_at_column();
+    """)
+
+def downgrade():
+    # Drop the trigger and function
+    op.execute("DROP TRIGGER IF EXISTS update_instances_updated_at ON instances")
+    op.execute("DROP FUNCTION IF EXISTS update_updated_at_column()") 

models.py

@@ -509,7 +509,7 @@ class Instance(db.Model):
     status = db.Column(db.String(20), nullable=False, default='inactive')
     status_details = db.Column(db.Text, nullable=True)
     created_at = db.Column(db.DateTime, nullable=False, server_default=db.text('CURRENT_TIMESTAMP'))
-    updated_at = db.Column(db.DateTime, nullable=False, server_default=db.text('CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP'))
+    updated_at = db.Column(db.DateTime, nullable=False, server_default=db.text('CURRENT_TIMESTAMP'), onupdate=db.text('CURRENT_TIMESTAMP'))
 
     def __repr__(self):
         return f'<Instance {self.name}>' 

start.sh

@@ -6,12 +6,6 @@ while ! nc -z db 5432; do
 done
 echo "Database is ready!"
 
-echo "Waiting for Redis..."
-while ! nc -z redis 6379; do
-  sleep 0.1
-done
-echo "Redis is ready!"
-
 echo "Running database migrations..."
 flask db upgrade