Merge release into dev - resolve conflicts

docker-compose.yml

@@ -7,17 +7,35 @@ services:
     restart: unless-stopped
     volumes:
       - postgres_data:/var/lib/postgresql/data
+      - ./data:/var/lib/postgresql/data
 
   app:
-    build: .
+    image: geotracker
     container_name: family_safety_app
     restart: unless-stopped
     ports:
-      - "9090:9090"
+      - "127.0.0.1:9090:9090"
     depends_on:
-      db:
-        condition: service_healthy
+      - db
 
 
 volumes:
   postgres_data:
+
+
+#services:
+#  db:
+#    image: postgres:16-alpine
+#    container_name: family_safety_db
+#    restart: unless-stopped
+#    volumes:
+#      - ./data:/var/lib/postgresql/data
+#
+#  app:
+#    image: geotracker
+#    container_name: family_safety_app
+#    restart: unless-stopped
+#    ports:
+#      - "127.0.0.1:9090:9090"
+#    depends_on:
+#      - db