Fix providing build arg for the Stripe key

Author: azlyth

.github/workflows/deploy.yml

@@ -137,7 +137,8 @@ jobs:
         working-directory: frontend
         env:
           FLY_API_TOKEN: ${{ secrets.FLY_TOKEN }}
-        run: flyctl deploy --config ${{ needs.setup.outputs.config }} --remote-only
+          NEXT_PUBLIC_STRIPE_KEY: ${{ secrets.NEXT_PUBLIC_STRIPE_KEY }}
+        run: flyctl deploy --config ${{ needs.setup.outputs.config }} --remote-only --build-arg NEXT_PUBLIC_STRIPE_KEY=${{ secrets.NEXT_PUBLIC_STRIPE_KEY }}
       - name: Print App URL
         working-directory: frontend
         env:

Makefile

@@ -13,7 +13,7 @@ clean-data:
 	rm -rf frontend/.next
 
 deploy-frontend:
-	cd frontend && fly deploy
+	cd frontend && fly deploy --build-arg NEXT_PUBLIC_STRIPE_KEY=$(NEXT_PUBLIC_STRIPE_KEY)
 
 deploy-backend:
 	cd python-backend && fly deploy
@@ -28,7 +28,7 @@ deploy-search:
 	cd search && fly deploy
 
 deploy-frontend-prod:
-	cd frontend && fly deploy --config fly.prod.toml
+	cd frontend && fly deploy --config fly.prod.toml --build-arg NEXT_PUBLIC_STRIPE_KEY=$(NEXT_PUBLIC_STRIPE_KEY)
 
 deploy-backend-prod:
 	cd python-backend && fly deploy --config fly.prod.toml

frontend/Dockerfile.prod

@@ -1,46 +1,39 @@
+# Builder stage
 FROM node:18-alpine AS builder
 
+WORKDIR /app
+
+# Install dependencies
+COPY package.json package-lock.json ./
+RUN npm ci
+
+# Copy application code
+COPY . .
+
 # 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
+ARG NEXT_PUBLIC_STRIPE_KEY
 
 # 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
-
-# Copy application code
-COPY . .
+ENV NEXT_PUBLIC_STRIPE_KEY=${NEXT_PUBLIC_STRIPE_KEY}
 
 # Build the application
 RUN npm run build
 
-# Production image
+
+# Runner stage
 FROM node:18-alpine AS runner
 WORKDIR /app
 
 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
-
-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

frontend/fly.prod.toml

@@ -8,7 +8,6 @@ primary_region = "ewr" # Change this to your preferred region
     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"
-    NEXT_PUBLIC_STRIPE_KEY = "${NEXT_PUBLIC_STRIPE_KEY}"
 
 [env]
   NODE_ENV = "production"

frontend/fly.toml

@@ -4,11 +4,11 @@ primary_region = "ewr" # Change this to your preferred region
 [build]
   dockerfile = "Dockerfile.prod"
   [build.args]
+    NODE_ENV = "production"
     NEXT_PUBLIC_API_URL = "https://localmart-backend.fly.dev"
+    NEXT_PUBLIC_MEILI_URL = "https://localmart-meilisearch.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"
-    NEXT_PUBLIC_STRIPE_KEY = "${NEXT_PUBLIC_STRIPE_KEY}"
 
 [env]
   NODE_ENV = "production"