chore: update GitHub Actions workflow and Docker configuration for epicshop

Author: kentcdodds

.github/workflows/validate.yml

@@ -7,12 +7,13 @@ concurrency:
 on:
   push:
     branches:
-      - 'main'
-  pull_request:
-    branches:
-      - 'main'
+      - "main"
+  pull_request: {}
+
 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: 20
+          node-version: 24
 
       - name: ▶️ Run setup script
         run: npm run setup
@@ -35,12 +36,35 @@ jobs:
       - name: ⬣ ESLint
         run: npm run lint
 
+  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
+
+    steps:
+      - name: ⬇️ Checkout repo
+        uses: actions/checkout@v4
+
+      - name: ⎔ Setup node
+        uses: actions/setup-node@v4
+        with:
+          node-version: 24
+
+      - name: 📦 Install dependencies
+        run: npm ci
+
+      - name: 🧪 Run tests
+        id: run_tests
+        run: node ./epicshop/test.js ..s
+
   deploy:
     name: 🚀 Deploy
+    timeout-minutes: 10
     runs-on: ubuntu-latest
     # only deploy main branch on pushes on non-forks
-    if:
-      ${{ github.ref == 'refs/heads/main' && github.event_name == 'push' &&
+    if: ${{ github.ref == 'refs/heads/main' && github.event_name == 'push' &&
       github.repository_owner == 'epicweb-dev' }}
 
     steps:
@@ -51,7 +75,9 @@ 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

@@ -1,21 +1,39 @@
-FROM node:20-bookworm-slim as base
+FROM node:24-bookworm-slim as base
 
 RUN apt-get update && apt-get install -y git
 
+# 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"
 ENV EPICSHOP_DISABLE_WATCHER="true"
 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
+# 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 . .
 
 RUN npm install --omit=dev
 
-CMD rm -rf ${EPICSHOP_CONTEXT_CWD} && \
-    git clone https://github.com/epicweb-dev/tailwindcss-color-tokens ${EPICSHOP_CONTEXT_CWD} && \
-    cd ${EPICSHOP_CONTEXT_CWD} && \
+RUN cd ${EPICSHOP_CONTEXT_CWD} && \
+    npx epicshop warm
+
+CMD cd ${EPICSHOP_CONTEXT_CWD} && \
     npx epicshop start

epicshop/fly.toml

@@ -0,0 +1,51 @@
+# See https://fly.io/docs/reference/configuration/ for information about how to use this file.
+#
+
+app: "epicweb-dev-tailwindcss-color-tokens"
+primary_region: sjc
+kill_signal: SIGINT
+kill_timeout: 5s
+swap_size_mb: 512
+
+experimental:
+  auto_rollback: true
+
+  attached:
+    secrets: {}
+
+services:
+  - processes:
+      - app
+    protocol: tcp
+    internal_port: 8080
+
+    ports:
+      - port: 80
+
+        handlers:
+          - http
+        force_https: true
+      - port: 443
+
+        handlers:
+          - tls
+          - http
+
+    concurrency:
+      type: connections
+      hard_limit: 100
+      soft_limit: 80
+
+    tcp_checks:
+      - interval: 15s
+        timeout: 2s
+        grace_period: 1s
+
+    http_checks:
+      - interval: 10s
+        timeout: 2s
+        grace_period: 5s
+        method: get
+        path: /resources/healthcheck
+        protocol: http
+        tls_skip_verify: false