chore: update CI workflow and Dockerfile for improved deployment process

Author: kentcdodds

.github/workflows/validate.yml

@@ -13,6 +13,7 @@ on:
 jobs:
   setup:
     name: 🔧 Setup
+    timeout-minutes: 10
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
@@ -24,7 +25,7 @@ jobs:
       - name: ⎔ Setup node
         uses: actions/setup-node@v4
         with:
-          node-version: 22
+          node-version: 24
 
       - name: ▶️ Run setup script
         run: npm run setup
@@ -37,6 +38,7 @@ jobs:
 
   tests:
     name: 🧪 Test
+    timeout-minutes: 10
     runs-on: ubuntu-latest
     # Use continue-on-error to ensure this job doesn't fail the workflow
     continue-on-error: true
@@ -59,6 +61,7 @@ jobs:
 
   deploy:
     name: 🚀 Deploy
+    timeout-minutes: 10
     runs-on: ubuntu-latest
     # only deploy main branch on pushes on non-forks
     if:
@@ -73,7 +76,10 @@ jobs:
         uses: superfly/flyctl-actions/[email protected]
 
       - name: 🚀 Deploy
-        run: flyctl deploy --remote-only
+        run:
+          flyctl deploy --remote-only --build-arg
+          EPICSHOP_GITHUB_REPO=https://github.com/${{ github.repository }}
+          --build-arg EPICSHOP_COMMIT_SHA=${{ github.sha }}
         working-directory: ./epicshop
         env:
           FLY_API_TOKEN: ${{ secrets.FLY_API_TOKEN }}

epicshop/Dockerfile

@@ -2,7 +2,10 @@ FROM node:24-bookworm-slim as base
 
 RUN apt-get update && apt-get install -y git
 
-ENV EPICSHOP_REPO=https://github.com/epicweb-dev/mcp-fundamentals
+# Build argument for GitHub repo URL
+ARG EPICSHOP_GITHUB_REPO
+ENV EPICSHOP_GITHUB_REPO=${EPICSHOP_GITHUB_REPO}
+
 ENV EPICSHOP_CONTEXT_CWD="/myapp/workshop-content"
 ENV EPICSHOP_HOME_DIR="/myapp/.epicshop"
 ENV EPICSHOP_DEPLOYED="true"
@@ -11,10 +14,19 @@ ENV FLY="true"
 ENV PORT="8080"
 ENV NODE_ENV="production"
 
+# Build argument for commit SHA to bust cache when repo changes
+ARG EPICSHOP_COMMIT_SHA
+ENV EPICSHOP_COMMIT_SHA=${EPICSHOP_COMMIT_SHA}
+
 WORKDIR /myapp
 
 # Clone the workshop repo during build time, excluding database files
-RUN git clone --depth 1 ${EPICSHOP_REPO} ${EPICSHOP_CONTEXT_CWD}
+# Clone specific commit to keep image small while ensuring cache busting
+RUN git init ${EPICSHOP_CONTEXT_CWD} && \
+    cd ${EPICSHOP_CONTEXT_CWD} && \
+    git remote add origin ${EPICSHOP_GITHUB_REPO} && \
+    git fetch --depth 1 origin ${EPICSHOP_COMMIT_SHA} && \
+    git checkout ${EPICSHOP_COMMIT_SHA}
 
 ADD . .