Fix luckychit Dockerfile for multi-stage build

.gitea/workflows/build.yaml

@@ -4,44 +4,35 @@ on: [push]
 jobs:
   build-backend:
     runs-on: ubuntu-latest
-    env:
-      DOCKER_HOST: tcp://172.17.0.1:2375
     steps:
       - name: Checkout
         uses: actions/checkout@v3
 
-      - name: Build and push Backend (Kaniko)
+      - name: Set up Docker Buildx
-        run: |
+        uses: docker/setup-buildx-action@v2
-          JOB_CONTAINER=$(docker ps --format '{{.Names}}' | grep 'GITEA-ACTIONS-TASK' | head -1)
-          echo "Using volumes from: $JOB_CONTAINER"
 
-          docker run --rm \
+      - name: Build and push Backend
-            --volumes-from "$JOB_CONTAINER" \
+        uses: docker/build-push-action@v4
-            gcr.io/kaniko-project/executor:latest \
+        with:
-              --context=dir:///workspace/deepkoluguri/chitfund/backend \
+          context: ./backend
-              --dockerfile=Dockerfile \
+          push: true
-              --destination=192.168.8.250:5000/chitfund-backend:latest \
+          tags: 192.168.8.250:5000/chitfund-backend:latest
-              --insecure \
+          # Local registry is insecure
-              --skip-tls-verify
+          labels: |
+            org.opencontainers.image.source=${{ gitea.repository_url }}
 
   build-frontend:
     runs-on: ubuntu-latest
-    env:
-      DOCKER_HOST: tcp://172.17.0.1:2375
     steps:
       - name: Checkout
         uses: actions/checkout@v3
 
-      - name: Build and push Frontend (Kaniko)
+      - name: Set up Docker Buildx
-        run: |
+        uses: docker/setup-buildx-action@v2
-          JOB_CONTAINER=$(docker ps --format '{{.Names}}' | grep 'GITEA-ACTIONS-TASK' | head -1)
-          echo "Using volumes from: $JOB_CONTAINER"
 
-          docker run --rm \
+      - name: Build and push Frontend
-            --volumes-from "$JOB_CONTAINER" \
+        uses: docker/build-push-action@v4
-            gcr.io/kaniko-project/executor:latest \
+        with:
-              --context=dir:///workspace/deepkoluguri/chitfund/luckychit \
+          context: ./luckychit
-              --dockerfile=Dockerfile \
+          push: true
-              --destination=192.168.8.250:5000/chitfund-frontend:latest \
+          tags: 192.168.8.250:5000/chitfund-frontend:latest
-              --insecure \
-              --skip-tls-verify

SETUP_COMPLETE.md

@@ -4,7 +4,7 @@
 
 Your **FREE, zero-transaction-fee UPI payment system** is ready to use!
 
-----
+---
 
 ## ✨ What You Have Now
 

backend/.env

@@ -19,8 +19,12 @@ JWT_SECRET=2559a382d606e4209085401d693ae25f
 JWT_EXPIRES_IN=24h
 
 # CORS Configuration
+<<<<<<< HEAD
 ALLOWED_ORIGINS=http://localhost:8080,http://localhost:3000,https://chitfund.deepteklabs.com,http://chitfund.deepteklabs.com
 
+=======
+ALLOWED_ORIGINS=https://chitfund.deepteklabs.com,http://chitfund.deepteklabs.com,http://localhost:8080,http://localhost:3000
+>>>>>>> main
 # Rate Limiting
 RATE_LIMIT_WINDOW_MS=900000
 RATE_LIMIT_MAX_REQUESTS=100

luckychit/Dockerfile

@@ -1,5 +1,5 @@
 # Frontend Dockerfile for Chitfund (Flutter Web)
-FROM ghcr.io/cirruslabs/flutter:stable AS build
+FROM ghcr.io/cirruslabs/flutter:3.24.0 AS build
 WORKDIR /app
 COPY . .
 RUN flutter pub get

luckychit/web-server.js

@@ -47,7 +47,7 @@ app.use(express.static(BUILD_DIR, {
 
 // Handle Flutter routes (SPA - Single Page Application)
 // Any route not found as a static file should serve index.html
-app.use( (req, res) => {
+app.get('*', (req, res) => {
   res.sendFile(path.join(BUILD_DIR, 'index.html'));
 });
 

luckychit/web/index.html

@@ -18,12 +18,16 @@
 
   <meta charset="UTF-8">
   <meta content="IE=Edge" http-equiv="X-UA-Compatible">
+<<<<<<< HEAD
   <meta name="description" content="Chitfund app to manage your chit funds.">
 
   <!-- Prevent caching in production for updates -->
   <meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate">
   <meta http-equiv="Pragma" content="no-cache">
   <meta http-equiv="Expires" content="0">
+=======
+  <meta name="description" content="Chitfund Application">
+>>>>>>> main
 
   <!-- iOS meta tags & icons -->
   <meta name="apple-mobile-web-app-capable" content="yes">