Fixing workflow build issues.

Author: digitalnomad91

.github/workflows/deploy.yml

@@ -12,9 +12,7 @@ jobs:
       - name: '🔍 Checkout Code'
         uses: actions/checkout@v4
 
-      # ========================
-      # 🔐 Secrets & Config Setup
-      # ========================
+      # (Secrets and .env setup steps remain the same)
       - name: '🔒 Verify Secrets Exist'
         run: |
           if [ -z "${{ secrets.GOOGLE_SERVICES_JSON_BASE64 }}" ]; then
@@ -40,37 +38,44 @@ jobs:
           echo "" >> .env
 
       # =======================================================
-      # 🐳 Docker Compose Operations (This section is updated)
+      # 🐳 Docker Operations (This section is updated)
       # =======================================================
-      - name: '🚀 Launch or Update Services'
+      - name: '🚀 Build, Launch, and Update Services'
         run: |
-          # Step 1: Explicitly check for the network and create it only if it's missing.
-          # This is more robust than the previous '|| true' syntax.
+          # Step 1: Ensure the Docker network exists.
           if ! docker network ls | grep -q "codebuilder-net"; then
             echo "Network 'codebuilder-net' not found. Creating it..."
             docker network create codebuilder-net
           else
             echo "Network 'codebuilder-net' already exists. Skipping creation."
           fi
 
-          # Step 2: Bring up all services defined in the compose file.
-          # This command is idempotent. On the first run, it creates and starts everything.
-          # On subsequent runs, it will connect to existing containers and ensure they
-          # are started if they were stopped, but it will NOT try to re-create them.
-          # This safely ensures the database is running before we proceed.
-          echo "Ensuring all services are up..."
-          docker compose up -d
+          # Step 2: Start the database service independently.
+          # The 'up -d' command is idempotent; it will start the 'db' if it's not running,
+          # and do nothing if it already is.
+          echo "Starting database service..."
+          docker compose up -d db
 
-          # Step 3: Force a rebuild and replacement of the webapp service ONLY.
-          # This is the key command for zero-downtime-style updates of your app.
-          # --no-deps: Guarantees that the 'db' container will not be touched.
-          # --build: Rebuilds the webapp image from your latest source code.
-          # --force-recreate: Explicitly stops the old webapp container and starts a new one
-          #                   from the new image, even if the configuration is the same.
-          echo "Rebuilding and force-recreating the webapp service..."
-          docker compose up -d --no-deps --build --force-recreate webapp
+          # Step 3: Wait for the database to be fully ready.
+          # We use netcat (nc) to poll the database port exposed to the host machine.
+          # This is critical to ensure the build doesn't start prematurely.
+          # NOTE: We use port 5434 because that is what you mapped in your docker-compose.yml
+          echo "Waiting for database to become available on localhost:5434..."
+          while ! nc -z localhost 5434; do
+            sleep 1 # wait for 1 second before trying again
+          done
+          echo "✅ Database is healthy and listening."
+
+          # Step 4: NOW that the DB is running, build the webapp image.
+          # The Docker builder will be able to connect to the 'db' service over the network.
+          echo "Building the webapp image..."
+          docker compose build webapp
+
+          # Step 5: Deploy the newly built webapp container.
+          # This command surgically replaces the webapp without touching the database.
+          echo "Deploying the new webapp container..."
+          docker compose up -d --no-deps --force-recreate webapp
 
       - name: '🗑 Prune Old Docker Images'
-        if: always() # This step will run even if the deployment fails.
-        run: |
-          docker image prune -af
+        if: always()
+        run: docker image prune -af

Dockerfile

@@ -1,46 +1,52 @@
-# ====================
-# 1) Build Stage
-# ====================
+# Stage 1: Build the application
+# We name this stage 'builder'
 FROM node:22-alpine AS builder
+
+# Set the working directory
 WORKDIR /app
+
+# Install pnpm globally
 RUN npm install -g pnpm
 
+# Copy package manifests and lockfile
 COPY package.json pnpm-lock.yaml ./
+
+# Install dependencies
 RUN pnpm install --strict-peer-dependencies=false
 
+# Copy the rest of your application code
 COPY . .
+
+# Run Prisma Generate (this is safe and often needed for types)
 RUN npx prisma generate
+
+# Build the application. This will now succeed because the database
+# service will be running and available on the network.
 RUN pnpm run build
 
-# ====================
-# 2) Production Stage
-# ====================
+# Stage 2: Production Image
+# Create a smaller, cleaner image for production
 FROM node:22-alpine
+
 WORKDIR /app
-RUN npm install -g pnpm
 
-# We use 'nc' to check if the database port is open.
+# Install netcat for the entrypoint healthcheck
 RUN apk add --no-cache netcat-openbsd
 
-# Copy only the necessary files from the builder stage.
-COPY --from=builder /app/node_modules ./
-COPY --from=builder /app/package.json ./
-COPY --from=builder /app/pnpm-lock.yaml ./
+# Copy only the necessary production artifacts from the 'builder' stage
+COPY --from=builder /app/node_modules ./node_modules
+COPY --from=builder /app/package.json ./package.json
+COPY --from=builder /app/pnpm-lock.yaml ./pnpm-lock.yaml
 COPY --from=builder /app/.next ./.next
 COPY --from=builder /app/prisma ./prisma
 COPY --from=builder /app/public ./public
-
-# Copy and prepare the entrypoint script.
 COPY docker-entrypoint.sh .
-RUN chmod +x docker-entrypoint.sh
-
 
-# Install production-only dependencies.
-RUN pnpm install --prod --strict-peer-dependencies=false
-
-EXPOSE 3000
+# Ensure the entrypoint is executable
+RUN chmod +x docker-entrypoint.sh
 
-# The ENTRYPOINT is our script.
-# The CMD is the command that gets passed to our script after migrations run.
+# This is the command that will run when the container starts
 ENTRYPOINT ["./docker-entrypoint.sh"]
-CMD ["pnpm", "start"]
+
+# The default command for the entrypoint script
+CMD ["pnpm", "start"]