Merge pull request #46 from jeremymefford/build-fix-2

[PATCH] docker build fix

Author: jeremymefford

.dockerignore

@@ -9,6 +9,7 @@ coverage
 .nyc_output
 
 docs
+!docs/static/img/logo.svg
 tests
 
 *.log

.github/workflows/release.yml

@@ -151,9 +151,10 @@ jobs:
     environment:
       name: prod
     steps:
-      - name: Checkout
+      - name: Checkout release commit
         uses: actions/checkout@v4
         with:
+          ref: main
           fetch-depth: 0
 
       - name: Set up Node.js
@@ -190,9 +191,10 @@ jobs:
     environment:
       name: prod
     steps:
-      - name: Checkout
+      - name: Checkout release commit
         uses: actions/checkout@v4
         with:
+          ref: main
           fetch-depth: 0
 
       - name: Set up Node.js
@@ -225,9 +227,10 @@ jobs:
     environment:
       name: prod
     steps:
-      - name: Checkout
+      - name: Checkout release commit
         uses: actions/checkout@v4
         with:
+          ref: main
           fetch-depth: 0
 
       - name: Set up Node.js
@@ -261,9 +264,10 @@ jobs:
     environment:
       name: prod
     steps:
-      - name: Checkout
+      - name: Checkout release commit
         uses: actions/checkout@v4
         with:
+          ref: main
           fetch-depth: 0
 
       - name: Set up Node.js
@@ -368,9 +372,10 @@ jobs:
     if: needs.prepare-release.outputs.should_release == 'true'
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout
+      - name: Checkout release commit
         uses: actions/checkout@v4
         with:
+          ref: main
           fetch-depth: 0
 
       - name: Set up QEMU (multi-arch)

Dockerfile

@@ -57,6 +57,7 @@ ENV NODE_ENV=production \
 COPY --from=prod-deps --chown=node:node /app/node_modules ./node_modules
 COPY --from=builder --chown=node:node /app/package*.json ./
 COPY --from=builder --chown=node:node /app/dist ./dist
+COPY --from=builder --chown=node:node /app/docs/static/img/logo.svg ./docs/static/img/logo.svg
 
 HEALTHCHECK --interval=30s --timeout=5s --start-period=10s --retries=3 \
   CMD ["node", "-e", "const p=(process.env.PORT||'4000'); const u='http://127.0.0.1:'+p+'/health'; fetch(u).then(r=>r.ok?r.json():Promise.reject()).then(j=>{if(!(j&&j.status==='ok'))process.exit(1)}).catch(()=>process.exit(1))"]

src/server/index.ts

@@ -5,6 +5,7 @@ import Fastify, {
   type FastifyReply,
   type FastifyRequest,
 } from "fastify";
+import { existsSync } from "node:fs";
 import path from "node:path";
 import { loadBundledAsset } from "./assetLoader";
 import fastifyCors from "@fastify/cors";
@@ -30,8 +31,17 @@ import { graphiqlLandingPagePlugin } from "./graphiqlPlugin";
 /**
  * Initialize and start the Apollo GraphQL server (standalone HTTP/HTTPS server).
  */
-/** Project root — two levels up from src/server/ (or dist/server/). */
-const projectRoot = path.resolve(__dirname, "..", "..");
+/** Project root — walks up from __dirname until we find package.json. */
+const projectRoot = (() => {
+  let dir = __dirname;
+  for (let i = 0; i < 5; i++) {
+    if (existsSync(path.join(dir, "package.json"))) return dir;
+    const parent = path.dirname(dir);
+    if (parent === dir) break;
+    dir = parent;
+  }
+  return dir;
+})();
 
 export async function startServer(): Promise<void> {
   const armor = new ApolloArmor({