Use frontend/Dockerfile.prod for fly

Author: azlyth

compose.yaml

@@ -3,6 +3,7 @@ services:
     build:
       context: ./frontend
       dockerfile: Dockerfile
+      # dockerfile: Dockerfile.prod
     ports:
       - "3000:3000"
     volumes:

frontend/Dockerfile.prod

@@ -1,8 +1,19 @@
-# Build stage
 FROM node:18-alpine AS builder
 
+# Define build arguments
+ARG NEXT_PUBLIC_API_URL
+ARG NEXT_PUBLIC_POCKETBASE_URL
+ARG NEXT_PUBLIC_SEARCH_URL
+ARG NEXT_PUBLIC_MEILI_URL
+
 WORKDIR /app
 
+# Set environment variables for build time
+ENV NEXT_PUBLIC_API_URL=${NEXT_PUBLIC_API_URL}
+ENV NEXT_PUBLIC_POCKETBASE_URL=${NEXT_PUBLIC_POCKETBASE_URL}
+ENV NEXT_PUBLIC_SEARCH_URL=${NEXT_PUBLIC_SEARCH_URL}
+ENV NEXT_PUBLIC_MEILI_URL=${NEXT_PUBLIC_MEILI_URL}
+
 # Install dependencies
 COPY package.json package-lock.json ./
 RUN npm ci
@@ -11,26 +22,43 @@ RUN npm ci
 COPY . .
 
 # Build the application
-ENV NEXT_TELEMETRY_DISABLED 1
 RUN npm run build
 
-# Production stage
+# Production image
 FROM node:18-alpine AS runner
-
 WORKDIR /app
 
-ENV NODE_ENV=production
-ENV NEXT_TELEMETRY_DISABLED 1
+ENV NODE_ENV production
+
+# Pass build arguments to runtime environment variables
+ARG NEXT_PUBLIC_API_URL
+ARG NEXT_PUBLIC_POCKETBASE_URL
+ARG NEXT_PUBLIC_SEARCH_URL
+ARG NEXT_PUBLIC_MEILI_URL
 
-# Copy necessary files from builder
+ENV NEXT_PUBLIC_API_URL=${NEXT_PUBLIC_API_URL}
+ENV NEXT_PUBLIC_POCKETBASE_URL=${NEXT_PUBLIC_POCKETBASE_URL}
+ENV NEXT_PUBLIC_SEARCH_URL=${NEXT_PUBLIC_SEARCH_URL}
+ENV NEXT_PUBLIC_MEILI_URL=${NEXT_PUBLIC_MEILI_URL}
+
+# Add non-root user for security
+RUN addgroup --system --gid 1001 nodejs
+RUN adduser --system --uid 1001 nextjs
+
+# Copy only necessary files from builder stage
 COPY --from=builder /app/next.config.ts ./
-COPY --from=builder /app/package.json ./
 COPY --from=builder /app/public ./public
-COPY --from=builder /app/.next/standalone ./
-COPY --from=builder /app/.next/static ./.next/static
+COPY --from=builder /app/package.json ./package.json
+
+# Copy the built application
+COPY --from=builder --chown=nextjs:nodejs /app/.next/standalone ./
+COPY --from=builder --chown=nextjs:nodejs /app/.next/static ./.next/static
+
+# Set the correct permissions
+USER nextjs
 
-# Expose the port
+# Expose the port the app runs on
 EXPOSE 3000
 
-# Start the application
-CMD ["node", "server.js"] 
+# Command to run the application in production mode
+CMD ["node", "server.js"]

frontend/fly.toml

@@ -2,8 +2,13 @@ app = "localmart-frontend"
 primary_region = "ewr" # Change this to your preferred region
 
 [build]
-  # dockerfile = "Dockerfile.prod"
-  dockerfile = "Dockerfile"
+  dockerfile = "Dockerfile.prod"
+  # dockerfile = "Dockerfile"
+  [build.args]
+    NEXT_PUBLIC_API_URL = "https://localmart-backend.fly.dev"
+    NEXT_PUBLIC_POCKETBASE_URL = "https://localmart-pocketbase.fly.dev"
+    NEXT_PUBLIC_SEARCH_URL = "https://localmart-search.fly.dev"
+    NEXT_PUBLIC_MEILI_URL = "https://localmart-meilisearch.fly.dev"
 
 [env]
   NODE_ENV = "production"

python-backend/localmart_backend/main.py

@@ -865,15 +865,15 @@ async def delete_payment_method(card_id: str, authorization: str = Header(None))
             raise HTTPException(status_code=401, detail="Invalid token")
 
         # Get the card from PocketBase
-        card = pb(token).pb.collection('payment_methods').get_one(card_id)
+        card = pb(token).get_one('payment_methods', card_id)
         if not card or card.user != user.id:
             raise HTTPException(status_code=404, detail="Card not found")
 
         # Delete the payment method from Stripe
         stripe.PaymentMethod.detach(card.stripe_payment_method_id)
 
         # Delete the card from PocketBase
-        pb(token).pb.collection('payment_methods').delete(card_id)
+        pb(token).delete('payment_methods', card_id)
 
         return {"status": "success"}
 
@@ -1179,7 +1179,7 @@ async def delete_store_item(store_id: str, item_id: str, request: Request):
             raise HTTPException(status_code=404, detail="Item not found in store")
 
         # Delete the item
-        pb(token).collection('store_items').delete(item_id)
+        pb(token).delete('store_items', item_id)
         return {"success": True}
     except Exception as e:
         raise HTTPException(status_code=400, detail=str(e))