fix: dockerfile for fly

Author: pffigueiredo

.gitignore

@@ -163,3 +163,5 @@ cython_debug/
 node_modules
 tsp-output/
 .aider*
+
+demo_app/

agent/fullstack/README.md

@@ -14,18 +14,14 @@ Generates full stack apps using trpc + shadcn components.
 
 ### Running generated code
 
-Chande directory:
+Change directory:
 
 `cd demo_app`
 
 Configure postgres address:
 
 `export DATABASE_URL=postgres://postgres:postgres@postgres:5432/postgres`
 
-Apply migrations:
-
-`bun run db:push`
-
 Start the app:
 
 `bun run dev:all`
@@ -36,4 +32,29 @@ Start the app:
 
 ### Running with docker - doesn't have hot reload
 
+Change directory:
+
+`cd demo_app`
+
+Run through docker compose:
 `docker compose up --build`
+
+This will apply DB migrations and start the server/client.
+
+Just open the browser and go to `http://localhost:80`
+
+### Deploying to fly
+
+Change directory:
+
+`cd demo_app`
+
+Run the following command to deploy the app:
+
+`fly deploy` - this will use the Dockerfile in the root to build the app.
+
+If you don't have a fly.toml file, you can create one by running:
+
+`fly launch`
+
+This will create a new app and deploy it to fly.

agent/fullstack/prefabs/trpc_fullstack/Dockerfile

@@ -0,0 +1,48 @@
+# Build stage for both client and server
+FROM oven/bun:1 as builder
+
+# Set working directory
+WORKDIR /app
+
+# Copy package files
+COPY package.json bun.lockb ./
+COPY client/package.json ./client/
+COPY server/package.json ./server/
+
+# Install dependencies
+RUN bun install --frozen-lockfile
+
+# Copy source code
+COPY . .
+
+# Build client and server
+RUN cd client && bun run build
+RUN cd server && bun run build
+
+# Final stage - use oven/bun as base to avoid compatibility issues
+FROM oven/bun:1
+
+# Install nginx directly
+RUN apt-get update && apt-get install -y nginx && apt-get clean
+
+# Copy frontend files
+COPY --from=builder /app/client/dist /usr/share/nginx/html
+COPY ./client/nginx/nginx.conf /etc/nginx/conf.d/default.conf
+
+# Modify nginx config - in fly it needs to be 8080
+RUN sed -i 's/listen 80;/listen 8080;/g' /etc/nginx/conf.d/default.conf
+RUN sed -i 's/app-backend/localhost/g' /etc/nginx/conf.d/default.conf
+
+# Copy backend files
+COPY --from=builder /app/server /app/server
+COPY --from=builder /app/node_modules /app/node_modules
+
+# Create a simple start script
+RUN echo '#!/bin/sh\nnginx &\ncd /app/server && bun run start:build' > /start.sh
+RUN chmod +x /start.sh
+
+# Expose port
+EXPOSE 8080
+
+# Use the script
+CMD ["/start.sh"]

agent/fullstack/prefabs/trpc_fullstack/server/package.json

@@ -5,7 +5,8 @@
     "build": "tsc",
     "dev": "bun --hot src/index.ts",
     "db:push": "drizzle-kit push --force",
-    "lint": "eslint --cache src/index.ts"
+    "lint": "eslint --cache src/index.ts",
+    "start:build": "drizzle-kit push --force && node dist/src/index.js"
   },
   "dependencies": {
     "@trpc/server": "npm:@trpc/server@next",

agent/fullstack/prefabs/trpc_fullstack/server/server.Dockerfile

@@ -25,5 +25,5 @@ RUN cd server && bun run build
 # Expose the server port
 EXPOSE 2022
 
-# Run the server (adjust the path if needed)
-CMD ["node", "server/dist/src/index.js"]
+# Run the server
+CMD cd server && bun run start:build