Updated prisma build flow (again).

Author: digitalnomad91

.github/workflows/deploy.yml

@@ -100,7 +100,8 @@ jobs:
           # This ensures Docker rebuilds the prisma layer when the submodule is updated
           PRISMA_COMMIT=$(git submodule status prisma | awk '{print $1}' | sed 's/^+//')
           echo "Using Prisma submodule commit: $PRISMA_COMMIT"
-          # Use 'codebuilder' as the stack prefix with build-arg to bust cache
+          
+          # Build with the prisma commit as a build argument
           docker compose -p codebuilder build --build-arg PRISMA_COMMIT=$PRISMA_COMMIT api
 
           # Step 5: Forcefully remove the old api container to prevent conflicts.

Dockerfile

@@ -13,9 +13,6 @@ COPY package.json pnpm-lock.yaml ./
 # Add a build argument to bust cache when the submodule changes
 # This ensures that Docker will re-copy the prisma directory when the submodule is updated
 ARG PRISMA_COMMIT
-# Copy the prisma directory
-COPY prisma ./prisma
-
 
 # Install dependencies
 RUN pnpm install --unsafe-perm \
@@ -30,6 +27,12 @@ RUN pnpm install --unsafe-perm \
       && echo '--- DEBUG: node_modules/.bin contents ---' \
       && ls -l node_modules/.bin || true
 
+# Copy prisma directory and generate client based on the commit
+# This creates a single layer that will be invalidated when PRISMA_COMMIT changes
+COPY prisma ./prisma
+RUN echo "Prisma commit: ${PRISMA_COMMIT:-unknown}" > /tmp/prisma-commit \
+    && npx prisma generate
+
 # Copy the rest of your application code
 COPY . .